From a8739d45326d5812f8061e35847125fa9e4ea153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 13 Apr 2023 15:08:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/order.js | 1 - src/views/system/order/index.vue | 132 +++++++++++++----------------- src/views/system/order/indexjs.js | 58 ++++--------- 3 files changed, 73 insertions(+), 118 deletions(-) diff --git a/src/api/system/order.js b/src/api/system/order.js index 1a2c29d..1e9dd32 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -72,7 +72,6 @@ export function confirmCancel(appointmentOrderId) { //派单点击护理员获取信息 - export function getPersonInfo(nurseStationPersonId) { return request({ url: `/system/appointmentOrder/getPersonInfo?nurseStationPersonId=${nurseStationPersonId}`, diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index e409629..ac8ab89 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -229,73 +229,6 @@ " > - - - - - {{ nurseName }} - {{ nurseName }} - - -
- {{ nursePersonlist.workStatus=='ONLINE'?"在线":'' }} - {{ nursePersonlist.workStatus=='BE_BUSY'?"忙碌":'' }} - {{ nursePersonlist.workStatus=='OFFLINE'?"离线":'' }} -
-
- -
- {{ nursePersonlist.nursePersonType=='NURSE'?"护士":'' }} - {{ nursePersonlist.nursePersonType=='NURSE_TEACHER'?"护理师":'' }} -
-
- -
- {{ nursePersonlist.positionalTitleLevel=='PRIMARY_LEVEL'?'初级':'' }} - {{ nursePersonlist.positionalTitleLevel=='MIDDLE_LEVEL'?'中级':'' }} - {{ nursePersonlist.positionalTitleLevel=='HIGH_LEVEL'?'高级':'' }} -
-
- -
{{ nursePersonlist.geniusItem }}
-
- -
-
- -
-
-
-
- -
@@ -326,7 +259,7 @@ - + - - + + 搜索 重置 - + - - + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js index 0c360e9..fc32b2b 100644 --- a/src/views/system/order/indexjs.js +++ b/src/views/system/order/indexjs.js @@ -53,17 +53,15 @@ export default { label: "已取消", } ], - value: "", // 遮罩层 loading: true, innerVisible4: false, innerrefund: false, - // 派单弹框 - innerdispatch: false, // 护理员姓名弹框 nursePersonNameinfo: false, - //护理员list nursePersonlist: {}, + //查看证书 + certificateshow: false, PersonChecksrcList: [], // 选中数组 ids: [], @@ -79,13 +77,6 @@ export default { // 护理类型信息表格数据 OrderDetailsList: [], dispatchlist: [], - nurseName: "请选择护理员", - nursePersonid: "", - // querynursecencel:{ - // appointmentOrderId:"", - // }, - appointmentOrderId: "", - nurseStationPersonId: "", total2: 0, //护理站 stationtotal: 0, @@ -93,9 +84,6 @@ export default { nurseStationshow: false, // 弹出层标题 title: "", - // 是否显示弹出层 - open: false, - open2: false, // 查询参数 getListByUserquery: { pageNum: 1, @@ -269,47 +257,40 @@ export default { }, // 派单 dispatch(row) { - this.nursePersonlist = {} - this.PersonChecksrcList = [] - this.querynursePersonname.orderNo = row.orderNo; - this.nurseName = "请选择护理员"; - this.innerdispatch = true; - this.nursePersonid = ""; - this.querynursePersonname.pageNum = 1; - }, - // 护理员姓名弹框 - clicknursePersonName() { + this.querynursePersonname.orderNo = row.orderNo getPerson(this.querynursePersonname).then((res) => { this.dispatchlist = res.rows; this.total2 = res.total; this.nursePersonNameinfo = true; }); }, + //派单护理员 + nursePersonNameinfocancel() { + this.nursePersonNameinfo = false + this.nursePersonlist = {} + }, // 护理员姓名弹框确定按钮 - submitForm() { + submitFormclick() { let params = { - nurseStationPersonId: this.nursePersonid, + nurseStationPersonId: this.nursePersonlist.nurseStationPersonId, orderNo: this.querynursePersonname.orderNo, }; dispatchsubmit(params).then((res) => { if (res.code == 200) { this.$modal.msgSuccess("派单成功"); } - this.innerdispatch = false; + this.nursePersonNameinfo = false; this.getList(); - this.nurseName = "请选择护理员"; }); }, - // 选择姓名按钮 + submitForm(row) { + this.nursePersonlist = row + }, + // 查看护理员证书按钮 nursePersonclick(row) { - this.nursePersonid = row.nurseStationPersonId; getPersonInfo(row.nurseStationPersonId).then(res => { - this.nurseName = res.data.nursePersonName; - this.nursePersonNameinfo = false; - this.nursePersonlist = res.data - res.data.nurseStationPersonCertificateList.forEach(e => { - this.PersonChecksrcList.push(this.baseurl + e.certificateUrl) - }); + this.PersonChecksrcList = res.data; + this.certificateshow = true }) }, // 确认取消预约 @@ -357,11 +338,6 @@ export default { this.loading = false; }); }, - // 取消按钮 - cancel() { - this.open = false; - this.reset(); - }, // 表单重置 reset() { this.form = {