Merge remote-tracking branch 'origin/dev' into dev

src/views/system/order/index.vue

@@ -194,10 +194,10 @@
     />
     <!-- 查看弹框 -->
     <el-dialog
-      title="查看订单信息"
+      title="查看预约订单信息"
       :visible.sync="innerVisible4"
       append-to-body
-      width="1048px"
+      width="1100px"
     >
       <el-form
         :inline="true"
@@ -218,18 +218,19 @@
           <el-input
             :value="switchOrderStatus(query.orderStatus)"
             disabled
-            style="width: 150px"
+            style="width: 180px"
           >
           </el-input>
         </el-form-item>
-        <el-form-item label="护理站名称" prop="nurseStationName">
+        <el-form-item label="订单总金额" prop="totalPrice">
           <el-input
-            v-model="query.nurseStationName"
+            v-model="query.totalPrice"
             clearable
             :disabled="true"
             style="width: 240px"
           />
         </el-form-item>
+       
         <el-form-item label="订单数量" prop="orderCount">
           <el-input
             v-model="query.orderCount"
@@ -238,12 +239,13 @@
             style="width: 190px"
           />
         </el-form-item>
+        
         <el-form-item label="护理项目名称" prop="nurseItemName">
           <el-input
             v-model="query.nurseItemName"
             clearable
             :disabled="true"
-            style="width: 150px"
+            style="width: 180px"
           />
         </el-form-item>
         <el-form-item label="服务时间" prop="time">
@@ -262,12 +264,12 @@
             style="width: 190px"
           />
         </el-form-item>
-        <el-form-item label="护理项目价格" prop="nurseItemPrice">
+        <el-form-item label="护理站名称" prop="nurseStationName">
           <el-input
-            v-model="query.nurseItemPrice"
+            v-model="query.nurseStationName"
             clearable
             :disabled="true"
-            style="width: 150px"
+            style="width: 180px"
           />
         </el-form-item>
         <el-form-item label="服务地址" prop="serviceAddress">
@@ -516,12 +518,11 @@ import {
   appointmentOrderDetails,
 } from "@/api/system/order";
 import { getListByUser } from "@/api/system/userlist.js";
-import { weChatRefundOrderApply } from "@/api/system/goodsOrder";
 export default {
   name: "order",
   data() {
     return {
-       orderStatuslist: [
+      orderStatuslist: [
         {
           value: "WAIT_PAY",
           label: "待付款",
@@ -534,16 +535,6 @@ export default {
           value: "CANCEL",
           label: "已取消",
         },
-
-        // {
-        //   value: "WAIT_RECEIVED_GOODS",
-        //   label: "待收货",
-        // },
-
-        // {
-        //   value: "RECEIVED_GOODS",
-        //   label: "已收货",
-        // },
         {
           value: "WAIT_DISPATCH",
           label: "待派单",
@@ -569,7 +560,7 @@ export default {
           value: "RETURNED_GOODS",
           label: "已退货",
         },
-          {
+        {
           value: "NOT_FINISH",
           label: "未完成",
         },
@@ -628,7 +619,6 @@ export default {
         departmentName: null,
         pageNum: 1,
         pageSize: 10,
-
       },
       query: [],
       // 表单参数
@@ -639,7 +629,7 @@ export default {
   },
   created() {
     this.getList();
-    this.info()
+    this.info();
   },
   methods: {
     //取消预约确定按钮
@@ -654,14 +644,13 @@ export default {
           this.$modal.msgSuccess("退款有延迟，请耐心等待");
         }
         this.getList();
-        this.innerrefund=false
+        this.innerrefund = false;
         console.log(res);
       });
-
     },
     // 取消按钮
-    cencelbtn(){
- this.innerrefund = false;
+    cencelbtn() {
+      this.innerrefund = false;
     },
     switchOrderStatus(orderStatus) {
       switch (orderStatus) {
@@ -673,6 +662,18 @@ export default {
           return "未完成";
         case "COMPLETE":
           return "服务完成";
+        case "PAY":
+          return "已付款";
+        case "WAIT_REFUND":
+          return "退款中";
+        case "CANCEL":
+          return "已取消";
+        case "REFUNDED":
+          return "退款成功";
+        case "WAIT_RETURNED_GOODS":
+          return "待退货";
+        case "RETURNED_GOODS":
+          return "已退货";
         default:
           break;
       }
@@ -779,20 +780,20 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      if (this.nurseStationlist[0].isAdmin == '1') {
+      if (this.nurseStationlist[0].isAdmin == "1") {
         this.resetForm("queryForm");
         this.queryParams = {
           pageNum: 1,
-          pageSize: 10
-        }
+          pageSize: 10,
+        };
       } else {
         this.queryParams.pageNum = 1;
-        this.queryParams.pageSize = 10
+        this.queryParams.pageSize = 10;
       }
       this.handleQuery();
     },
-     //权限列表
-     info() {
+    //权限列表
+    info() {
       getListByUser(this.queryParams).then((res) => {
         if (res.rows[0].isAdmin == "1") {
           this.nurseStationlist = res.rows;