From f3ace8e13e6c00385f9252b54e4637f7291d5059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Wed, 17 May 2023 16:44:14 +0800 Subject: [PATCH 01/29] =?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/area.js | 8 ++ src/views/system/area/index.vue | 208 +++++++++++++++----------------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/src/api/system/area.js b/src/api/system/area.js index fa736d6..23661cc 100644 --- a/src/api/system/area.js +++ b/src/api/system/area.js @@ -76,4 +76,12 @@ export function updateRemoteSigns(id, remoteSigns) { url: `/system/area/updateRemoteSigns?id=${id}&remoteSigns=${remoteSigns}`, method: 'POST' }) +} + +//同步百度地图 +export function getAreaList(keyword, areaLevel, parentCode, parentId) { + return request({ + url: `/system/area/getAreaList?keyword=${keyword}&areaLevel=${areaLevel}&parentCode=${parentCode}&parentId=${parentId}`, + method: 'get' + }) } \ No newline at end of file diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index 42752b9..23c29cb 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -49,16 +49,14 @@ /> - 搜索 - 重置 + 搜索 + 重置 + + + + 点击同步百度地图区域信息 + ({{getbaidulist.areaName=='区域列表'?'全国':getbaidulist.areaName}}) + - + --> + @@ -129,17 +123,11 @@ active-color="#13ce66" inactive-color="#ff4949" @change="updateRemoteSigns(scope.row)" - > - - + > - + @@ -177,33 +163,14 @@ /> - - - + + - - + + @@ -213,12 +180,12 @@ + --> 否 是 - + { + selectAreaListquery(val).then(res => { this.deptOptions = res.data; }); } @@ -331,16 +300,34 @@ export default { this.selectAreaListin(); } } - }, + } }, methods: { + //同步百度地图 + getbaiduArea() { + console.log(this.getbaidulist) + if (this.getbaidulist.areaName == "区域列表") { + getAreaList("", 1, "", "").then(res => { + this.handleNodeClick(this.getbaidulist); + }); + } else { + getAreaList( + this.getbaidulist.areaName, + "", + this.getbaidulist.areaCode, + this.getbaidulist.id + ).then(res => { + this.handleNodeClick(this.getbaidulist); + }); + } + }, //修改是否为边远地区 updateRemoteSigns(row) { if (row.remoteSigns) { this.$confirm('确定修改"' + row.areaName + '"为偏远地区吗?', { confirmButtonText: "确定", cancelButtonText: "取消", - type: "warning", + type: "warning" }) .then(() => { var remoteSigns = null; @@ -349,11 +336,11 @@ export default { } else { remoteSigns = 0; } - updateRemoteSigns(row.id, remoteSigns).then((res) => { + updateRemoteSigns(row.id, remoteSigns).then(res => { if (res.code == 200) { this.$message({ type: "success", - message: "修改为偏远地区!", + message: "修改为偏远地区!" }); } }); @@ -362,14 +349,14 @@ export default { row.remoteSigns = false; this.$message({ type: "info", - message: "取消修改", + message: "取消修改" }); }); } else { this.$confirm('确定修改"' + row.areaName + '"为非偏远地区吗吗?', { confirmButtonText: "确定", cancelButtonText: "取消", - type: "warning", + type: "warning" }) .then(() => { var remoteSigns = null; @@ -378,11 +365,11 @@ export default { } else { remoteSigns = 0; } - updateRemoteSigns(row.id, remoteSigns).then((res) => { + updateRemoteSigns(row.id, remoteSigns).then(res => { if (res.code == 200) { this.$message({ type: "success", - message: "修改为非偏远地区!", + message: "修改为非偏远地区!" }); } }); @@ -391,25 +378,26 @@ export default { row.remoteSigns = true; this.$message({ type: "info", - message: "取消修改", + message: "取消修改" }); }); } }, // 节点单击事件 handleNodeClick(data) { + this.getbaidulist = data; this.queryParams.areaLevel = null; this.loading = true; this.queryParams.parentCode = data.areaCode; if (data.areaCode != 1) { this.handleQuery(); - selectAreaList("", data.areaCode).then((res) => { + selectAreaList("", data.areaCode).then(res => { if (res.data.length > 0) { - res.data.forEach((e) => { + res.data.forEach(e => { e.children = [ { - areaName: "", - }, + areaName: "" + } ]; }); } else { @@ -422,13 +410,13 @@ export default { this.queryParams.parentCode = null; this.queryParams.areaLevel = 1; this.handleQuery(); - selectAreaListinfo(1).then((res) => { + selectAreaListinfo(1).then(res => { if (res.data.length > 0) { - res.data.forEach((e) => { + res.data.forEach(e => { e.children = [ { - areaName: "", - }, + areaName: "" + } ]; }); } else { @@ -441,20 +429,20 @@ export default { }, selectAreaListin() { this.loading = true; - selectAreaListinfo(1).then((res) => { - res.data.forEach((e) => { + selectAreaListinfo(1).then(res => { + res.data.forEach(e => { e.children = [ { - areaName: "", - }, + areaName: "" + } ]; }); var obj = [ { areaName: "区域列表", children: res.data, - areaCode: 1, - }, + areaCode: 1 + } ]; this.deptOptions = obj; this.loading = false; @@ -462,11 +450,11 @@ export default { }, info() { this.loading = true; - selectAreaList(this.areaName).then((res) => { + selectAreaList(this.areaName).then(res => { this.loading = false; var obj = { areaName: "区域列表", - children: res.data, + children: res.data }; this.deptOptions = obj; }); @@ -474,8 +462,8 @@ export default { /** 查询区域列表 */ getList() { this.loading = true; - listArea(this.queryParams).then((response) => { - response.rows.forEach((e) => { + listArea(this.queryParams).then(response => { + response.rows.forEach(e => { if (e.remoteSigns == 1) { e.remoteSigns = true; } else { @@ -508,7 +496,7 @@ export default { updateTime: null, areaType: null, parentCode: null, - remoteSigns: "0", + remoteSigns: "0" }; this.resetForm("form"); }, @@ -529,11 +517,15 @@ export default { this.resetForm("queryForm"); this.queryParams.parentCode = null; this.queryParams.areaLevel = 1; + this.getbaidulist = { + areaName: "区域列表", + areaLevel: 1 + }; this.handleQuery(); }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map((item) => item.id); + this.ids = selection.map(item => item.id); this.single = selection.length !== 1; this.multiple = !selection.length; }, @@ -551,7 +543,7 @@ export default { handleUpdate(row) { this.reset(); const id = row.id || this.ids; - getArea(id).then((response) => { + getArea(id).then(response => { response.data.remoteSigns = String(response.data.remoteSigns); this.form = response.data; this.open = true; @@ -560,24 +552,24 @@ export default { }, /** 提交按钮 */ submitForm() { - this.$refs["form"].validate((valid) => { + this.$refs["form"].validate(valid => { if (valid) { if (this.form.id != null) { - updateArea(this.form).then((response) => { + updateArea(this.form).then(response => { if (response.code == 200) { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); + this.$modal.msgSuccess("修改成功"); + this.open = false; + this.getList(); } }); } else { - addArea(this.form).then((response) => { + addArea(this.form).then(response => { if (response.code == 200) { - this.$modal.msgSuccess("新增成功"); - this.open = false; - this.queryParams.parentCode = this.form.parentCode; - this.queryParams.areaLevel = null; - this.getList(); + this.$modal.msgSuccess("新增成功"); + this.open = false; + this.queryParams.parentCode = this.form.parentCode; + this.queryParams.areaLevel = null; + this.getList(); } }); } @@ -589,7 +581,7 @@ export default { const ids = row.id || this.ids; this.$modal .confirm('是否确认删除区域名称为"' + row.areaName + '"的数据项吗？') - .then(function () { + .then(function() { return delArea(ids); }) .then(() => { @@ -603,11 +595,11 @@ export default { this.download( "system/area/export", { - ...this.queryParams, + ...this.queryParams }, `area_${new Date().getTime()}.xlsx` ); - }, - }, + } + } }; From 12ad105d8a2db87308a7abf0c1daacc827ca19b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Wed, 17 May 2023 16:49:23 +0800 Subject: [PATCH 02/29] =?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/views/system/area/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index 23c29cb..96be5a2 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -305,10 +305,11 @@ export default { methods: { //同步百度地图 getbaiduArea() { - console.log(this.getbaidulist) + console.log(this.getbaidulist); if (this.getbaidulist.areaName == "区域列表") { getAreaList("", 1, "", "").then(res => { this.handleNodeClick(this.getbaidulist); + this.selectAreaListin(); }); } else { getAreaList( @@ -519,7 +520,8 @@ export default { this.queryParams.areaLevel = 1; this.getbaidulist = { areaName: "区域列表", - areaLevel: 1 + areaLevel: 1, + areaCode: 1 }; this.handleQuery(); }, From 2e97031550c638a1416d5628a232afa19dd86396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Mon, 22 May 2023 16:16:23 +0800 Subject: [PATCH 03/29] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/system/order.js b/src/api/system/order.js index c208195..4d3026e 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -19,7 +19,7 @@ export function Detailed(id) { export function appointmentOrderDetails(id) { return request({ - url: `/system/appointmentOrderDetails/Detailed` + `?orderNo=${id}`, + url: `/system/appointmentOrderDetails/detailed` + `?orderNo=${id}`, method: 'get', }) From 0a6052fd6398912f6b43aa2d248aeefb54dde417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Mon, 22 May 2023 16:17:27 +0800 Subject: [PATCH 04/29] =?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/views/system/area/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue index 96be5a2..665eae0 100644 --- a/src/views/system/area/index.vue +++ b/src/views/system/area/index.vue @@ -305,7 +305,6 @@ export default { methods: { //同步百度地图 getbaiduArea() { - console.log(this.getbaidulist); if (this.getbaidulist.areaName == "区域列表") { getAreaList("", 1, "", "").then(res => { this.handleNodeClick(this.getbaidulist); From aee2e47312e8e40c514ff75575f0c3f46812d48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Tue, 23 May 2023 09:17:26 +0800 Subject: [PATCH 05/29] =?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/views/system/order/index.vue | 116 +++++++++++++++++++++++- src/views/system/order/indexjs.js | 141 +++++++++++++++++++++--------- 2 files changed, 213 insertions(+), 44 deletions(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 7cd27e3..3fb0b21 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -70,16 +70,26 @@ 已取消 + + + + \ No newline at end of file diff --git a/src/views/system/station/stationjs.js b/src/views/system/station/stationjs.js index 66c9d2a..788fcdd 100644 --- a/src/views/system/station/stationjs.js +++ b/src/views/system/station/stationjs.js @@ -8,6 +8,7 @@ import { getFirstLevelInfo, getSecondaryLevelInfo, updatePicture, + nurseStationFriends } from "@/api/system/station"; import stationAcatar from "../stationAvatar/index.vue"; import { getListByUser } from "@/api/system/userlist.js"; @@ -84,21 +85,25 @@ export default { labelDescription: "", sort: "", idd: 1, - }, ], + },], // 护理站信息表格数据 stationList: [{ sysAreaVOList: [{ provinceName: null, cityName: null, streetName: null, - }, ], - }, ], + },], + },], nurseStationlist: [], // 弹出层标题 title: "", // 是否显示弹出层 open: false, Classifyshow: false, + nurseStationFriendslist: { + img: undefined + }, + nurseStationFriendsshow: false, afternoonOpenStartTimeStr: "", afternoonOpenEndTimeStr: "", //权限查询 @@ -150,13 +155,13 @@ export default { // validator: checkMobile, trigger: "blur", message: "请输入手机号", - }, ], + },], dutyPhone: [{ // validator: checkMobile2, trigger: "blur", message: "请输入联系电话", - }, ], + },], sort: [{ required: true, message: "排序不能为空", trigger: "blur" }], address: [{ required: true, message: "地址不能为空", trigger: "blur" }], longitude: [ @@ -185,6 +190,16 @@ export default { this.classifylistInfo(); }, methods: { + GenerateQRcode(row) { + this.loading = true + this.nurseStationFriendslist = row; + nurseStationFriends(row.id).then(res => { + this.nurseStationFriendslist.img = + process.env.VUE_APP_BASE_API + res.msg; + this.nurseStationFriendsshow = true; + this.loading = false + }); + }, imgs(item) { this.imgsurl.pictureUrlList.push(item); }, @@ -201,7 +216,7 @@ export default { labelDescription: "", sort: "", idd: 1, - }, ]; + },]; } else { this.looknurseStationLabel.splice(index, 1); } @@ -270,10 +285,10 @@ export default { obj.pictureUrlList.push(this.form.stationPictureUrl); } if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then((res) => { }); } if (this.imgsurl.pictureUrlList.length > 0) { - updatePicture(this.imgsurl).then((res) => {}); + updatePicture(this.imgsurl).then((res) => { }); } this.imgsurl = { pictureUrlList: [] }; this.open = false; @@ -425,7 +440,7 @@ export default { labelDescription: "", sort: "", idd: 1, - }, ]; + },]; this.title = "添加护理站信息"; }, /** 修改按钮操作 */ @@ -488,17 +503,17 @@ export default { } this.imgsurl = { pictureUrlList: [] }; if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then((res) => { }); } if (response.code == 200) { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); - } + } }); } else { addStation(this.form).then((response) => { - if (response.code==200) { + if (response.code == 200) { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); @@ -515,7 +530,7 @@ export default { const ids = row.id || this.ids; this.$modal .confirm("是否确认删除此护理站信息？") - .then(function() { + .then(function () { return delStation(ids); }) .then(() => { @@ -523,19 +538,19 @@ export default { obj.pictureUrlList.push(row.stationIntroducePcitureUrl); obj.pictureUrlList.push(row.stationPictureUrl); if (obj.pictureUrlList.length > 0) { - updatePicture(obj).then((res) => {}); + updatePicture(obj).then((res) => { }); } this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => {}); + .catch(() => { }); }, /** 导出按钮操作 */ handleExport() { this.download( "system/station/export", { - ...this.getListByUserquery, - }, + ...this.getListByUserquery, + }, `station_${new Date().getTime()}.xlsx` ); }, From acbced983a528728448e61ace6c389ba45743aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 25 May 2023 16:45:26 +0800 Subject: [PATCH 11/29] =?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/views/system/station/index.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue index 91048a3..bb1042b 100644 --- a/src/views/system/station/index.vue +++ b/src/views/system/station/index.vue @@ -481,16 +481,13 @@ - +
- +
{{nurseStationFriendslist.nurseStationName}}
 - -
{{nurseStationFriendslist.areaName}}
- - +
{{nurseStationFriendslist.address}}
 From 03fb466150428c2eb6cffba8431ecc240462cd88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 25 May 2023 17:38:43 +0800 Subject: [PATCH 12/29] =?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/views/system/station/index.vue | 1 + src/views/system/station/stationjs.js | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue index bb1042b..0643736 100644 --- a/src/views/system/station/index.vue +++ b/src/views/system/station/index.vue @@ -69,6 +69,7 @@ v-loading="loading" :data="nurseStationlist" @selection-change="handleSelectionChange" + :element-loading-text="loadingtext" > diff --git a/src/views/system/station/stationjs.js b/src/views/system/station/stationjs.js index 788fcdd..5dfc2f4 100644 --- a/src/views/system/station/stationjs.js +++ b/src/views/system/station/stationjs.js @@ -181,7 +181,8 @@ export default { ], }, - checkedDataList: [] // 选择的护理机构分类 + checkedDataList: [],// 选择的护理机构分类 + loadingtext: "加载中" }; }, created() { @@ -191,13 +192,14 @@ export default { }, methods: { GenerateQRcode(row) { - this.loading = true + this.loadingtext = "生成中"; + this.loading = true; this.nurseStationFriendslist = row; nurseStationFriends(row.id).then(res => { this.nurseStationFriendslist.img = process.env.VUE_APP_BASE_API + res.msg; this.nurseStationFriendsshow = true; - this.loading = false + this.loading = false; }); }, imgs(item) { @@ -299,6 +301,7 @@ export default { }, // 表单重置 reset() { + this.loadingtext = "加载中"; this.nurseStationType2 = []; this.form = { id: null, From 57f41f95de9e03ed386103f05b5d67e75bf210cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 25 May 2023 18:08:02 +0800 Subject: [PATCH 13/29] =?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 | 10 +++++ src/views/system/order/index.vue | 68 +++++++++++++++++++++++++++---- src/views/system/order/indexjs.js | 28 ++++++++++++- 3 files changed, 96 insertions(+), 10 deletions(-) diff --git a/src/api/system/order.js b/src/api/system/order.js index 4d3026e..8788007 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -77,3 +77,13 @@ export function getPersonInfo(nurseStationPersonId) { method: 'get' }) } + +//xiugai + +export function edit(data) { + return request({ + url: `/system/appointmentOrderDetails/updateAppointmentOrderInfo`, + method: "post", + data + }) +} \ No newline at end of file diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index b20d213..9796ae4 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -73,7 +73,7 @@ 已完成 + >已支付 查看 + >编辑 -
{{query.caregiverName}}
+ -
{{query.caregiverName}}
+ -
{{query.caregiverPhone}}
+ -
{{query.hospitalName}}
+ -
{{query.departmentName}}
+ -
{{query.hospitalBedNumber}}
+ +
{{query.companionStartDate}} {{query.companionEndDate?'至':'' }} {{ query.companionEndDate }}
 +
+
{{query.nurseStationName}}
 @@ -559,7 +608,8 @@ " >
- 确 定 + 取 消 + 确 定
diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js index 2a73e27..939b03b 100644 --- a/src/views/system/order/indexjs.js +++ b/src/views/system/order/indexjs.js @@ -6,13 +6,15 @@ import { dispatchsubmit, xylWeChatRefundNotify, appointmentOrderDetails, - getPersonInfo + getPersonInfo, + edit } from "@/api/system/order"; import { getListByUser } from "@/api/system/userlist.js"; export default { name: "order", data() { return { + timevalue: [], map: null, baseurl: process.env.VUE_APP_BASE_API, orderStatuslist: [{ @@ -128,6 +130,20 @@ export default { }, mounted() { }, methods: { + //时间确定 + timechange(e) { + this.query.companionStartDate = this.formatDate(new Date(e[0]).getTime()); + this.query.companionEndDate = this.formatDate(new Date(e[1]).getTime()); + }, + //修改提交 + editsubmitForm() { + edit(this.query).then(res => { + if (res.code == 200) { + this.$message.success("修改成功"); + this.editinnerVisible = false; + } + }); + }, init(query) { this.map = new AMap.Map("container", { resizeEnable: true, //设置地图可缩放 @@ -217,6 +233,16 @@ export default { break; } }, + formatDate(time, timetype) { + let date = new Date(time); //13位时间戳 + //let date = new Date(parseInt(time) * 1000); //10位时间戳 + let y = date.getFullYear(); + let MM = date.getMonth() + 1; + MM = MM < 10 ? "0" + MM : MM; + let d = date.getDate(); + d = d < 10 ? "0" + d : d; + return y + "-" + MM + "-" + d; + }, //编辑 seeedit(row) { this.loading = true; From 814c53ed7888bddd78e92496f2b38bfedfdec7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 25 May 2023 18:16:47 +0800 Subject: [PATCH 14/29] =?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/views/system/order/index.vue | 2 +- src/views/system/order/indexjs.js | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 9796ae4..3c93680 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -540,7 +540,7 @@
{{query.orderNo}}
-
{{switchOrderStatus(query.orderStatus)}}
+
{{switchOrderStatus2(query.orderStatus)}}
{{query.totalPrice}}
diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js index 939b03b..0cc864f 100644 --- a/src/views/system/order/indexjs.js +++ b/src/views/system/order/indexjs.js @@ -233,6 +233,32 @@ export default { break; } }, + switchOrderStatus2(orderStatus) { + switch (orderStatus) { + case "WAIT_PAY": + return "待付款"; + case "PAY": + return "已付款"; + case "WAIT_DISPATCH": + return "已支付"; + case "NOT_FINISH": + return "未完成"; + case "WAIT_RECEIVE": + return "待接单" + case "COMPLETE": + return "待评价"; + case "EVALUATED": + return "服务完成"; + case "WAIT_REFUND": + return "退款中"; + case "REFUNDED": + return "退款成功"; + case "CANCEL": + return "已取消"; + default: + break; + } + }, formatDate(time, timetype) { let date = new Date(time); //13位时间戳 //let date = new Date(parseInt(time) * 1000); //10位时间戳 From 9ecafc2dbd918b9ced7a2369e2997fc9ddde3937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 09:50:05 +0800 Subject: [PATCH 15/29] =?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 | 8 ++++++++ src/views/system/order/index.vue | 9 ++++++++- src/views/system/order/indexjs.js | 19 ++++++++++++++++++- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/api/system/order.js b/src/api/system/order.js index 8788007..8e480cc 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -86,4 +86,12 @@ export function edit(data) { method: "post", data }) +} + +//确认完成 +export function updateCompanionStatus(orderStatus, orderNo) { + return request({ + url: `/system/appointmentOrder/updateCompanionStatus?orderStatus=${orderStatus}&orderNo=${orderNo}`, + method: "post" + }) } \ No newline at end of file diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 3c93680..aeb7c06 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -98,9 +98,16 @@ size="mini" type="text" icon="el-icon-edit" - v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'" + v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'" @click="seeedit(scope.row)" >编辑 + 确认完成 { + updateCompanionStatus(row.orderStatus, row.orderNo).then(res => { + + this.$modal.msgSuccess("订单已完成"); + this.getList() + }) + }) + .catch(() => { }); + }, //编辑 seeedit(row) { this.loading = true; From 2d5c2e2043e49a492ee13e6cf3441f2df684b8eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 10:03:05 +0800 Subject: [PATCH 16/29] =?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/views/system/order/index.vue | 67 ++++++++++--------------------- src/views/system/order/indexjs.js | 13 ++---- 2 files changed, 25 insertions(+), 55 deletions(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index aeb7c06..6ac3ee3 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -99,7 +99,7 @@ type="text" icon="el-icon-edit" v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'WAIT_DISPATCH'" - @click="seeedit(scope.row)" + @click="seelookedit(scope.row,false)" >编辑 确认完成 + 查看 +
{{query.orderWriteName}}
 +
{{query.caregiverName}}
 +
{{query.caregiverPhone}}
 +
{{query.hospitalName}}
 +
{{query.departmentName}}
 +
{{query.hospitalBedNumber}}
{{query.companionStartDate}} {{query.companionEndDate?'至':'' }} {{ query.companionEndDate }}
 @@ -571,49 +590,7 @@ >
{{query.evaluateSatisfaction}}
 - - - - - - - - - - - - -
取 消 确 定 diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js index 8132cb2..bf562a6 100644 --- a/src/views/system/order/indexjs.js +++ b/src/views/system/order/indexjs.js @@ -92,6 +92,7 @@ export default { pageNum: 1, pageSize: 10, }, + lookedit: undefined, queryParams: { patientName: null, orderNo: null, @@ -287,7 +288,8 @@ export default { .catch(() => { }); }, //编辑 - seeedit(row) { + seelookedit(row, boolean) { + this.lookedit = boolean this.loading = true; const id = row.orderNo; this.map = null; @@ -318,22 +320,13 @@ export default { } this.loading = false; this.editinnerVisible = true; - setTimeout(() => { - this.init(this.query); - }, 500); } else { this.loading = false; this.editinnerVisible = true; - setTimeout(() => { - this.init(this.query); - }, 500); } } else if (row.orderStatus == "COMPLETE") { this.loading = false; this.editinnerVisible = true; - setTimeout(() => { - this.init(this.query); - }, 500); } else { this.loading = false; this.editinnerVisible = true; From 457f4ce3c1de00195228bdb414293d238750a456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 10:15:40 +0800 Subject: [PATCH 17/29] =?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/views/system/order/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 6ac3ee3..c5ed732 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -112,7 +112,7 @@ size="mini" type="text" icon="el-icon-zoom-in" - v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus == 'EVALUATED'" + v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus != 'WAIT_DISPATCH'&&scope.row.orderStatus != 'WAIT_PAY'" @click="seelookedit(scope.row,true)" >查看 Date: Fri, 26 May 2023 10:16:21 +0800 Subject: [PATCH 18/29] =?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/views/system/order/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index c5ed732..0954819 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -112,7 +112,7 @@ size="mini" type="text" icon="el-icon-zoom-in" - v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus != 'WAIT_DISPATCH'&&scope.row.orderStatus != 'WAIT_PAY'" + v-if="scope.row.orderType=='COMPANION_IN_HOSPITAL'&&scope.row.orderStatus != 'WAIT_DISPATCH'" @click="seelookedit(scope.row,true)" >查看 Date: Fri, 26 May 2023 14:13:18 +0800 Subject: [PATCH 19/29] =?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/views/system/order/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 0954819..fe80aa9 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -540,7 +540,7 @@
{{query.companionStartDate}} {{query.companionEndDate?'至':'' }} {{ query.companionEndDate }}
 From b84587905724f7bae54d03e4a28d20677493acd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 14:41:02 +0800 Subject: [PATCH 20/29] =?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/views/system/order/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index fe80aa9..ea12082 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -620,6 +620,9 @@ export default indexjs; height: 600px; } .text { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; width: 250px; height: 36px; line-height: 36px; From f0e122ac96de93b737e2b69506fa0aecb93fea67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 15:23:07 +0800 Subject: [PATCH 21/29] =?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/views/system/order/index.vue | 1 + src/views/system/order/indexjs.js | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index ea12082..28b20c8 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -543,6 +543,7 @@ v-if="!lookedit" v-model="timevalue" type="daterange" + :picker-options="setDateRange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js index bf562a6..c57b3aa 100644 --- a/src/views/system/order/indexjs.js +++ b/src/views/system/order/indexjs.js @@ -15,6 +15,14 @@ export default { name: "order", data() { return { + setDateRange: { + disabledDate: time => { + // 禁用今天之前的日期【当前天可选】 + console.log(Date.now()); + console.log(time.getTime()); + return time.getTime() < Date.now() - 24 * 60 * 60 * 1000; + } + }, timevalue: [], map: null, baseurl: process.env.VUE_APP_BASE_API, From 476db7e78bf7a85a8ece56b173cc8e4603339451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 15:47:42 +0800 Subject: [PATCH 22/29] =?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/views/system/order/index.vue | 4 ++-- src/views/system/order/indexjs.js | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 28b20c8..72e0de3 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -24,7 +24,7 @@ /> - + - + { // 禁用今天之前的日期【当前天可选】 - console.log(Date.now()); - console.log(time.getTime()); return time.getTime() < Date.now() - 24 * 60 * 60 * 1000; } }, From d0612698b241214d11abecf975f84eec14c80bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 16:00:24 +0800 Subject: [PATCH 23/29] =?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/views/system/order/index.vue | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 72e0de3..f5c9b3b 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -190,7 +190,17 @@
{{query.itemServeDurationUnit}}
 -
{{query.compositeScore}}
+
+ +
{{query.itemServeDurationUnit}}
 - -
{{query.compositeScore}}
-
{{query.evaluateSatisfaction}}
 + + +
取 消 From 0c9084cffb5ef2003daa8e96e0133ebe7ed98312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 16:02:16 +0800 Subject: [PATCH 24/29] =?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/views/system/order/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index f5c9b3b..c7a379f 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -611,8 +611,9 @@
- 取 消 - 确 定 + 取 消 + 确 定 + 确 定
From af0058163c00f062da0993c9368be572c75a161e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 16:19:24 +0800 Subject: [PATCH 25/29] =?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/views/system/order/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index c7a379f..ef20ec1 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -196,7 +196,6 @@ v-model="query.compositeScore" style="padding-top: 7px" disabled - show-score text-color="#ff9900" score-template="{value}" > @@ -604,7 +603,6 @@ v-model="query.compositeScore" style="padding-top: 7px" disabled - show-score text-color="#ff9900" score-template="{value}" > From acc5ab0ef026f214156bf4fd2c0f7610d9240624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 16:21:09 +0800 Subject: [PATCH 26/29] =?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/views/system/order/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index ef20ec1..e27dd72 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -197,7 +197,6 @@ style="padding-top: 7px" disabled text-color="#ff9900" - score-template="{value}" >
@@ -604,7 +603,6 @@ style="padding-top: 7px" disabled text-color="#ff9900" - score-template="{value}" > From b61107a5513eb248eb4240f45e63648805cdaf5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 May 2023 17:05:58 +0800 Subject: [PATCH 27/29] =?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/views/system/goodsOrder/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue index 695a85b..caafc62 100644 --- a/src/views/system/goodsOrder/index.vue +++ b/src/views/system/goodsOrder/index.vue @@ -277,9 +277,7 @@ v-model="orderList.compositeScore" style="padding-top: 7px" disabled - show-score text-color="#ff9900" - score-template="{value}" > From 475f7d65f8d3d5e9163a6f967b88b91ec7afe0fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Mon, 29 May 2023 09:24:53 +0800 Subject: [PATCH 28/29] =?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/views/system/order/indexjs.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/system/order/indexjs.js b/src/views/system/order/indexjs.js index 3960d1c..e188eea 100644 --- a/src/views/system/order/indexjs.js +++ b/src/views/system/order/indexjs.js @@ -318,11 +318,11 @@ export default { } else if (res.data.evaluateSatisfaction == "SATISFIED") { this.query.evaluateSatisfaction = "满意"; } else if (res.data.evaluateSatisfaction == "DISSATISFIED") { - this.query.evaluateSatisfaction = "不满意"; + this.query.evaluateSatisfaction = "差"; } else if (res.data.evaluateSatisfaction == "VERYSATISFIED") { this.query.evaluateSatisfaction = "非常满意"; } else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") { - this.query.evaluateSatisfaction = "非常不满意"; + this.query.evaluateSatisfaction = "非常差"; } this.loading = false; this.editinnerVisible = true; @@ -351,17 +351,17 @@ export default { res.data.disablingCondition == 'NOT_DISABLED' ? res.data.disablingCondition = '否' : '' if (row.orderStatus == 'EVALUATED') { if (res.data) { - if (res.data.evaluateSatisfaction == 'COMMONLY') { - this.query.evaluateSatisfaction = '一般' - } else if (res.data.evaluateSatisfaction == 'SATISFIED') { - this.query.evaluateSatisfaction = '满意' - } else if (res.data.evaluateSatisfaction == 'DISSATISFIED') { - this.query.evaluateSatisfaction = '不满意' - } else if (res.data.evaluateSatisfaction == 'VERYSATISFIED') { - this.query.evaluateSatisfaction = '非常满意' - } else if (res.data.evaluateSatisfaction == 'VERYDISSATISFIED') { - this.query.evaluateSatisfaction = '非常不满意' - } + if (res.data.evaluateSatisfaction == "COMMONLY") { + this.query.evaluateSatisfaction = "一般"; + } else if (res.data.evaluateSatisfaction == "SATISFIED") { + this.query.evaluateSatisfaction = "满意"; + } else if (res.data.evaluateSatisfaction == "DISSATISFIED") { + this.query.evaluateSatisfaction = "差"; + } else if (res.data.evaluateSatisfaction == "VERYSATISFIED") { + this.query.evaluateSatisfaction = "非常满意"; + } else if (res.data.evaluateSatisfaction == "VERYDISSATISFIED") { + this.query.evaluateSatisfaction = "非常差"; + } this.loading = false this.innerVisible4 = true; setTimeout(() => { From 2a98d84d4b4c64d6742ee5a776c12663e221f224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Mon, 29 May 2023 09:30:51 +0800 Subject: [PATCH 29/29] =?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/views/system/order/index.vue | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index e27dd72..8bd0a0d 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -215,14 +215,12 @@
{{query.diseaseName}}
{{query.serviceAddress}}