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

src/components/Hotel/reservation/OrderList.vue

@@ -1008,10 +1008,6 @@ export default {
     },
     isOffset(row, index, num,name){
       this.makeAdocument(row, index, num, name, 'Offset')
-      setTimeout(()=>{
-        this.cdState = true
-      },100)
-
     },
     editRemark(item){
       this.postMsg.OrderId = item.OrderId
@@ -1103,6 +1099,13 @@ export default {
     },
     // 制作单据
     makeAdocument(row, index, num, name,Offset) {
+      if((num==2||num==3)&&row.Income<=0){
+        this.Info('请先制收款单据，再制成本或退款单据！')
+        return
+      }
+      if(Offset){
+        this.cdState = true
+      }
       let type = 0
       if(num==3){
         type = 2

src/components/Hotel/singleProduct/components/OrderList.vue

@@ -891,9 +891,6 @@ export default {
   methods: {
     isOffset(row, index, num,name){
       this.makeAdocument(row, index, num, name, 'Offset')
-      setTimeout(()=>{
-        this.cdState = true
-      },100)
 
     },
     // 单据详情
@@ -909,6 +906,13 @@ export default {
     },
     // 制作单据
     makeAdocument(row, index, num, name,Offset) {
+      if((num==2||num==3)&&row.Income<=0){
+        this.Info('请先制收款单据，再制成本或退款单据！')
+        return
+      }
+      if(Offset){
+        this.cdState = true
+      }
       let type = 0
       if(num==3){
         type = 2

src/components/SalesVisa/VisaProductOrder.vue

@@ -1153,13 +1153,16 @@
     methods: {
       isOffset(row, index, num){
         this.makeAdocument(row, index, num,'Offset')
-        setTimeout(()=>{
-          this.cdState = true
-        },100)
-        
       },
       // 制作单据
     makeAdocument(row, index, num, Offset) {
+      if((num==2||num==3)&&row.Income<=0){
+        this.Info('请先制收款单据，再制成本或退款单据！')
+        return
+      }
+      if(Offset){
+        this.cdState = true
+      }
       let type = 0
       if(num==3){
         type = 2

src/components/SingleAirTicket/components/OrderList.vue

@@ -575,12 +575,12 @@
                 </el-table-column>
                 <el-table-column label="应收">
                   <template slot-scope="scope">
-                    {{ scope.row.IncomeMoney }}
+                    {{ scope.row.Money }}
                   </template>
                 </el-table-column>
                 <el-table-column label="实收">
                   <template slot-scope="scope">
-                    {{ scope.row.BackMoney }}
+                    {{ scope.row.IncomeMoney }}
                   </template>
                 </el-table-column>
                 <el-table-column label="退款">
@@ -1036,9 +1036,6 @@
         },
         isOffset(row, index, num){
           this.makeAdocument(row, index, num,'Offset')
-          setTimeout(()=>{
-            this.cdState = true
-          },100)
         },
         submit2(){
           if(this.loading3) return
@@ -1139,6 +1136,13 @@
         },
         // 制作单据
         makeAdocument(row, index, num, Offset) {
+          if((num==2||num==3)&&row.IncomeMoney<=0){
+            this.Info('请先制收款单据，再制成本或退款单据！')
+            return
+          }
+          if(Offset){
+            this.cdState = true
+          }
           let type = 0
         if(num==3){
           type = 2

src/components/busManagement/BookAcar/components/orderList.vue

@@ -1167,9 +1167,6 @@ export default {
     },
     isOffset(row, index, num) {
       this.makeAdocument(row, index, num, "Offset");
-      setTimeout(() => {
-        this.cdState = true;
-      }, 100);
     },
     editRemark(item) {
       this.postMsg.OrderId = item.OrderId;
@@ -1313,6 +1310,13 @@ export default {
     },
     // 制作单据
     makeAdocument(row, index, num, Offset) {
+      if((num==2||num==3)&&row.Income<=0){
+        this.Info('请先制收款单据，再制成本或退款单据！')
+        return
+      }
+      if(Offset){
+        this.cdState = true
+      }
       let type = 0;
       if (num == 3) {
         type = 2;

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -1115,10 +1115,6 @@
       },
         isOffset(row, index, num){
           this.makeAdocument(row, index, num,'Offset')
-          setTimeout(()=>{
-            this.cdState = true
-          },100)
-          
         },
         editRemark(item){
           this.postMsg.Id = item.Id
@@ -1206,6 +1202,13 @@
         },
         // 制作单据
         makeAdocument(row, index, num, Offset) {
+          if((num==2||num==3)&&row.Income<=0){
+            this.Info('请先制收款单据，再制成本或退款单据！')
+            return
+          }
+          if(Offset){
+            this.cdState = true
+          }
           let type = 0
           if(num==3){
             type = 2
@@ -1604,4 +1607,3 @@
       }
     };
     </script>
-    
\ No newline at end of file

src/components/scenicSpot/reservation/OrderList.vue

@@ -1168,10 +1168,6 @@ export default {
     },
     isOffset(row, index, num){
       this.makeAdocument(row, index, num,'Offset')
-      setTimeout(()=>{
-        this.cdState = true
-      },100)
-
     },
     editRemark(item){
       this.postMsg.OrderId = item.OrderId
@@ -1315,6 +1311,13 @@ export default {
     },
     // 制作单据
     makeAdocument(row, index, num, Offset) {
+      if((num==2||num==3)&&row.Income<=0){
+        this.Info('请先制收款单据，再制成本或退款单据！')
+        return
+      }
+      if(Offset){
+        this.cdState = true
+      }
       let type = 0
       if(num==3){
         type = 2