Skip to content

P
peizhen-vue
Commit 4fa8ec09 by ‘巴博尔’
Options

修改用户端

parent 01afafff
Showing with 853 additions and 57 deletions
src/api/financialManagement/income.js 0 → 100644
import request from '@/utils/request'
// 查询陪诊员/商户提现列表
export function listIncome(query) {
return request({
url: '/system/income/list',
method: 'get',
params: query
})
}
// 查询陪诊员/商户提现详细
export function getIncome(id) {
return request({
url: '/system/income/' + id,
method: 'get'
})
}
// 新增陪诊员/商户提现
export function addIncome(data) {
return request({
url: '/system/income',
method: 'post',
data: data
})
}
// 修改陪诊员/商户提现
export function updateIncome(data) {
return request({
url: '/system/income',
method: 'put',
data: data
})
}
// 删除陪诊员/商户提现
export function delIncome(id) {
return request({
url: '/system/income/' + id,
method: 'delete'
})
}
src/api/financialManagement/paymentRecord.js 0 → 100644
import request from '@/utils/request'
// 查询支付订单列表
export function listPaymentRecord(query) {
return request({
url: '/system/paymentRecord/list',
method: 'get',
params: query
})
}
// 查询支付订单详细
export function getPaymentRecord(id) {
return request({
url: '/system/paymentRecord/' + id,
method: 'get'
})
}
// 新增支付订单
export function addPaymentRecord(data) {
return request({
url: '/system/paymentRecord',
method: 'post',
data: data
})
}
// 修改支付订单
export function updatePaymentRecord(data) {
return request({
url: '/system/paymentRecord',
method: 'put',
data: data
})
}
// 删除支付订单
export function delPaymentRecord(id) {
return request({
url: '/system/paymentRecord/' + id,
method: 'delete'
})
}
src/api/financialManagement/userRefund.js 0 → 100644
import request from '@/utils/request'
// 查询用户退款列表
export function listUserRefund(query) {
return request({
url: '/system/userRefund/list',
method: 'get',
params: query
})
}
// 查询用户退款详细
export function getUserRefund(id) {
return request({
url: '/system/userRefund/' + id,
method: 'get'
})
}
// 新增用户退款
export function addUserRefund(data) {
return request({
url: '/system/userRefund',
method: 'post',
data: data
})
}
// 修改用户退款
export function updateUserRefund(data) {
return request({
url: '/system/userRefund',
method: 'put',
data: data
})
}
// 删除用户退款
export function delUserRefund(id) {
return request({
url: '/system/userRefund/' + id,
method: 'delete'
})
}
src/api/orderManagement/dbghOrder.js 0 → 100644
import request from '@/utils/request'
// 查询代办挂号订单列表
export function listDbghOrder(query) {
return request({
url: '/system/dbghOrder/list',
method: 'get',
params: query
})
}
// 查询代办挂号订单详细
export function getDbghOrder(id) {
return request({
url: '/system/dbghOrder/' + id,
method: 'get'
})
}
// 新增代办挂号订单
export function addDbghOrder(data) {
return request({
url: '/system/dbghOrder',
method: 'post',
data: data
})
}
// 修改代办挂号订单
export function updateDbghOrder(data) {
return request({
url: '/system/dbghOrder',
method: 'put',
data: data
})
}
// 删除代办挂号订单
export function delDbghOrder(id) {
return request({
url: '/system/dbghOrder/' + id,
method: 'delete'
})
}
src/api/orderManagement/dbmyOrder.js 0 → 100644
import request from '@/utils/request'
// 查询代办买药订单列表
export function listDbmyOrder(query) {
return request({
url: '/system/dbmyOrder/list',
method: 'get',
params: query
})
}
// 查询代办买药订单详细
export function getDbmyOrder(id) {
return request({
url: '/system/dbmyOrder/' + id,
method: 'get'
})
}
// 新增代办买药订单
export function addDbmyOrder(data) {
return request({
url: '/system/dbmyOrder',
method: 'post',
data: data
})
}
// 修改代办买药订单
export function updateDbmyOrder(data) {
return request({
url: '/system/dbmyOrder',
method: 'put',
data: data
})
}
// 删除代办买药订单
export function delDbmyOrder(id) {
return request({
url: '/system/dbmyOrder/' + id,
method: 'delete'
})
}
src/api/orderManagement/dbwzOrder.js 0 → 100644
import request from '@/utils/request'
// 查询代办问诊订单列表
export function listDbwzOrder(query) {
return request({
url: '/system/dbwzOrder/list',
method: 'get',
params: query
})
}
// 查询代办问诊订单详细
export function getDbwzOrder(id) {
return request({
url: '/system/dbwzOrder/' + id,
method: 'get'
})
}
// 新增代办问诊订单
export function addDbwzOrder(data) {
return request({
url: '/system/dbwzOrder',
method: 'post',
data: data
})
}
// 修改代办问诊订单
export function updateDbwzOrder(data) {
return request({
url: '/system/dbwzOrder',
method: 'put',
data: data
})
}
// 删除代办问诊订单
export function delDbwzOrder(id) {
return request({
url: '/system/dbwzOrder/' + id,
method: 'delete'
})
}
src/api/orderManagement/zqghOrder.js 0 → 100644
import request from '@/utils/request'
// 查询诊前挂号订单列表
export function listZqghOrder(query) {
return request({
url: '/system/zqghOrder/list',
method: 'get',
params: query
})
}
// 查询诊前挂号订单详细
export function getZqghOrder(id) {
return request({
url: '/system/zqghOrder/' + id,
method: 'get'
})
}
// 新增诊前挂号订单
export function addZqghOrder(data) {
return request({
url: '/system/zqghOrder',
method: 'post',
data: data
})
}
// 修改诊前挂号订单
export function updateZqghOrder(data) {
return request({
url: '/system/zqghOrder',
method: 'put',
data: data
})
}
// 删除诊前挂号订单
export function delZqghOrder(id) {
return request({
url: '/system/zqghOrder/' + id,
method: 'delete'
})
}
src/api/orderManagement/zyphOrder.js 0 → 100644
import request from '@/utils/request'
// 查询住院陪诊订单列表
export function listZyphOrder(query) {
return request({
url: '/system/zyphOrder/list',
method: 'get',
params: query
})
}
// 查询住院陪诊订单详细
export function getZyphOrder(id) {
return request({
url: '/system/zyphOrder/' + id,
method: 'get'
})
}
// 新增住院陪诊订单
export function addZyphOrder(data) {
return request({
url: '/system/zyphOrder',
method: 'post',
data: data
})
}
// 修改住院陪诊订单
export function updateZyphOrder(data) {
return request({
url: '/system/zyphOrder',
method: 'put',
data: data
})
}
// 删除住院陪诊订单
export function delZyphOrder(id) {
return request({
url: '/system/zyphOrder/' + id,
method: 'delete'
})
}
src/api/user/companion/index.js
......@@ -4,7 +4,7 @@ import { parseStrEmpty } from "@/utils/ruoyi";
// 查询用户列表
export function listUser(query) {
return request({
url: '/system/employees/list',
url: '/merchant/employees/list',
method: 'get',
params: query
})
......@@ -13,7 +13,7 @@ export function listUser(query) {
// 查询用户详细
export function getUser(userId) {
return request({
url: '/system/user/' + parseStrEmpty(userId),
url: '/merchant/user/' + parseStrEmpty(userId),
method: 'get'
})
}
......@@ -21,7 +21,7 @@ export function getUser(userId) {
// 新增用户
export function addUser(data) {
return request({
url: '/system/user',
url: '/merchant/user',
method: 'post',
data: data
})
......@@ -30,7 +30,7 @@ export function addUser(data) {
// 修改用户
export function updateUser(data) {
return request({
url: '/system/employees',
url: '/merchant/employees',
method: 'put',
data: data
})
......@@ -39,7 +39,7 @@ export function updateUser(data) {
// 删除用户
export function delUser(userId) {
return request({
url: '/system/user/' + userId,
url: '/merchant/user/' + userId,
method: 'delete'
})
}
......@@ -51,7 +51,7 @@ export function resetUserPwd(userId, password) {
password
}
return request({
url: '/system/user/resetPwd',
url: '/merchant/user/resetPwd',
method: 'put',
data: data
})
......@@ -64,7 +64,7 @@ export function changeUserStatus(userId, status) {
status
}
return request({
url: '/system/user/changeStatus',
url: '/merchant/user/changeStatus',
method: 'put',
data: data
})
......@@ -73,7 +73,7 @@ export function changeUserStatus(userId, status) {
// 查询用户个人信息
export function getUserProfile() {
return request({
url: '/system/user/profile',
url: '/merchant/user/profile',
method: 'get'
})
}
......@@ -81,7 +81,7 @@ export function getUserProfile() {
// 修改用户个人信息
export function updateUserProfile(data) {
return request({
url: '/system/user/profile',
url: '/merchant/user/profile',
method: 'put',
data: data
})
......@@ -94,7 +94,7 @@ export function updateUserPwd(oldPassword, newPassword) {
newPassword
}
return request({
url: '/system/user/profile/updatePwd',
url: '/merchant/user/profile/updatePwd',
method: 'put',
params: data
})
......@@ -103,7 +103,7 @@ export function updateUserPwd(oldPassword, newPassword) {
// 用户头像上传
export function uploadAvatar(data) {
return request({
url: '/system/user/profile/avatar',
url: '/merchant/user/profile/avatar',
method: 'post',
data: data
})
......@@ -112,7 +112,7 @@ export function uploadAvatar(data) {
// 查询授权角色
export function getAuthRole(userId) {
return request({
url: '/system/user/authRole/' + userId,
url: '/merchant/user/authRole/' + userId,
method: 'get'
})
}
......@@ -120,7 +120,7 @@ export function getAuthRole(userId) {
// 保存授权角色
export function updateAuthRole(data) {
return request({
url: '/system/user/authRole',
url: '/merchant/user/authRole',
method: 'put',
params: data
})
......@@ -129,7 +129,7 @@ export function updateAuthRole(data) {
// 查询部门下拉树结构
export function deptTreeSelect() {
return request({
url: '/system/user/deptTree',
url: '/merchant/user/deptTree',
method: 'get'
})
}
src/components/FileUpload/index.vue
......@@ -11,28 +11,53 @@
:on-success="handleUploadSuccess"
:show-file-list="false"
:headers="headers"
class="upload-file-uploader"
:class="
disabled
? 'upload-file-uploader upload-file-uploaderdl'
: 'upload-file-uploader'
"
ref="fileUpload"
:disabled="disabled"
>
<!-- 上传按钮 -->
<el-button size="mini" type="primary">选取文件</el-button>
<el-button size="mini" type="primary" v-if="!disabled"
>选取文件</el-button
>
<!-- 上传提示 -->
<div class="el-upload__tip" slot="tip" v-if="showTip">
请上传
<template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
<template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
<template v-if="fileSize">
大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
</template>
<template v-if="fileType">
格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b>
</template>
的文件
</div>
</el-upload>
<!-- 文件列表 -->
<transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
<li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
<transition-group
class="upload-file-list el-upload-list el-upload-list--text"
name="el-fade-in-linear"
tag="ul"
>
<li
:key="file.url"
:class="
disabled
? 'el-upload-list__item el-upload-list__itemdis ele-upload-list__item-content'
: 'el-upload-list__item ele-upload-list__item-content'
"
v-for="(file, index) in fileList"
>
<el-link :href="`${file.url}`" :underline="false" target="_blank">
<span class="el-icon-document"> {{ getFileName(file.name) }} </span>
</el-link>
<div class="ele-upload-list__item-content-action">
<el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
<div class="ele-upload-list__item-content-action" v-if="!disabled">
<el-link :underline="false" @click="handleDelete(index)" type="danger"
>删除</el-link
>
</div>
</li>
</transition-group>
......@@ -66,8 +91,12 @@ export default {
// 是否显示提示
isShowTip: {
type: Boolean,
default: true
}
default: true,
},
disabled: {
type: Boolean,
default: false,
},
},
data() {
return {
......@@ -91,15 +120,19 @@ export default {
if (Array.isArray(val)) {
list = val;
} else {
await listByIds(val).then(res => {
list = res.data.map(oss => {
oss = { name: oss.originalName, url: oss.url, ossId: oss.ossId };
await listByIds(val).then((res) => {
list = res.data.map((oss) => {
oss = {
name: oss.originalName,
url: oss.url,
ossId: oss.ossId,
};
return oss;
});
})
});
}
// 然后将数组转为对象数组
this.fileList = list.map(item => {
this.fileList = list.map((item) => {
item = { name: item.name, url: item.url, ossId: item.ossId };
item.uid = item.uid || new Date().getTime() + temp++;
return item;
......@@ -110,8 +143,8 @@ export default {
}
},
deep: true,
immediate: true
}
immediate: true,
},
},
computed: {
// 是否显示提示
......@@ -124,11 +157,13 @@ export default {
handleBeforeUpload(file) {
// 校检文件类型
if (this.fileType) {
const fileName = file.name.split('.');
const fileName = file.name.split(".");
const fileExt = fileName[fileName.length - 1];
const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
if (!isTypeOk) {
this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
this.$modal.msgError(
`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`
);
return false;
}
}
......@@ -156,7 +191,11 @@ export default {
// 上传成功回调
handleUploadSuccess(res, file) {
if (res.code === 200) {
this.uploadList.push({ name: res.data.fileName, url: res.data.url, ossId: res.data.ossId });
this.uploadList.push({
name: res.data.fileName,
url: res.data.url,
ossId: res.data.ossId,
});
this.uploadedSuccessfully();
} else {
this.number--;
......@@ -209,12 +248,18 @@ export default {
.upload-file-uploader {
margin-bottom: 5px;
}
.upload-file-uploaderdl {
display: none;
}
.upload-file-list .el-upload-list__item {
border: 1px solid #e4e7ed;
line-height: 2;
margin-bottom: 10px;
position: relative;
}
.upload-file-list .el-upload-list__itemdis {
border: none;
}
.upload-file-list .ele-upload-list__item-content {
display: flex;
justify-content: space-between;
......
src/views/mallManagement/apply/index.vue
......@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-09-11 15:43:21
* @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-09-11 16:42:02
* @LastEditTime: 2023-09-12 16:38:39
* @FilePath: \peizhen-vue\src\views\mallManagement\apply\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
......@@ -142,6 +142,7 @@
prop="businessLicense"
key="businessLicense"
:show-overflow-tooltip="true"
width="170"
>
<template slot-scope="{ row }">
<imageUpload
......@@ -159,6 +160,7 @@
prop="foodBusinessLicense"
key="foodBusinessLicense"
:show-overflow-tooltip="true"
width="170"
>
<template slot-scope="{ row }">
<imageUpload
......@@ -176,6 +178,7 @@
prop="drugBusinessLicense"
key="drugBusinessLicense"
:show-overflow-tooltip="true"
width="170"
>
<template slot-scope="{ row }">
<imageUpload
......@@ -193,6 +196,7 @@
prop="medicalBusinessLicense"
key="medicalBusinessLicense"
:show-overflow-tooltip="true"
width="170"
>
<template slot-scope="{ row }">
<imageUpload
......@@ -210,6 +214,7 @@
prop="twoMedicalBusinessLicense"
key="twoMedicalBusinessLicense"
:show-overflow-tooltip="true"
width="180"
>
<template slot-scope="{ row }">
<imageUpload
......@@ -226,6 +231,7 @@
align="center"
prop="cashDeposit"
:show-overflow-tooltip="true"
width="120"
/>
<el-table-column
label="保证金金额"
......@@ -233,6 +239,7 @@
prop="isCashDeposit"
key="isCashDeposit"
:show-overflow-tooltip="true"
width="120"
>
<template slot-scope="{ row }">
<span v-if="row.isCashDeposit == 1">是</span>
......@@ -245,6 +252,7 @@
prop="status"
key="status"
:show-overflow-tooltip="true"
width="100"
>
<template slot-scope="{ row }">
<el-select
......@@ -280,6 +288,7 @@
align="center"
prop="createTime"
key="createTime"
width="180"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......
src/views/orderManagement/order/index.vue
......@@ -130,7 +130,7 @@
<el-table-column
label="就诊人员"
align="center"
prop="userVsitorVo.name"
prop="userVsitorVo"
key="userVsitorVo"
>
<template slot-scope="{ row }">
......@@ -142,7 +142,7 @@
>
</template>
</el-table-column>
<el-table-column label="接单人" align="center" prop="ename">
<el-table-column label="接单人" align="center" prop="ename" key="ename">
<template slot-scope="{ row }">
<span v-if="row.ename">{{ row.ename }}</span>
<span v-else>未接单</span>
......@@ -150,7 +150,10 @@
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" key="remark">
<template slot-scope="{ row }">
<el-button v-if="row.remark" type="text" @click="clickSeeROWrEM(row)"
<el-button
v-if="row.remark"
type="text"
@click="clickSeeROWrEM(row.remark, '订单备注')"
>点击查看</el-button
>
</template>
......@@ -160,6 +163,7 @@
align="center"
prop="visitTime"
key="visitTime"
width="180"
:show-overflow-tooltip="true"
/>
<el-table-column
......@@ -169,26 +173,26 @@
key="phone"
:show-overflow-tooltip="true"
/>
<el-table-column label="当前状态" align="center" prop="tStatus">
<el-table-column label="当前状态" align="center" prop="tstatus" key="tstatus">
<template slot-scope="{ row }">
<span v-if="row.tStatus == 0">已发布</span>
<span v-if="row.tStatus == 1">已接单</span>
<span v-if="row.tStatus == 2">已完成</span>
<span v-if="row.tStatus == 3">退款中</span>
<span v-if="row.tStatus == 4">已退款</span>
<span v-if="row.tStatus == 6">进行中</span>
<span v-if="row.tstatus == 0">已发布</span>
<span v-if="row.tstatus == 1">已接单</span>
<span v-if="row.tstatus == 2">已完成</span>
<span v-if="row.tstatus == 3">退款中</span>
<span v-if="row.tstatus == 4">已退款</span>
<span v-if="row.tstatus == 6">进行中</span>
</template>
</el-table-column>
<el-table-column label="订单状态" align="center" prop="yStatus">
<el-table-column label="订单状态" align="center" prop="ystatus" key="ystatus">
<template slot-scope="{ row }">
<span v-if="row.tStatus == 0">待支付</span>
<span v-if="row.tStatus == 1">已支付</span>
<span v-if="row.tStatus == 2">已完成</span>
<span v-if="row.tStatus == 7">已取消</span>
<span v-if="row.tStatus == 8">已退款</span>
<span v-if="row.ystatus == 0">待支付</span>
<span v-if="row.ystatus == 1">已支付</span>
<span v-if="row.ystatus == 2">已完成</span>
<span v-if="row.ystatus == 7">已取消</span>
<span v-if="row.ystatus == 8">已退款</span>
</template>
</el-table-column>
<el-table-column label="是否好评" align="center" prop="isSatisfaction">
<el-table-column label="是否好评" align="center" prop="isSatisfaction" key="isSatisfaction">
<template slot-scope="{ row }">
<!-- 0-未评价，1-好评，2-差评 -->
<span v-if="row.isSatisfaction == 0">未评价</span>
......@@ -201,8 +205,16 @@
align="center"
prop="evaluationContent"
key="evaluationContent"
:show-overflow-tooltip="true"
/>
>
<template slot-scope="{ row }">
<el-button
v-if="row.evaluationContent"
type="text"
@click="clickSeeROWrEM(row.evaluationContent, '订单评价')"
>查看</el-button
>
</template>
</el-table-column>
<el-table-column
label="服务完成时间"
align="center"
......@@ -223,6 +235,7 @@
align="center"
prop="createTime"
key="createTime"
width="180"
:show-overflow-tooltip="true"
/>
<!-- <el-table-column
......@@ -314,7 +327,7 @@
</el-dialog>
<el-dialog
title="订单备注"
:title="openArticleTitle"
:visible.sync="openArticle"
width="50%"
append-to-body
......@@ -370,6 +383,7 @@ export default {
return {
openArticleInfo: false,
openArticle: false,
openArticleTitle: "",
rowArticle: "",
// 按钮loading
buttonLoading: false,
......@@ -424,9 +438,10 @@ export default {
this.getList();
},
methods: {
clickSeeROWrEM(row) {
clickSeeROWrEM(text, title) {
this.openArticle = true;
this.rowArticle = row.remark;
this.rowArticle = text;
this.openArticleTitle = title;
},
clickSeeVisitor(row) {
this.VisitorData = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment