优化制单

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -63,7 +63,8 @@
             </el-popover>
           </el-tooltip>
           <el-tooltip class="item" effect="dark" :content="$t('pub.addBtn')"  placement="top">
-            <i class="edit el-icon-circle-plus-outline" @click="goUrl('addFinancialDocuments',item.Id,item.Name+$t('visa.v_dan'),item.Type,item.IsUploadPic)"></i>
+            <i class="edit el-icon-circle-plus-outline" 
+            @click="goUrl('addFinancialDocuments',item.Id,item.Name+$t('visa.v_dan'),item.Type,item.IsUploadPic)"></i>
           </el-tooltip>
         </div>
       </li>
@@ -162,7 +163,7 @@
                   "platformAccount":this.platformAccount,
                   "id":id,
                   "Name":Name,
-                  "Type":this.tradeObj.ReFinanceId2,
+                  "Type":this.tradeObj.ReFinanceId2,//Type
                   "tradeObj":JSON.stringify(this.tradeObj),
                   "orderObj":this.orderObj,
                   'path':this.$route.query.path,
@@ -237,7 +238,7 @@
                 query:{
                   "id":id,
                   "Name":Name,
-                  "Type":Type,
+                  "Type":this.tradeObj.ReFinanceId2,//Type
                   "tradeObj":JSON.stringify(this.tradeObj),
                   'path':this.$route.query.path,
                   blank:'y',
@@ -272,7 +273,7 @@
               query:{
                 "id":id,
                 "Name":Name,
-                "Type":Type,
+                "Type":this.tradeObj.ReFinanceId2,//Type
                 "tradeObj":JSON.stringify(this.tradeObj),
                 'path':this.$route.query.path,
                 'IsUploadPic':IsUploadPic,

src/components/Hotel/reservation/OrderList.vue

@@ -656,7 +656,7 @@
           >
             <i
               class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 2)"
+              @click="makeAdocument(item, index, 3)"
             ></i>
           </el-tooltip>
         </div>
@@ -988,6 +988,12 @@ export default {
     },
     // 制作单据
     makeAdocument(row, index, num, name) {
+      let type = 0
+      if(num==3){
+        type = 2
+      }else{
+        type = num
+      }
       this.BillMakingMsg.ReFinanceId = row.OrderId;
       this.BillMakingMsg.ReFinanceId2 = num;
       if (name == "Hand") {
@@ -1005,7 +1011,7 @@ export default {
       query = {
         blank: "y",
         tab: `新增${text}单据`,
-        Type: num,
+        Type: type,
         tradeObj: JSON.stringify(this.BillMakingMsg)
       };
       this.$store.commit("ChoiceAddFinancialDocuments");

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

@@ -636,7 +636,7 @@
           >
             <i
               class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 2)"
+              @click="makeAdocument(item, index, 3)"
             ></i>
           </el-tooltip>
         </div>
@@ -897,6 +897,12 @@ export default {
     },
     // 制作单据
     makeAdocument(row, index, num, name) {
+      let type = 0
+      if(num==3){
+        type = 2
+      }else{
+        type = num
+      }
       this.BillMakingMsg.ReFinanceId = row.OrderId;
       this.BillMakingMsg.ReFinanceId2 = num;
       if (name == "Hand") {
@@ -910,11 +916,13 @@ export default {
         text = "收款";
       } else if (num == 2) {
         text = "付款";
+      } else if (num == 3) {
+        text = "成本";
       }
       query = {
         blank: "y",
         tab: `新增${text}单据`,
-        Type: num,
+        Type: type,
         tradeObj: JSON.stringify(this.BillMakingMsg)
       };
       this.$store.commit("ChoiceAddFinancialDocuments");

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

@@ -653,7 +653,7 @@
               >
                 <i
                   class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-                  @click="makeAdocument(item, index, 2)"
+                  @click="makeAdocument(item, index, 3)"
                 ></i>
               </el-tooltip>
             </div>
@@ -1018,6 +1018,12 @@
         },
         // 制作单据
         makeAdocument(row, index, num, name) {
+          let type = 0
+        if(num==3){
+          type = 2
+        }else{
+          type = num
+        }
           this.BillMakingMsg.ReFinanceId = row.OrderId;
           this.BillMakingMsg.ReFinanceId2 = num;
           this.BillMakingMsg.OtherType = 67;
@@ -1033,7 +1039,7 @@
           query = {
             blank: "y",
             tab: `新增${text}单据`,
-            Type: num,
+            Type: type,
             tradeObj: JSON.stringify(this.BillMakingMsg)
           };
           this.$store.commit("ChoiceAddFinancialDocuments");

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

@@ -621,7 +621,7 @@
               >
                 <i
                   class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-                  @click="makeAdocument(item, index, 2)"
+                  @click="makeAdocument(item, index, 3)"
                 ></i>
               </el-tooltip>
             </div>
@@ -1180,6 +1180,12 @@
         },
         // 制作单据
         makeAdocument(row, index, num, name) {
+          let type = 0
+          if(num==3){
+            type = 2
+          }else{
+            type = num
+          }
           this.BillMakingMsg.ReFinanceId = row.Id;
           this.BillMakingMsg.ReFinanceId2 = num;
           this.BillMakingMsg.OtherType = 68;
@@ -1195,7 +1201,7 @@
           query = {
             blank: "y",
             tab: `新增${text}单据`,
-            Type: num,
+            Type: type,
             tradeObj: JSON.stringify(this.BillMakingMsg)
           };
           this.$store.commit("ChoiceAddFinancialDocuments");

src/components/scenicSpot/reservation/OrderList.vue

@@ -727,7 +727,7 @@
           <el-tooltip v-if="item.OrderStatus == 2 && pagesTitle != '销售'" class="item" effect="dark" content="制单"
             placement="top">
             <i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 2)"></i>
+              @click="makeAdocument(item, index, 3)"></i>
           </el-tooltip>
         </div>
         <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
@@ -1163,6 +1163,12 @@ export default {
     },
     // 制作单据
     makeAdocument(row, index, num, name) {
+      let type = 0
+      if(num==3){
+        type = 2
+      }else{
+        type = num
+      }
       this.BillMakingMsg.ReFinanceId = row.OrderId;
       this.BillMakingMsg.ReFinanceId2 = num;
       if (name == "Hand") {
@@ -1176,11 +1182,13 @@ export default {
         text = "收款";
       } else if (num == 2) {
         text = "付款";
+      } else if (num == 3) {
+        text = "成本";
       }
       query = {
         blank: "y",
         tab: `新增${text}单据`,
-        Type: num,
+        Type: type,
         tradeObj: JSON.stringify(this.BillMakingMsg)
       };
       this.$store.commit("ChoiceAddFinancialDocuments");

src/components/scenicSpot/scenicSpotPackagePrice.vue

@@ -411,7 +411,7 @@ input[type="number"] {
     <div class="combottomDiv" v-if="isShowDIv">
       <div class="combottomTitle">{{divTitle}}</div>
       <div class="">
-        <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
+        <el-form :model="addMsg" :rules="rules" ref="addMsg" @submit.native.prevent label-width="100px">
           <el-col :span="4">
             <el-form-item :label="$t('hotel.hotel_StartDate')" prop="StartDate">
               <el-date-picker class="SP_datePicker" :clearable="false" v-model='addMsg.StartDate' type="date" :picker-options="addPickerBeginDateBefore"
@@ -485,7 +485,7 @@ input[type="number"] {
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <button type="success" class="normalBtn subPrice" @click="submitForm('addMsg')">{{comBtnText}}</button>
+            <button type="success" class="normalBtn subPrice" @click.stop="submitForm('addMsg')">{{comBtnText}}</button>
             <input type="button" class="normalBtn" @click="isShowDIv=false" value="取消" />
           </el-col>
         </el-form>
@@ -776,6 +776,7 @@ export default {
         "ticketcouponsprice_post_Set",
         this.addMsg,
         res => {
+          debugger
           if (res.data.resultCode == 1) {
             this.initDataTable();
             this.Success("保存成功！");
@@ -785,7 +786,10 @@ export default {
             this.Error(res.data.message);
           }
         },
-        null
+        e=>{
+          debugger;
+          console.log(e.message)
+        }
       );
     },
     isdelete(ID) {
@@ -815,8 +819,8 @@ export default {
       that.$refs[addMsg].validate(valid => {
         if (valid) {
           that.hotelOfferSet();
-        } else {
-          return false;
+        }else{
+          return false
         }
       });
     },
@@ -855,6 +859,7 @@ export default {
     this.initSupplier();
     this.getAllCurrency();
     this.initDataTable();
+    
   }
 };
 </script>