Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/groupTourOrder.vue

@@ -59,14 +59,11 @@
     border-bottom: 2px solid #333;
   }
 
-  .groupTourOrderSearchTable tbody {}
-
   .groupTourOrderSearchTable tr th {
     background: #e6e6e6;
     height: 30px;
     font-size: 12px;
-    text-align: left;
-    text-indent: 15px;
+    text-align: center;
     border-top: 1px solid #cccccc;
     border-left: 1px solid #cccccc;
   }
@@ -2362,6 +2359,10 @@
         }, err => {})
       },
       deleteItem(obj) {
+        if(obj.isCanClear==1){
+          this.Error('OP已确认订单 如需取消请联系当团OP!');
+          return;
+        }
         this.$confirm('是否取消?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
@@ -3555,6 +3556,7 @@
               this.loading = false
               this.total = res.data.data.count
               this.list = res.data.data.pageData;
+              console.log(this.list,'list');
             } else {
               this.$message.error(res.data.message)
             }

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -40,9 +40,6 @@
   border-right: 1px solid #cccccc;
   border-collapse: collapse;
 }
-.groupTourOrderSearchTable tr {
-  /* border-bottom: 2px solid #333; */
-}
 .groupTourOrderSearchTable tbody tr:last-child {
   border-bottom: 2px solid #333;
 }
@@ -2791,6 +2788,10 @@ export default {
     },
 
     deleteItem(obj) {
+      if(obj.isCanClear==1){
+        this.Error('OP已确认订单 如需取消请联系当团OP!');
+        return;
+      }
       this.$confirm("是否取消?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -4052,7 +4053,7 @@ submitYSZEForm(){
             //单机票
             this.seat.SingleAirTicketCount=res.data.data.pageData.singleAirTicketCount;
           } else {
-            this.$message.error(res.data.message);
+            this.Error(res.data.message);
           }
         },
         err => {}