diff --git a/src/api/system/goodsOrder.js b/src/api/system/goodsOrder.js index cd126aa..d2b984e 100644 --- a/src/api/system/goodsOrder.js +++ b/src/api/system/goodsOrder.js @@ -1,5 +1,12 @@ import request from '@/utils/request' +//查看评价图片 +export function selectOrderEvaluate(id) { + return request({ + url: `/nurseApp/orderEvaluate/selectOrderEvaluate?orderNo=${id}`, + method: 'get', + }) +} // 查询商品订单列表 export function listGoodsOrder(query) { return request({ diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue index 9bfeea8..d181147 100644 --- a/src/views/system/goodsOrder/index.vue +++ b/src/views/system/goodsOrder/index.vue @@ -86,7 +86,7 @@ >待付款 已付款待发货 已取消已收货待评价 + 交易完成 - - - - - - - - +
+ +
+ @@ -589,13 +546,16 @@ import { editExpressNo, goodsOrderrefund, weChatRefundOrderApply, + selectOrderEvaluate, } from "@/api/system/goodsOrder"; import { getListByUser } from "@/api/system/userlist.js"; +import baseurl from "@/api/baseurl.js"; export default { name: "GoodsOrder", data() { return { + baseurl: null, // 查看商品信息 innerorder: false, // 查看物流信息 @@ -605,6 +565,7 @@ export default { orderList: [], refundlist: [], nurseStationlist: [], + ratelist: [], //评分list orderStatuslist: [ { value: "WAIT_PAY", @@ -612,21 +573,31 @@ export default { }, { value: "PAY", - label: "已付款", + label: "待发货", + }, + { + value: "WAIT_RECEIVED_GOODS", + label: "待收货", + }, + { + value: "RECEIVED_GOODS", + label: "待评价", + }, + { + value: "EVALUATED", + label: "交易完成", }, { value: "CANCEL", label: "已取消", }, - { - value: "WAIT_RECEIVED_GOODS", - label: "待收货", + value: "WAIT_RETURNED_GOODS", + label: "待退货", }, - { - value: "RECEIVED_GOODS", - label: "已收货", + value: "RETURNED_GOODS", + label: "已退货", }, { value: "WAIT_REFUND", @@ -636,15 +607,6 @@ export default { value: "REFUNDED", label: "退款成功", }, - - { - value: "WAIT_RETURNED_GOODS", - label: "待退货", - }, - { - value: "RETURNED_GOODS", - label: "已退货", - }, ], // 遮罩层 loading: true, @@ -699,6 +661,7 @@ export default { }; }, created() { + this.baseurl = baseurl; this.getList(); this.info(); this.infos(); @@ -721,21 +684,23 @@ export default { case "WAIT_PAY": return "待付款"; case "PAY": - return "已付款"; - case "CANCEL": - return "已取消"; + return "待发货"; case "WAIT_RECEIVED_GOODS": return "待收货"; case "RECEIVED_GOODS": - return "已收货"; - case "WAIT_REFUND": - return "退款中"; - case "REFUNDED": - return "退款成功"; + return "待评价"; + case "EVALUATED": + return "交易完成"; case "WAIT_RETURNED_GOODS": return "待退货"; case "RETURNED_GOODS": return "已退货"; + case "WAIT_REFUND": + return "退款中"; + case "REFUNDED": + return "退款成功"; + case "CANCEL": + return "已取消"; default: break; } @@ -781,6 +746,14 @@ export default { getGoodsOrderlist(id).then((res) => { this.orderList = res.data; this.innerorder = true; + if (row.orderStatus == "EVALUATED") { + this.ratelist = {}; + selectOrderEvaluate(id).then((res) => { + if (res.data) { + this.ratelist = res.data; + } + }); + } }); }, // 查看录入物流单号弹框 @@ -800,7 +773,6 @@ export default { this.queryexpressNo.expressNo = ""; this.getList(); this.innerlogistics = false; - }); }, // 取消按钮 @@ -832,7 +804,6 @@ export default { } this.getList(); this.innerrefund = false; - }); }, // refund(id){ @@ -914,13 +885,13 @@ export default { }, /** 重置按钮操作 */ resetQuery() { - console.log(this.nurseStationlist) - console.log(this.nurseStationlist) - if (this.nurseStationlist[0]){ - this.queryParams.pageNum = 1; - this.queryParams.pageSize = 10; - this.queryParams.orderNo = null; - this.queryParams.orderStatus = null; + console.log(this.nurseStationlist); + console.log(this.nurseStationlist); + if (this.nurseStationlist[0]) { + this.queryParams.pageNum = 1; + this.queryParams.pageSize = 10; + this.queryParams.orderNo = null; + this.queryParams.orderStatus = null; } // this.queryParams = { @@ -988,7 +959,7 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => { }); + .catch(() => {}); }, /** 导出按钮操作 */ handleExport() { @@ -1006,7 +977,7 @@ export default { this.total2 = res.total; this.nurseStationlist = res.rows; this.queryParams.nurseStationId = res.rows[0].id; - this.getList() + this.getList(); // this.handleQuery(); }); }, @@ -1016,12 +987,10 @@ export default { pageSize: 9999, }; getListByUser(queryFor).then((res) => { - console.log(res) + console.log(res); this.handstationlist = res.rows; }); }, - - }, }; diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index bd65493..6ca3e45 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -22,14 +22,6 @@ - - - - - + + + - 未完成 - 待评价 + 服务完成 退款中 已退款退款成功 - 已取消 + - + - + - + + + + { res.data.forEach((e) => { if (e.serviceDate) { @@ -646,15 +680,32 @@ export default { }); this.query = res.data[0]; this.innerVisible4 = true; - console.log(this.query); + if (row.orderStatus == "EVALUATED") { + selectOrderEvaluate(id).then((res) => { + 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 = "不满意"; + } + this.loading = false; + this.innerVisible4 = true; + } else { + this.loading = false; + this.innerVisible4 = true; + } + }); + } else { + this.loading = false; + this.innerVisible4 = true; + } }); }, // 派单 dispatch(row) { - console.log(row); this.querynursePersonname.orderNo = row.orderNo; - console.log(this.querynursePersonname.orderNo); - // console.log(row) this.nurseName = "请选择护理员"; this.innerdispatch = true; this.nursePersonid = ""; @@ -813,7 +864,6 @@ export default {