From a9b303d28edf746ecabeb8d2be8f883aea025fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 8 Nov 2022 17:10:11 +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/goodsOrder.js | 7 +-
src/api/system/order.js | 13 +-
src/views/system/StationDepartment/index.vue | 11 +-
src/views/system/goodsOrder/index.vue | 672 ++++++++++---------
src/views/system/order/index.vue | 486 ++++++++------
src/views/system/person/index.vue | 14 +-
src/views/system/stationConsumable/index.vue | 8 +-
7 files changed, 674 insertions(+), 537 deletions(-)
diff --git a/src/api/system/goodsOrder.js b/src/api/system/goodsOrder.js
index 17ab35b..cd126aa 100644
--- a/src/api/system/goodsOrder.js
+++ b/src/api/system/goodsOrder.js
@@ -19,14 +19,14 @@ export function getGoodsOrder(id) {
// 查看商品详细信息
export function getGoodsOrderlist(id) {
return request({
- url: `/system/goodsOrder/goodsOrderByOrder`+`?orderNo=${id}`,
+ url: `/system/goodsOrder/goodsOrderByOrder` + `?orderNo=${id}`,
method: 'get'
})
}
// 退款
export function goodsOrderRefundinfo(id) {
return request({
- url: `/system/goodsOrder/goodsOrderRefund`+`?goodsOrderId=${id}`,
+ url: `/system/goodsOrder/goodsOrderRefund` + `?goodsOrderId=${id}`,
method: 'get',
})
}
@@ -41,7 +41,6 @@ export function editExpressNo(data) {
}
// 退款确定按钮
-
export function weChatRefundOrderApply(data) {
return request({
url: '/nurseApp/weChatPayment/weChatRefundOrderApply',
@@ -74,4 +73,4 @@ export function delGoodsOrder(id) {
url: '/system/goodsOrder/' + id,
method: 'delete'
})
-}
+}
\ No newline at end of file
diff --git a/src/api/system/order.js b/src/api/system/order.js
index 15a3e99..2c4a811 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -11,7 +11,7 @@ export function appointmentOrderDetailsList(query) {
export function Detailed(id) {
return request({
- url: `/system/appointmentOrderDetails/Detailed`+`?orderNo=${id}`,
+ url: `/system/appointmentOrderDetails/Detailed` + `?orderNo=${id}`,
method: 'get',
})
@@ -19,7 +19,7 @@ export function Detailed(id) {
//删除
export function deldetailed(appointmentOrderId) {
return request({
- url: '/system/appointmentOrder/'+appointmentOrderId,
+ url: '/system/appointmentOrder/' + appointmentOrderId,
method: 'post',
})
@@ -45,10 +45,9 @@ export function dispatchsubmit(data) {
// 确认取消订单
-export function confirmCancel(data) {
+export function confirmCancel(appointmentOrderId) {
return request({
- url: '/system/appointmentOrder/confirmCancel',
- method: 'post',
- data: data
+ url: `/system/appointmentOrder/confirmCancel?appointmentOrderId=${appointmentOrderId}`,
+ method: 'post'
})
-}
+}
\ No newline at end of file
diff --git a/src/views/system/StationDepartment/index.vue b/src/views/system/StationDepartment/index.vue
index 98e8081..5ab5c5f 100644
--- a/src/views/system/StationDepartment/index.vue
+++ b/src/views/system/StationDepartment/index.vue
@@ -375,6 +375,7 @@
:visible.sync="innerVisible"
width="1000px"
append-to-body
+ :before-close="innerVisiblecancel"
>
-->
-
+
-
- {{ orderStatus(scope.row.orderStatus) }}
+
+ 待付款
+ 已付款
+ 已取消
+ 待收货
+ 已收货
+ 服务完成
+ 退款中
+ 待退货
+ 退款成功
+ 已退货
@@ -88,6 +127,46 @@
+
+
+ 修改物流单号
+ 录入物流单号
+ 录入物流单号
+ 不可录入物流单号
+
+
查看商品信息
- 录入物流单号
-
+
确认退款
-
-
-
-
+
-->
-
+
+
+
+
+
+
+
+
+
-
- 确认
- 取消
-
+
@@ -416,32 +474,25 @@
v-model="refundlist.dictLabel"
placeholder=""
clearable
- @keyup.enter.native="handleQuery"
disabled
/>
-
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
{
+ console.log(res);
+ });
+ },
switchOrderStatus(orderStatus) {
switch (orderStatus) {
case "WAIT_PAY":
@@ -538,26 +660,23 @@ export default {
e.serviceDate + "-" + e.serviceStartTime + "-" + e.serviceEndTime;
}
});
- this.OrderDetailsLists = res.data;
- this.query = res.data;
+ this.query = res.data[0];
this.innerVisible4 = true;
console.log(this.query);
});
},
-
// 派单
dispatch(row) {
- console.log(row)
- this.querynursePersonname.orderNo = row.orderNo
+ console.log(row);
+ this.querynursePersonname.orderNo = row.orderNo;
console.log(this.querynursePersonname.orderNo);
// console.log(row)
this.nurseName = "请选择护理员";
this.innerdispatch = true;
- this.nursePersonid =""
+ this.nursePersonid = "";
},
// 姓名弹框
clicknursePersonName() {
- // console.log(this.dispatchlist);
getPerson(this.querynursePersonname).then((res) => {
this.dispatchlist = res.rows;
this.total2 = res.total;
@@ -567,72 +686,40 @@ export default {
},
// 姓名弹框确定按钮
submitForm() {
- // console.log(this.querynursePersonname)
- // var obj = {}
- // obj.nurseStationPersonId = nurseStationPersonId
- // obj.orderNo = this.querynursePersonname.orderNo
- let params={
- nurseStationPersonId:this.nursePersonid,
- orderNo:this.querynursePersonname.orderNo
- }
+ let params = {
+ nurseStationPersonId: this.nursePersonid,
+ orderNo: this.querynursePersonname.orderNo,
+ };
dispatchsubmit(params).then((res) => {
- if(res.code == 200){
+ if (res.code == 200) {
this.$modal.msgSuccess("派单成功");
}
- this.nurseName = "请选择护理员";
this.innerdispatch = false;
+ this.getList();
+ this.nurseName = "请选择护理员";
// this.nursePersonid =""
-
- })
+ });
},
// 选择姓名按钮
nursePersonclick(row) {
- this.nursePersonid = row.nurseStationPersonId
- this.nurseName = row.nursePersonName
+ this.nursePersonid = row.nurseStationPersonId;
+ this.nurseName = row.nursePersonName;
this.nursePersonNameinfo = false;
- console.log(row)
-
+ console.log(row);
},
-
- // cencel(appointmentOrderId) {
- // confirmCancel(appointmentOrderId).then((res) => {
- // // this.nurseName="请选择护理员";
- // // this.innerdispatch = false;
-
- // })
- // console.log(appointmentOrderId)
- // },
- // console.log(row.appointmentOrderId)
- // this.appointmentOrderId = row.appointmentOrderId
- // console.log('row :>> ', this.querynursecencel.appointmentOrderId);
- // obj.appointmentOrderId=row.appointmentOrderId
-
-
- // 确认取消预约
- cencel(appointmentOrderId) {
- this.$confirm(
- '是否确认取消订单',
- "提示",
- {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }
- )
- .then(() => {
- console.log(appointmentOrderId)
- let params={
- appointmentOrderId:appointmentOrderId
+ // 确认取消预约
+ cencel(row) {
+ Detailed(row.orderNo).then((res) => {
+ res.data.forEach((e) => {
+ if (e.serviceDate) {
+ e.time =
+ e.serviceDate + "-" + e.serviceStartTime + "-" + e.serviceEndTime;
}
- confirmCancel(params).then((res) => {
- this.$message.success("取消成功");
- // this.getList();
- // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
- });
-
- })
- .catch(() => { });
- },
+ });
+ this.query = res.data[0];
+ this.innerrefund = true;
+ });
+ },
/** 查询护理类型信息列表 */
getList() {
this.loading = true;
@@ -674,7 +761,7 @@ export default {
this.resetForm("queryForm");
this.handleQuery();
},
- resetQuery2() {
+ resetQuery2() {
this.resetForm("queryForm");
this.handleQuery2();
},
@@ -696,7 +783,6 @@ export default {
deldetailed(row.appointmentOrderId).then((res) => {
this.$message.success("删除成功");
this.getList();
- // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
});
})
.catch(() => {});
diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue
index 9ec0015..0ff8e5c 100644
--- a/src/views/system/person/index.vue
+++ b/src/views/system/person/index.vue
@@ -403,6 +403,7 @@
:visible.sync="innerVisible"
width="1000px"
append-to-body
+ :before-close="addcancel"
>
-
+
{
+ this.nurseStationlist = res.rows;
+ this.total3 = res.total;
+ });
},
/** 重置按钮操作 */
sresetQuery() {