Skip to content

P
peizhen-vue
Commit 7198ffd7 by ‘巴博尔’
Options

对账单与修改

parent b1cdb497
Showing with 661 additions and 90 deletions
src/api/merchant/divide.js 0 → 100644
import request from "@/utils/request";
// 查询订单分成记录列表
export function listDivide(query) {
return request({
url: "/merchant/divide/list",
method: "get",
params: query,
});
}
// 数据
export function platformRevenueDivGET(query) {
return request({
url: "/system/data/platformRevenueDiv",
method: "get",
params: query,
});
}
// 查询订单分成记录详细
export function getDivide(id) {
return request({
url: "/merchant/divide/" + id,
method: "get",
});
}
// 新增订单分成记录
export function addDivide(data) {
return request({
url: "/merchant/divide",
method: "post",
data: data,
});
}
// 修改订单分成记录
export function updateDivide(data) {
return request({
url: "/merchant/divide",
method: "put",
data: data,
});
}
// 删除订单分成记录
export function delDivide(id) {
return request({
url: "/merchant/divide/" + id,
method: "delete",
});
}
src/views/financialManagement/income/index.vue
...@@ -161,10 +161,6 @@ ...@@ -161,10 +161,6 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<template v-if="row.status == 0">
<el-button type="primary" @click="clickBH(row, 1)">通过</el-button>
<el-button type="primary" @click="clickBH(row, 2)">拒绝</el-button>
</template>
<span v-if="row.status == 1">成功提现</span> <span v-if="row.status == 1">成功提现</span>
<span v-if="row.status == 2">拒绝提现</span> <span v-if="row.status == 2">拒绝提现</span>
</template> </template>
...@@ -177,30 +173,38 @@ ...@@ -177,30 +173,38 @@
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<!-- <el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <!-- <el-button
size="large" size="large"
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:income:edit']" v-hasPermi="['system:income:edit']"
>修改</el-button >修改</el-button
> > -->
<el-button <!-- <el-button
size="large" size="large"
type="primary" type="primary"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:income:remove']" v-hasPermi="['system:income:remove']"
>删除</el-button >删除</el-button
> -->
<template v-if="scope.row.status == 0">
<el-button type="primary" @click="clickBH(scope.row, 1)"
>通过</el-button
>
<el-button type="primary" @click="clickBH(scope.row, 2)"
>拒绝</el-button
> >
</template> </template>
</el-table-column> --> </template>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
......
src/views/merchant/divide/index.vue 0 → 100644
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="large"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<el-form-item label="订单号" prop="orderSn">
<el-input
v-model="queryParams.orderSn"
placeholder="请输入订单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户手机号" prop="phone">
<el-input
v-model="queryParams.phone"
placeholder="请输入用户手机号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<template v-if="user.roleId == 2">
<el-form-item label="城市" prop="city">
<el-input
v-model="queryParams.city"
placeholder="请输入城市"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="机构名称" prop="companyName">
<el-input
v-model="queryParams.companyName"
placeholder="请输入机构名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</template>
<el-form-item label="服务类型" prop="serviceType">
<el-input
v-model="queryParams.serviceType"
placeholder="请输入服务类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="分成时间" prop="startTime">
<el-date-picker
v-model="queryParams.startTime"
type="datetime"
placeholder="选择分成时间"
value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="large"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="large" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['merchant:divide:add']"
>新增</el-button
>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['merchant:divide:edit']"
>修改</el-button
>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['merchant:divide:remove']"
>删除</el-button
>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['merchant:divide:export']"
>导出</el-button
>
</el-col> -->
<div class="nav-t">
<p>
订单价合计：<span>￥{{ platformRevenueDivData.orderPrice }}</span>
</p>
<p>
平台分成合计：<span
>￥{{ platformRevenueDivData.dividePriceAdmin }}</span
>
</p>
<p>
机构分成合计：<span>￥{{ platformRevenueDivData.dividePrice }}</span>
</p>
</div>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="divideList"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<!-- <el-table-column label="" align="center" prop="id" v-if="true" /> -->
<el-table-column label="订单号" align="center" prop="orderSn" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" />
<el-table-column
label="城市"
align="center"
prop="city"
v-if="user.roleId == 2"
/>
<el-table-column
label="机构名称"
align="center"
prop="companyName"
v-if="user.roleId == 2"
:show-overflow-tooltip="true"
/>
<el-table-column label="订单价" align="center" prop="payMoney" />
<el-table-column
label="平台分成"
align="center"
prop="dividePriceAdmin"
/>
<el-table-column label="机构分成" align="center" prop="dividePrice" />
<el-table-column label="机构佣金比例" align="center" prop="proportion">
<template slot-scope="{ row }">
<div>{{ row.proportion }}%</div>
</template>
</el-table-column>
<el-table-column label="服务类型" align="center" prop="serviceType" />
<el-table-column label="分成时间" align="center" prop="startTime" />
<!-- <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['merchant:divide:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['merchant:divide:remove']"
>删除</el-button
>
</template>
</el-table-column> -->
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改订单分成记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="订单" prop="orderId">
<el-input v-model="form.orderId" placeholder="请输入订单" />
</el-form-item>
<el-form-item label="分成比例" prop="proportion">
<el-input v-model="form.proportion" placeholder="请输入分成比例" />
</el-form-item>
<el-form-item label="陪诊人" prop="emId">
<el-input v-model="form.emId" placeholder="请输入陪诊人" />
</el-form-item>
<el-form-item label="商户" prop="companyId">
<el-input v-model="form.companyId" placeholder="请输入商户" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listDivide,
getDivide,
delDivide,
addDivide,
updateDivide,
platformRevenueDivGET,
} from "@/api/merchant/divide";
import { mapGetters } from "vuex";
export default {
name: "Divide",
computed: {
...mapGetters(["user"]),
},
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 订单分成记录表格数据
divideList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
orderSn: undefined,
phone: undefined,
city: undefined,
companyName: undefined,
serviceType: undefined,
startTime: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
id: [{ required: true, message: "不能为空", trigger: "blur" }],
orderId: [{ required: true, message: "订单不能为空", trigger: "blur" }],
orderPrice: [
{ required: true, message: "订单价格不能为空", trigger: "blur" },
],
dividePrice: [
{ required: true, message: "订单分成不能为空", trigger: "blur" },
],
proportion: [
{ required: true, message: "分成比例不能为空", trigger: "blur" },
],
emId: [{ required: true, message: "陪诊人不能为空", trigger: "blur" }],
companyId: [
{ required: true, message: "商户不能为空", trigger: "blur" },
],
},
platformRevenueDivData: {
orderPrice: 0,
dividePrice: 0,
dividePriceAdmin: 0,
},
};
},
created() {
console.log(this.user, "11111");
this.getList();
this.platformRevenueDivAxios();
},
methods: {
async platformRevenueDivAxios() {
const { code, data } = await platformRevenueDivGET();
if (code === 200) {
this.platformRevenueDivData = data;
}
},
/** 查询订单分成记录列表 */
getList() {
this.loading = true;
listDivide(this.queryParams).then((response) => {
this.divideList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: undefined,
orderId: undefined,
orderPrice: undefined,
dividePrice: undefined,
proportion: undefined,
emId: undefined,
companyId: undefined,
createBy: undefined,
createTime: undefined,
updateBy: undefined,
updateTime: undefined,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加订单分成记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const id = row.id || this.ids;
getDivide(id).then((response) => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改订单分成记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
this.buttonLoading = true;
if (this.form.id != null) {
updateDivide(this.form)
.then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
})
.finally(() => {
this.buttonLoading = false;
});
} else {
addDivide(this.form)
.then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
})
.finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
.confirm('是否确认删除订单分成记录编号为"' + ids + '"的数据项？')
.then(() => {
this.loading = true;
return delDivide(ids);
})
.then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {})
.finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download(
"merchant/divide/export",
{
...this.queryParams,
},
`divide_${new Date().getTime()}.xlsx`
);
},
},
};
</script>
<style lang="scss" scoped>
.nav-t {
display: flex;
flex-wrap: wrap;
p {
margin: 0px;
margin-right: 10px;
font-size: 16px;
span {
color: #409eff;
}
}
}
</style>
src/views/orderManagement/dbghOrder/index.vue
...@@ -211,11 +211,12 @@ ...@@ -211,11 +211,12 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')" @click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button >查看</el-button
> > -->
{{ row.title }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -242,9 +243,10 @@ ...@@ -242,9 +243,10 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)" <!-- <el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button >查看</el-button
> > -->
<span v-if="row.ename"> {{ row.ename }}</span>
<span v-else>未接单</span> <span v-else>未接单</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -272,11 +274,12 @@ ...@@ -272,11 +274,12 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.visitTime, '期望就诊时间')" @click="clickSeeROWrEM(row.visitTime, '期望就诊时间')"
>查看</el-button >查看</el-button
> > -->
{{ row.visitTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -385,11 +388,12 @@ ...@@ -385,11 +388,12 @@
sortable sortable
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')" @click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button >查看</el-button
> > -->
{{ row.createTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/orderManagement/dbmyOrder/index.vue
...@@ -182,11 +182,12 @@ ...@@ -182,11 +182,12 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrFK(row.ypName, '药品名称')" @click="clickSeeROWrFK(row.ypName, '药品名称')"
>查看</el-button >查看</el-button
> > -->
{{ row.ypName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -198,12 +199,12 @@ ...@@ -198,12 +199,12 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- v-if="row.ydAddress" --> <!-- <el-button
<el-button
type="primary" type="primary"
@click="clickSeeROWrFK(row.ydAddress, '药店地址')" @click="clickSeeROWrFK(row.ydAddress, '药店地址')"
>查看</el-button >查看</el-button
> > -->
{{ row.ydAddress }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -214,13 +215,13 @@ ...@@ -214,13 +215,13 @@
width="100" width="100"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }">
<el-button type="primary" @click="clickSeeJudge(row)">查看</el-button>
</template>
<!-- <template slot-scope="{ row }"> <!-- <template slot-scope="{ row }">
<el-button type="primary" @click="clickSeeJudge(row)">查看</el-button>
</template> -->
<template slot-scope="{ row }">
<span v-if="row.isCf == 0">否</span> <span v-if="row.isCf == 0">否</span>
<span v-if="row.isCf == 1">是</span> <span v-if="row.isCf == 1">是</span>
</template> --> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="处方附件" label="处方附件"
...@@ -230,7 +231,7 @@ ...@@ -230,7 +231,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="120" width="120"
> >
<!-- <template slot-scope="{ row }"> <template slot-scope="{ row }">
<fileUpload <fileUpload
v-model="row.prescriptionAttachment" v-model="row.prescriptionAttachment"
:isShowTip="false" :isShowTip="false"
...@@ -242,10 +243,9 @@ ...@@ -242,10 +243,9 @@
? row.prescriptionAttachment.split(',').length ? row.prescriptionAttachment.split(',').length
: 1 : 1
" "
/> ></fileUpload>
</template> --> </template>
<template slot-scope="{ row }"> <template slot-scope="{ row }" v-if="false">
<!-- v-if="row.prescriptionAttachment" -->
<el-button <el-button
type="primary" type="primary"
@click=" @click="
...@@ -264,12 +264,13 @@ ...@@ -264,12 +264,13 @@
align="center" align="center"
prop="way" prop="way"
key="way" key="way"
width="100" width="120"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- <span v-if="row.way == 0">邮寄到家</span> <span v-if="row.way == 0">邮寄到家</span>
<span v-if="row.way == 1">送货上门</span> --> <span v-else-if="row.way == 1">送货上门</span>
<el-button type="primary" @click="clickSeeWay(row)">查看</el-button> <span v-else>暂无取药方式</span>
<!-- <el-button type="primary" @click="clickSeeWay(row)">查看</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -281,12 +282,13 @@ ...@@ -281,12 +282,13 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- v-if="row.recipient" -->
<el-button <el-button
type="primary" type="primary"
@click="clickSeeROWrFK(row.recipient, '收件人')" @click="clickSeeROWrFK(row.recipient, '收件人')"
v-if="false"
>查看</el-button >查看</el-button
> >
{{ row.recipient }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -301,8 +303,10 @@ ...@@ -301,8 +303,10 @@
<el-button <el-button
type="primary" type="primary"
@click="clickSeeROWrFK(row.adress, '收货地址')" @click="clickSeeROWrFK(row.adress, '收货地址')"
v-if="false"
>查看</el-button >查看</el-button
> >
{{ row.adress }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -320,13 +324,14 @@ ...@@ -320,13 +324,14 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="100" width="100"
> >
<!-- v-if="row.addressInfo" -->
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <el-button
type="primary" type="primary"
@click="clickSeeROWrFK(row.addressInfo, '详细地址')" @click="clickSeeROWrFK(row.addressInfo, '详细地址')"
v-if="false"
>查看</el-button >查看</el-button
> >
{{ row.addressInfo }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -337,9 +342,9 @@ ...@@ -337,9 +342,9 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- v-if="row.ename" --> <!-- <el-button type="primary" @click="clickSeeEM(row)">查看</el-button>-->
<el-button type="primary" @click="clickSeeEM(row)">查看</el-button> <span v-if="row.ename">{{ row.ename }}</span>
<!-- <span v-else>未接单</span> --> <span v-else>未接单</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -480,8 +485,10 @@ ...@@ -480,8 +485,10 @@
<el-button <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')" @click="clickSeeROWrEM(row.createTime, '创建时间')"
v-if="false"
>查看</el-button >查看</el-button
> >
{{ row.createTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -1647,6 +1654,7 @@ export default { ...@@ -1647,6 +1654,7 @@ export default {
height: 500px; height: 500px;
overflow-x: hidden; overflow-x: hidden;
} }
.content { .content {
width: 100%; width: 100%;
} }
...@@ -1656,11 +1664,14 @@ export default { ...@@ -1656,11 +1664,14 @@ export default {
width: calc(100 - 40px); width: calc(100 - 40px);
color: #333333; color: #333333;
font-size: 16px; font-size: 16px;
&-item { &-item {
display: flex; display: flex;
&-label { &-label {
width: 20%; width: 20%;
} }
&-rig { &-rig {
width: 80%; width: 80%;
} }
...@@ -1672,6 +1683,7 @@ export default { ...@@ -1672,6 +1683,7 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
&-item { &-item {
width: 48%; width: 48%;
margin-bottom: 20px; margin-bottom: 20px;
...@@ -1686,6 +1698,7 @@ export default { ...@@ -1686,6 +1698,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
> img { > img {
width: 60px; width: 60px;
height: 60px; height: 60px;
......
src/views/orderManagement/dbwzOrder/index.vue
...@@ -190,14 +190,14 @@ ...@@ -190,14 +190,14 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')" @click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button >查看</el-button
> > -->
{{}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="订单价" label="订单价"
align="center" align="center"
...@@ -229,9 +229,10 @@ ...@@ -229,9 +229,10 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)" <!-- <el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button >查看</el-button
> > -->
<span v-if="row.ename">{{ row.ename }}</span>
<span v-else>未接单</span> <span v-else>未接单</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -244,12 +245,13 @@ ...@@ -244,12 +245,13 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
v-if="row.chiefComplaint" v-if="row.chiefComplaint"
type="primary" type="primary"
@click="clickSeeROWrEM(row.visitTime, '期望就诊时间')" @click="clickSeeROWrEM(row.visitTime, '期望就诊时间')"
>查看</el-button >查看</el-button
> > -->
{{ row.visitTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -274,14 +276,16 @@ ...@@ -274,14 +276,16 @@
prop="chiefComplaint" prop="chiefComplaint"
key="chiefComplaint" key="chiefComplaint"
width="100" width="100"
v-if="false"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
v-if="row.chiefComplaint" v-if="row.chiefComplaint"
type="primary" type="primary"
@click="clickSeeROWrEM(row.chiefComplaint, '主诉')" @click="clickSeeROWrEM(row.chiefComplaint, '主诉')"
>查看</el-button >查看</el-button
> > -->
{{ row.chiefComplaint }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -290,14 +294,16 @@ ...@@ -290,14 +294,16 @@
prop="historyOfPresentIllness" prop="historyOfPresentIllness"
key="historyOfPresentIllness" key="historyOfPresentIllness"
width="100" width="100"
v-if="false"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
v-if="row.historyOfPresentIllness" v-if="row.historyOfPresentIllness"
type="primary" type="primary"
@click="clickSeeROWrEM(row.historyOfPresentIllness, '现病史')" @click="clickSeeROWrEM(row.historyOfPresentIllness, '现病史')"
>查看</el-button >查看</el-button
> > -->
{{ row.historyOfPresentIllness }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -306,14 +312,16 @@ ...@@ -306,14 +312,16 @@
prop="pastHistory" prop="pastHistory"
key="pastHistory" key="pastHistory"
width="100" width="100"
v-if="false"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
v-if="row.pastHistory" v-if="row.pastHistory"
type="primary" type="primary"
@click="clickSeeROWrEM(row.pastHistory, '即往史')" @click="clickSeeROWrEM(row.pastHistory, '即往史')"
>查看</el-button >查看</el-button
> > -->
{{ row.pastHistory }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -322,16 +330,18 @@ ...@@ -322,16 +330,18 @@
prop="lastMedicalTreatmentSituation" prop="lastMedicalTreatmentSituation"
key="lastMedicalTreatmentSituation" key="lastMedicalTreatmentSituation"
width="100" width="100"
v-if="false"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
v-if="row.lastMedicalTreatmentSituation" v-if="row.lastMedicalTreatmentSituation"
type="primary" type="primary"
@click=" @click="
clickSeeROWrEM(row.lastMedicalTreatmentSituation, '上次就医情况') clickSeeROWrEM(row.lastMedicalTreatmentSituation, '上次就医情况')
" "
>查看</el-button >查看</el-button
> > -->
{{ row.lastMedicalTreatmentSituation }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -340,14 +350,16 @@ ...@@ -340,14 +350,16 @@
prop="postTreatmentCondition" prop="postTreatmentCondition"
key="postTreatmentCondition" key="postTreatmentCondition"
width="100" width="100"
v-if="false"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
v-if="row.postTreatmentCondition" v-if="row.postTreatmentCondition"
type="primary" type="primary"
@click="clickSeeROWrEM(row.postTreatmentCondition, '治疗后情况')" @click="clickSeeROWrEM(row.postTreatmentCondition, '治疗后情况')"
>查看</el-button >查看</el-button
> > -->
{{ row.postTreatmentCondition }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -355,6 +367,7 @@ ...@@ -355,6 +367,7 @@
align="center" align="center"
prop="relatedReports" prop="relatedReports"
key="relatedReports" key="relatedReports"
v-if="false"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<span v-if="row.relatedReports">已上传</span> <span v-if="row.relatedReports">已上传</span>
...@@ -367,14 +380,16 @@ ...@@ -367,14 +380,16 @@
prop="serviceRequirements" prop="serviceRequirements"
key="serviceRequirements" key="serviceRequirements"
width="100" width="100"
v-if="false"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
v-if="row.serviceRequirements" v-if="row.serviceRequirements"
type="primary" type="primary"
@click="clickSeeROWrEM(row.serviceRequirements, '服务要求')" @click="clickSeeROWrEM(row.serviceRequirements, '服务要求')"
>查看</el-button >查看</el-button
> > -->
{{ row.serviceRequirements }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -483,11 +498,12 @@ ...@@ -483,11 +498,12 @@
sortable sortable
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')" @click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button >查看</el-button
> > -->
{{ row.createTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/orderManagement/order/index.vue
...@@ -212,11 +212,12 @@ ...@@ -212,11 +212,12 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')" @click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button >查看</el-button
> > -->
{{ row.title }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -243,9 +244,10 @@ ...@@ -243,9 +244,10 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)" <!-- <el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button >查看</el-button
> > -->
<span v-if="row.ename"> {{ row.ename }}</span>
<span v-else>未接单</span> <span v-else>未接单</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -274,11 +276,12 @@ ...@@ -274,11 +276,12 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.visitTime, '订单就诊时间')" @click="clickSeeROWrEM(row.visitTime, '订单就诊时间')"
>查看</el-button >查看</el-button
> > -->
{{ row.visitTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -289,11 +292,12 @@ ...@@ -289,11 +292,12 @@
width="120" width="120"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.phone, '预约电话')" @click="clickSeeROWrEM(row.phone, '预约电话')"
>查看</el-button >查看</el-button
> > -->
{{ row.phone }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -402,11 +406,12 @@ ...@@ -402,11 +406,12 @@
sortable sortable
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')" @click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button >查看</el-button
> > -->
{{ row.createTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
src/views/orderManagement/zqghOrder/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: ‘巴博尔’ 2164119982@qq.com * @Author: ‘巴博尔’ 2164119982@qq.com
* @Date: 2023-12-04 15:56:04 * @Date: 2023-12-04 15:56:04
* @LastEditors: ‘巴博尔’ 2164119982@qq.com * @LastEditors: ‘巴博尔’ 2164119982@qq.com
* @LastEditTime: 2023-12-06 09:49:26 * @LastEditTime: 2023-12-07 11:07:54
* @FilePath: \peizhen-vue\src\views\orderManagement\zqghOrder\index.vue * @FilePath: \peizhen-vue\src\views\orderManagement\zqghOrder\index.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--> -->
...@@ -197,9 +197,10 @@ ...@@ -197,9 +197,10 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="primary" @click="clickSeeROWrEM(row.title, '科室')" <!-- <el-button type="primary" @click="clickSeeROWrEM(row.title, '科室')"
>查看</el-button >查看</el-button
> > -->
{{ row.title }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -217,11 +218,12 @@ ...@@ -217,11 +218,12 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.userName, '用户')" @click="clickSeeROWrEM(row.userName, '用户')"
>查看</el-button >查看</el-button
> > -->
{{ row.userName }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -233,11 +235,12 @@ ...@@ -233,11 +235,12 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.timeOfAppointment, '预约时间')" @click="clickSeeROWrEM(row.timeOfAppointment, '预约时间')"
>查看</el-button >查看</el-button
> > -->
{{ row.timeOfAppointment }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -291,11 +294,12 @@ ...@@ -291,11 +294,12 @@
sortable sortable
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')" @click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button >查看</el-button
> > -->
{{ row.createTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -824,7 +828,7 @@ export default { ...@@ -824,7 +828,7 @@ export default {
} }
}, },
changeHId(e) { changeHId(e) {
console.log('changeHId',e); console.log("changeHId", e);
this.$set(this.form, "doctorId", undefined); this.$set(this.form, "doctorId", undefined);
this.doctorListAxios(e); this.doctorListAxios(e);
}, },
......
src/views/orderManagement/zyphOrder/index.vue
...@@ -210,11 +210,12 @@ ...@@ -210,11 +210,12 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.title, '订单科室')" @click="clickSeeROWrEM(row.title, '订单科室')"
>查看</el-button >查看</el-button
> > -->
{{ row.title }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -241,9 +242,10 @@ ...@@ -241,9 +242,10 @@
width="100" width="100"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)" <!-- <el-button v-if="row.ename" type="primary" @click="clickSeeEM(row)"
>查看</el-button >查看</el-button
> > -->
<span v-if="row.ename">{{ row.ename }}</span>
<span v-else>未接单</span> <span v-else>未接单</span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -268,17 +270,19 @@ ...@@ -268,17 +270,19 @@
align="center" align="center"
prop="startDay" prop="startDay"
key="startDay" key="startDay"
width="180" width="270"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<!-- {{ row.startDay }} - {{ row.endDay }} --> <!-- <el-button
<el-button
type="primary" type="primary"
@click=" @click="
clickSeeROWrEM(`${row.startDay}至${row.endDay}`, '期待陪护日期') clickSeeROWrEM(`${row.startDay}至${row.endDay}`, '期待陪护日期')
" "
>查看</el-button >查看</el-button
> -->
<span v-if="row.startDay && row.endDay"
>{{ row.startDay }}至{{ row.endDay }}</span
> >
</template> </template>
</el-table-column> </el-table-column>
...@@ -400,11 +404,12 @@ ...@@ -400,11 +404,12 @@
sortable sortable
> >
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button <!-- <el-button
type="primary" type="primary"
@click="clickSeeROWrEM(row.createTime, '创建时间')" @click="clickSeeROWrEM(row.createTime, '创建时间')"
>查看</el-button >查看</el-button
> > -->
{{ row.createTime }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
......
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