合同修复

src/components/DomesticTravelcontract.vue

@@ -332,7 +332,7 @@
 
 </style>
 <template>
-  <div class="TC-MainContent">
+  <div class="TC-MainContent" v-loading="dataLoading">
     <!-- 内容开始 -->
     <ul class="fixedMenu" id="fixedMenu">
       <li v-for="(item, index) in menuArr" :key="index" :class="{ active: index == ckedIndex }"
@@ -1542,6 +1542,7 @@
         tripList: [],
         LineName: "",
         SMLoading: false,
+        dataLoading: false,
       };
     },
     components: {
@@ -1690,6 +1691,7 @@
       },
       //提交
       submitForm(addMsg) {
+        if(this.$route.query.orderID) this.CtObj.OrderId = this.$route.query.orderID
         //提交创建、修改表单
         this.$refs[addMsg].validate(valid => {
           if (valid) {
@@ -1813,6 +1815,8 @@
         }
       },
       GetData() {
+         if(this.dataLoading) return
+          this.dataLoading = true
         this.apipost(
           "travelcontract_get_GetTravelContractService", {
             ID: this.CtObj.ID,
@@ -1859,11 +1863,13 @@
                 };
                 this.CtObj.ContractTripList.push(tripObj);
               }
+              this.dataLoading = false
             } else {
+               this.dataLoading = false
               this.Error(res.data.message);
             }
           },
-          err => {}
+          err => { this.dataLoading = false}
         );
       },
       //公用休改
@@ -2144,9 +2150,6 @@
         this.CtObj.TCID = this.$route.query.TCID;
         this.GetTrip(this.CtObj.TCID);
       }
-      if (this.$route.query.orderID && this.$route.query.orderID > 0) {
-        this.CtObj.OrderId = this.$route.query.orderID;
-      }
     },
     mounted() {
       if (this.$route.query.id && this.$route.query.id > 0) {

src/components/SalesModule/groupTourOrder.vue

@@ -2360,7 +2360,10 @@
               <div class="row">
                 <div v-if="item.otherContractList&&(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)">
                   <span class="GO_Contract"
-                    @click="goSingleContract(item)">{{item.otherContractList.length==0? $t('objFill.danxianght') : $t('objFill.chankandxht')}}</span>
+                    @click="goSingleContract(item)">
+                    <!-- {{item.otherContractList.length==0? $t('objFill.danxianght') : $t('objFill.chankandxht')}} -->
+                    {{item.otherContractList.length==0? $t('objFill.danxianght') : $t('objFill.v101.myOrdersAllType.chakanhet')}}
+                  </span>
                 </div>
                 <template v-if="item.otherContractList && item.otherContractList.length > 0">
                   <!-- {{$t('objFill.danxianght')}}： -->
@@ -3331,7 +3334,10 @@
             ...query,
             id: sItem.id,
           }
-          this.OpenNewPage('/SingleContract', query)
+          let path = '/SingleContract'
+          if(sItem.cType==3) path = '/onedayTripContract'
+          if(sItem.cType==2) path = '/DomesticTravelcontract'
+          this.OpenNewPage(path, query)
         }
       },
       //跳转到保密协议

src/components/SalesModule/groupTourOrderOne.vue

@@ -1718,7 +1718,10 @@
               <div class="row">
                <div v-if="item.otherContractList&&(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)">
                   <span class="GO_Contract"
-                    @click="goSingleContract(item)">{{item.otherContractList.length==0? $t('objFill.danxianght') : $t('objFill.chankandxht')}}</span>
+                    @click="goSingleContract(item)">
+                    <!-- {{item.otherContractList.length==0? $t('objFill.danxianght') : $t('objFill.chankandxht')}} -->
+                    {{item.otherContractList.length==0? $t('objFill.danxianght') : $t('objFill.v101.myOrdersAllType.chakanhet')}}
+                  </span>
                 </div>
                 <template v-if="item.otherContractList && item.otherContractList.length > 0">
                     <!-- {{$t('objFill.danxianght')}}： -->
@@ -2395,11 +2398,10 @@
           this.OpenNewPage('/ContractManage', query)
         }
         else {
-          query = {
-            ...query,
-            id: sItem.id,
-          }
-          this.OpenNewPage('/SingleContract', query)
+          let path = '/SingleContract'
+          if(sItem.cType==3) path = '/onedayTripContract'
+          if(sItem.cType==2) path = '/DomesticTravelcontract'
+          this.OpenNewPage(path, query)
         }
       },
       //跳转至领取合同

src/components/SingleContract.vue

@@ -319,7 +319,7 @@
 
 </style>
 <template>
-  <div class="TC-MainContent">
+  <div class="TC-MainContent" v-loading="dataLoading">
     <!-- 内容开始 -->
     <ul class="fixedMenu" id="fixedMenu">
       <li v-for="(item,index) in menuArr" :class="{'active':index==ckedIndex}"
@@ -1474,6 +1474,7 @@
         //大写金额
         AmountMoney: '',
         SMLoading: false,
+        dataLoading: false,
       };
     },
     filters: {
@@ -1812,6 +1813,8 @@
         }
       },
       GetData() {
+        if(this.dataLoading) return
+        this.dataLoading = true
         this.apipost(
           "travelcontract_get_GetTravelContractService", {
             ID: this.CtObj.ID,
@@ -1885,12 +1888,13 @@
               if (this.CtObj.C_TotalPrice && this.CtObj.ContractTicketAndHotel.ContractHotels != null) {
                 this.number_chinese(this.CtObj.C_TotalPrice);
               }
-
+              this.dataLoading = false
             } else {
+               this.dataLoading = false
               this.Error(res.data.message);
             }
           },
-          err => {}
+          err => { this.dataLoading = false}
         );
       },
 

src/components/TravelContractNew.vue

@@ -291,7 +291,7 @@
 
 </style>
 <template>
-  <div class="TC-MainContent">
+  <div class="TC-MainContent" v-loading="dataLoading">
     <!-- 内容开始 -->
     <ul class="fixedMenu" id="fixedMenu">
       <li v-for="(item, index) in menuArr" :class="{ active: index == ckedIndex }"
@@ -1728,6 +1728,7 @@
         content: "发送短信", //按钮显示内容
         SaveLoading: false, //保存Loading
         SMLoading: false,
+        dataLoading: false,
       };
     },
     components: {
@@ -1842,6 +1843,8 @@
         document.documentElement.scrollTop = anchor.offsetTop - 70;
       },
       getList() {
+        if(this.dataLoading) return
+        this.dataLoading = true
         this.apipost(
           "travelcontract_post_GetContractInfoService",
           this.msg,
@@ -1913,11 +1916,13 @@
                   this.goContract();
                 }
               }
+               this.dataLoading = false
             } else {
+               this.dataLoading = false
               this.Error(res.data.message);
             }
           },
-          null
+          err=>{ this.dataLoading = false}
         );
       },
       //获取国家

src/components/onedayTripContract.vue

@@ -1583,6 +1583,7 @@
       },
       //提交
       submitForm(addMsg) {
+        if(this.$route.query.orderID) this.CtObj.OrderId = this.$route.query.orderID
         //提交创建、修改表单
         this.$refs[addMsg].validate(valid => {
           if (valid) {
@@ -2015,9 +2016,6 @@
         this.CtObj.TCID = this.$route.query.TCID;
         this.GetTrip(this.CtObj.TCID);
       }
-      if (this.$route.query.orderID && this.$route.query.orderID > 0) {
-        this.CtObj.OrderId = this.$route.query.orderID;
-      }
     },
     mounted() {
       if (this.$route.query.id && this.$route.query.id > 0) {