1

src/components/TravelManager/customizedcar/travelOrders.vue

@@ -353,7 +353,7 @@
                       <el-tag v-if="item.OrderStatus==7" style="margin-left:5px" size="small" type="danger">已取消</el-tag>
                     </div>
                     <el-tooltip class="item" effect="dark" content="强制取消" placement="top-start">
-                      <img v-if="item.OrderStatus==1 || item.OrderStatus==2" @click="OrderExit2(item)" style="right:60px"
+                      <img v-if="item.OrderStatus==1 || item.OrderStatus==2" @click="OrderExit3(item)" style="right:60px"
                         class="app-order-btnimg" src="../../../assets/img/userman/force.png" alt="">
                     </el-tooltip>
                     <el-tooltip class="item" effect="dark" content="加入回收站" placement="top-start">
@@ -535,11 +535,11 @@
                             src="../../../assets/img/userman/pass.png" alt="">
                         </el-tooltip>
                         <!--待处理-->
-                        <el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus==5">
+                        <el-tooltip class="item" effect="dark" content="同意" placement="top" v-if="item.OrderStatus==6">
                           <img @click="pending(item,1)" v-if="item.OrderStatus==5" class="app-order-icon"
                             src="../../../assets/img/userman/pass.png" alt="">
                         </el-tooltip>
-                        <el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus==5">
+                        <el-tooltip class="item" effect="dark" content="拒绝" placement="top" v-if="item.OrderStatus==6">
                           <img @click="pending(item,2)" v-if="item.OrderStatus==5" class="app-order-icon"
                             src="../../../assets/img/userman/nopass.png" alt="">
                         </el-tooltip>
@@ -1476,6 +1476,35 @@
           );
         });
       },
+      OrderExit3(item){
+        let that = this;
+        let text = '';
+        if (item.OrderStatus == 1) {
+          text = '确认取消?'
+        } else if (item.OrderStatus == 2) {
+          text = '确认取消?客人付款金额将原路退回。'
+        }
+        that.Confirm(text, function () {
+          that.loading = true
+          that.lxymallapipost(
+            "/api/order/SetOrderForcedToCancel", {
+              OrderId: item.OrderId
+            },
+            res => {
+              if (res.data.resultCode == 1) {
+                that.loading = false
+                that.Success(res.data.message);
+                that.getList();
+              } else {
+                that.Error(res.data.message);
+                that.loading = false
+
+              }
+            },
+          );
+        });
+
+      },
       handleClick(val) {
         let dataId = val.$attrs.dataId;
         this.msg.OrderStatus = dataId;
@@ -1506,7 +1535,7 @@
           that.msg.EndTime = '';
         }
         that.loading = true;
-       that.lxymallapipost("/api/DmcOrder/GeDmcOrderCommonPageList_V2", that.msg, res => {
+       that.lxymallapipost("/api/DmcOrder/GetDmcOrderCommonPageList_V2", that.msg, res => {
           if (res.data.resultCode == 1) {
               console.log(res.data.data,'res.data.data')
               that.loading = false;