From be7890615951f116c66bf6b312a851fc610a4ae7 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 8 Nov 2022 14:30:25 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=A2=E5=8D=95=20?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/order/index.vue | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index a0ff250..c3d0a62 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -65,7 +65,7 @@
             <el-table-column label="订单总金额" align="center" prop="totalPrice" />
       <el-table-column label="订单状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
-  <el-button                  v-if="scope.row.orderStatus=='WAIT_PAY'">待付款</el-button>
+  <el-button  v-if="scope.row.orderStatus=='WAIT_PAY'">待付款</el-button>
   <el-button type="primary"   v-if="scope.row.orderStatus=='PAY'">已付款</el-button>
   <el-button type="primary"   v-if="scope.row.orderStatus=='WAIT_DISPATCH'">待派单</el-button>
   <el-button type="primary"   v-if="scope.row.orderStatus=='NOT_FINISH'">待完成</el-button>
@@ -88,7 +88,8 @@
             type="text"
             icon="el-icon-zoom-in"
             @click="seeLook(scope.row)"
-            v-hasPermi="['system:nurseType:edit']"
+                    v-hasPermi="['system:appointmentOrder:query']"
+
             >查看</el-button
           >
           <el-button
@@ -96,7 +97,7 @@
             type="text"
             icon="el-icon-s-promotion"
             @click="dispatch(scope.row)"
-            v-hasPermi="['system:nurseType:edit']"
+            v-hasPermi="['system:appointmentOrder:dispatch']"
             v-if="scope.row.orderStatus=='WAIT_DISPATCH'"
             >派单</el-button
           >
@@ -104,8 +105,8 @@
             size="mini"
             type="text"
             icon="el-icon-error"
-            @click="cencel(scope.row.appointmentOrderId)"
-            v-hasPermi="['system:nurseType:edit']"
+           @click="cencel(scope.row.appointmentOrderId)"
+           v-hasPermi="['system:appointmentOrder:confirmCancel']"
             >取消预约</el-button
           >
           <el-button
@@ -567,10 +568,6 @@ 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
@@ -594,19 +591,6 @@ export default {
 
     },
 
-    // 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) {
@@ -626,8 +610,7 @@ export default {
           }
           confirmCancel(params).then((res) => {
             this.$message.success("取消成功");
-            // this.getList();
-            // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
+           
           });
 
         })