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

src/components/SalesModule/Common/productOrderList.vue

@@ -534,7 +534,8 @@
             <!-- <span style="font-size: 12px"><span class="people-item-title">联运人数: </span>{{ item.IntermodalCount }}</span> -->
             <div class="people-item">
               <span class="people-item-title">签证人数:</span>
-              {{ isVisa ? ((item.VisaNum == -1 || item.NeedVisaNum < item.VisaNum) ? item.NeedVisaNum : item.VisaNum) : item.NeedVisaNum }}
+              <!-- {{ isVisa ? ((item.VisaNum == -1 || item.NeedVisaNum < item.VisaNum) ? item.NeedVisaNum : item.VisaNum) : item.NeedVisaNum }} -->
+              {{item.VisaNum}}
             </div>
           </div>
           <div class="d5" style="width:25%">
@@ -746,12 +747,13 @@ export default {
         params.VisaAssistantId = this.queryData.VisaAssistantId.join(",");
       }
       if (this.editNum && this.isVisa) {
-        if (this.queryData.VisaNum > this.editObj.NeedVisaNum) {
-          this.$message.error("签证人数最多" + this.editObj.NeedVisaNum + "人");
-          return;
-        } else {
-          params.VisaNum = this.queryData.VisaNum;
-        }
+        // if (this.queryData.VisaNum > this.editObj.NeedVisaNum) {
+        //   this.$message.error("签证人数最多" + this.editObj.NeedVisaNum + "人");
+        //   return;
+        // } else {
+        //   params.VisaNum = this.queryData.VisaNum;
+        // }
+        params.VisaNum = this.queryData.VisaNum;
       }
       this.apipost(
         "travel_post_BatchSetOpInfo",
@@ -780,7 +782,7 @@ export default {
             !item.VisaAssistantId || item.VisaAssistantId == "0" ?
             [] :
             item.VisaAssistantId.split(",").map((item) => Number(item)),
-          VisaNum: (item.VisaNum == -1 || item.NeedVisaNum < item.VisaNum) ? item.NeedVisaNum : item.VisaNum,
+          VisaNum: item.VisaNum,//(item.VisaNum == -1 || item.NeedVisaNum < item.VisaNum) ? item.NeedVisaNum : item.VisaNum
         };
         this.editNum = true;
         this.showDialog = true;