修改合同

src/components/Contract/TravelContract.vue

@@ -820,8 +820,8 @@
                     </table>
                 </div>
             </el-form>
-            <div>
-                <input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="normalBtn" style="margin:40px 0 30px 60px;" @click="sendAudit()" value="提交审核"/>
+            <div style="margin-top:20px;">
+                <input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="normalBtn" style="margin:0 0 30px 60px;" @click="sendAudit()" value="提交审核"/>
                 <input type="button" class="normalBtn" @click="submitForm('CtObj')" value="保存"/>
                 <input type="button" class="normalBtn" v-if="CtObj.status==1" @click="goUrl()"  value="预览">
                 <input type="button" class="normalBtn" v-if="CtObj.status==1" @click="getinvalid()" value="作废">
@@ -957,8 +957,8 @@
             agentCall:'',
             contractPlace:'',
             //合同条款
-            totalNumber:0,
-            eachNumber:0, 
+            totalNumber:2,
+            eachNumber:1, 
             productName:'',
             startDate:'',
             returnDate:'',
@@ -1054,6 +1054,9 @@
                   this.CtObj.businessCertificate = '0000000';
                   this.CtObj.tcid = this.$route.query.TCID;
                   this.CtObj.orderId = this.$route.query.orderID;
+                  this.CtObj.totalNumber=2;
+                  this.CtObj.eachNumber=1;
+
                   if(this.CtObj.clientCountryid>0){
                       this.GetSubAreaList(this.CtObj.clientCountryid,1,1);
                   }

src/components/SalesModule/groupTourOrder.vue

@@ -1819,7 +1819,8 @@
                     </span>
 
               </div>
-              <span class="GO_Contract" @click="goContract(item)" >领取合同</span>
+              <span v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</span>
             </td>
           </tr>
           <tr>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -870,7 +870,11 @@
     line-height: 22px;
     background-color: #f0f2f5;
   }
-
+.GO_Contract{
+    color:blue;
+    display: block;
+    cursor: pointer;
+  }
 </style>
 
 <template>
@@ -2137,7 +2141,8 @@
                     <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in item.tipFrId" :key="i">{{id}}</span>
 
                     </span>
-
+                    <div v-if="item.contractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</div>
+                    <div v-else class="GO_Contract" @click="goContract(item)">{{item.contractNum}}</div>
               </div>
 
               </td>
@@ -4789,6 +4794,18 @@
             tab: name
           }
         });
+      },
+       //跳转至领取合同
+      goContract(item){
+        let routeData = this.$router.resolve({
+          name: 'TravelContract',
+          query: {
+            TCID: item.tcid,
+            orderID:item.orderId,
+            blank: 'y'
+          }
+        })
+        window.open(routeData.href, '_blank')
       },
       goUrl(name, path, id, tcmun) {
         this.$router.push({

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -929,7 +929,11 @@
     margin: 0 20px 5px 0;
     width: 100%;
   }
-
+.GO_Contract{
+    color:blue;
+    display: block;
+    cursor: pointer;
+  }
 </style>
 
 <template>
@@ -1772,7 +1776,8 @@
               <!--                <span>暂无名单</span>-->
               <!--              </p>-->
               <span>房间信息：{{item.OrderGuestHouseStr}}</span>
-              
+              <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)" >领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span>
             </td>
           </tr>
           <tr>
@@ -2088,7 +2093,8 @@
                     <span>单据：</span>
                     <span @click="gourlTip('FinancialDocumentsDetail',id)" style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId" :key="i">{{id}}</span>
                     </span>
-
+                    <span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)" >领取合同</span>
+                    <span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span>
               </div>
               </td>
             </tr>
@@ -5040,6 +5046,18 @@
         });
 
       },
+      //跳转至领取合同
+      goContract(item){
+        let routeData = this.$router.resolve({
+          name: 'TravelContract',
+          query: {
+            TCID: item.TCID,
+            orderID:item.OrderId,
+            blank: 'y'
+          }
+        })
+        window.open(routeData.href, '_blank')
+      },
       Discount(TCID) {
         this.SpecialOffer = true
         this.apipost(