页面修改

src/components/DomesticTravelcontract.vue

@@ -313,10 +313,10 @@
   }
 
   .TC-MainContent .disClick {
-    background-color: #d1d1d1!important;
-    color: #fff!important;
+    background-color: #d1d1d1 !important;
+    color: #fff !important;
     background-image: none;
-    border: 1px solid #d1d1d1!important;
+    border: 1px solid #d1d1d1 !important;
   }
 
   .TC-MainContent .disClick:hover {
@@ -341,7 +341,8 @@
         <span style="color:blue;font-size:14px;"></span>
       </span>
       <div class="pull-right">
-        <input type="button" class="btn-warning" :class="{'disClick':!isSubmit}" @click="submitForm('CtObj')" value="保存" />
+        <input type="button" class="btn-warning" :class="{'disClick':!isSubmit}" @click="submitForm('CtObj')"
+          value="保存" />
       </div>
     </div>
     <el-form label-width="180px" :model="CtObj" :rules="rules" ref="CtObj">
@@ -1227,7 +1228,8 @@
           ContractTripList: [], //行程列表
           ContractSelfFeeList: [], //自愿付费项目补充协议
           TripType: 0, //行程类型(0-简易行程，1-标准行程)
-
+          TCID: 0,
+          OrderId: 0,
         },
         //旅客名单
         guestList: [],
@@ -1359,9 +1361,14 @@
             res => {
               this.isSubmit = true;
               if (res.data.resultCode == 1) {
-                this.CtObj.ID = res.data.data;
-                this.GetData();
                 this.Success(res.data.message);
+                this.CtObj.ID = res.data.data;
+                this.$router.push({
+                  name: 'DomesticTravelcontract',
+                  query: {
+                    id: res.data.data,
+                  }
+                });
               } else {
                 this.Error(res.data.message);
               }
@@ -1660,7 +1667,14 @@
         item.IsShow = 0;
         this.$forceUpdate();
       },
-
+    },
+    created() {
+      if (this.$route.query.TCID && this.$route.query.TCID > 0) {
+        this.CtObj.TCID = this.$route.query.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/SingleContract.vue

@@ -1375,7 +1375,9 @@
           ContractTicketAndHotel: { // 机票和酒店组合信息
             ContractTickets: [],
             ContractHotels: []
-          }
+          },
+          TCID: 0,
+          OrderId: 0,
         },
         rules: {
           Tourists_Name: [{
@@ -1413,7 +1415,6 @@
         menuArr: ['合同基本信息', '相关告知及提示', '费用计算', '游客信息', '机票预订', '酒店预订', '接送服务', '代办签证', '服务组合（机票与酒店）', '其他单项服务事宜'],
         ckedIndex: 0,
         ckedAll: false,
-
         //旅客信息
         touristList: [],
         editorOption: {
@@ -1424,7 +1425,6 @@
             ]
           }
         },
-
         //防止重复提交
         isSubmit: true,
         //大写金额
@@ -1462,9 +1462,14 @@
             res => {
               this.isSubmit = true;
               if (res.data.resultCode == 1) {
-                this.CtObj.ID = res.data.data;
-                this.GetData();
                 this.Success(res.data.message);
+                this.CtObj.ID = res.data.data;
+                this.$router.push({
+                  name: 'SingleContract',
+                  query: {
+                    id: res.data.data,
+                  }
+                });
               } else {
                 this.Error(res.data.message);
               }
@@ -1680,7 +1685,6 @@
           this.ckedIndex = 8
         }
       },
-
       GetData() {
         this.apipost(
           "travelcontract_get_GetTravelContractService", {
@@ -1787,8 +1791,8 @@
               this.CtObj.PickUpTotalPrice = tempObj.PickUpTotalPrice;
               this.CtObj.VisaTotalPrice = tempObj.VisaTotalPrice;
               this.CtObj.SignType = tempObj.SignType;
-              this.CtObj.TravelAgency_Name=tempObj.TravelAgency_Name;
-              this.CtObj.TravelAgency_Address=tempObj.TravelAgency_Address;
+              this.CtObj.TravelAgency_Name = tempObj.TravelAgency_Name;
+              this.CtObj.TravelAgency_Address = tempObj.TravelAgency_Address;
               this.CtObj.TicketAndHotelTotalPrice =
                 tempObj.TicketAndHotelTotalPrice;
               if (
@@ -2029,7 +2033,14 @@
         this.AmountMoney = strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace(
           /零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元")
       }
-
+    },
+    created() {
+      if (this.$route.query.TCID && this.$route.query.TCID > 0) {
+        this.CtObj.TCID = this.$route.query.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/administrative/ContractManage.vue

 <style>
-  .ContractManage .query-box .el-button--primary {
-    background-color: #fff !important;
-    color: #e95252 !important;
-    border-color: #e95252 !important;
-  }
-
-  .ContractManage .query-box .el-button--primary:focus,
-  .query-box .el-button--primary:hover {
-    background-color: #fff !important;
-    color: #e95252 !important;
-    border-color: #e95252 !important;
-  }
-
-  .ContractManage .query-box .el-button {
-    border-radius: 16px;
-    height: 30px;
-    position: relative;
-    top: 5px;
-  }
-
-  .ContractManage .query-box .el-button i {
-    color: #e95252;
-  }
-
-  .ContractManage .query-box .el-button span {
-    position: relative;
-    top: -3px;
-  }
-
-  .ContractManage .el-button+.el-button {
-    margin-left: 0 !important;
-  }
-
   /*灰色遮罩层*/
   .ContractManage .fade {
     width: 100%;
@@ -58,6 +25,7 @@
     z-index: 999;
     border-radius: 5px;
   }
+
   .ContractManage .Ec_cha {
     position: absolute;
     cursor: pointer;
@@ -74,6 +42,7 @@
   .ContractManage .Ec_cha:hover {
     color: red;
   }
+
 </style>
 
 <template>
@@ -153,7 +122,7 @@
               getList();
               resetPageIndex();
             " />
-          <el-dropdown @command="getImport">
+          <!-- <el-dropdown @command="getImport">
             <el-button type="primary" @click="goContract('onedayTripContract', 0, '一日游合同')"> 一日游合同
               <i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
@@ -161,6 +130,13 @@
               <el-dropdown-item command="1">境内旅游合同</el-dropdown-item>
               <el-dropdown-item command="2">单项委托合同</el-dropdown-item>
             </el-dropdown-menu>
+          </el-dropdown> -->
+          <el-dropdown size="medium" @command="getImport" split-button type="primary" @click="handleClick" style="padding-left:5px;">
+            一日游合同
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="1">境内旅游合同</el-dropdown-item>
+              <el-dropdown-item command="2">单项委托合同</el-dropdown-item>
+            </el-dropdown-menu>
           </el-dropdown>
         </li>
       </ul>
@@ -239,10 +215,6 @@
             v-if="item.Status==0||item.Status==3">
             <el-button type="info" icon="el-icon-upload2" circle @click="SubmitContract(item)"></el-button>
           </el-tooltip>
-          <!-- <el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户">
-            <el-button type="info" icon="iconfont icon-copy-l" circle @click="CopyUrl(item)"
-              style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
-          </el-tooltip> -->
           <el-tooltip class="item" v-if="item.Status==2" effect="dark" content="复制链接发送给客户">
             <el-button type="info" icon="iconfont icon-copy-l" circle @click="GetQrCode(item)"
               style="padding:4px;background-color:#9266f9;border-color:#9266f9;"></el-button>
@@ -264,7 +236,7 @@
 
     <div class="fade" v-show="isShowFade"></div>
     <div class="qrCodeDiv" v-show="isShowFade">
-      <div style="margin-top:15px;">请扫码签字 <br/>【{{clickObj.T_ContractNum}}】</div>
+      <div style="margin-top:15px;">请扫码签字 <br />【{{clickObj.T_ContractNum}}】</div>
       <div id="qrcode" style="margin:25px;" ref="qrcode">
         <img class="WeiXinShare" :src="'data:image/png;base64,'+QRCodeStr" />
       </div>
@@ -312,11 +284,23 @@
             return startTime.getTime() >= time.getTime();
           }
         },
-        clickObj:{},//当前选择的合同
+        clickObj: {}, //当前选择的合同
         isShowFade: false, //是否显示二维码图片
         QRCodeStr: "", //二维码图片
+        queryPrams: {
+          TCID: 0,
+          orderID: 0,
+        }
       };
     },
+    created() {
+      if (this.$route.query.TCID && this.$route.query.TCID > 0) {
+        this.queryPrams.TCID = this.$route.query.TCID
+      }
+      if (this.$route.query.orderID && this.$route.query.orderID > 0) {
+        this.queryPrams.orderID = this.$route.query.orderID
+      }
+    },
     mounted() {
       this.getList();
     },
@@ -369,7 +353,7 @@
         let msg = {
           ContractId: item.ID,
         };
-        this.clickObj=item;
+        this.clickObj = item;
         this.$http({
           headers: {
             'Content-Type': 'application/json'
@@ -397,8 +381,12 @@
         oInput.style.display = 'none';
         this.Info("复制成功!");
       },
+      handleClick() {
+        this.goContract('onedayTripContract', 0, '一日游合同');
+      },
       //跳转
       getImport(command) {
+        console.log("command", command);
         if (command == 1) {
           this.goContract('DomesticTravelcontract', 0, '境内旅游合同');
         } else if (command == 2) {
@@ -516,6 +504,8 @@
           query: {
             id: nId,
             blank: "y",
+            TCID:this.queryPrams.TCID,
+            orderID:this.queryPrams.orderID,
             tab: title
           }
         });

src/components/onedayTripContract.vue

@@ -333,11 +333,12 @@
     background-color: #0044cc;
     *background-color: #003bb3;
   }
+
   .TC-MainContent .disClick {
-    background-color: #d1d1d1!important;
-    color: #fff!important;
+    background-color: #d1d1d1 !important;
+    color: #fff !important;
     background-image: none;
-    border: 1px solid #d1d1d1!important;
+    border: 1px solid #d1d1d1 !important;
   }
 
   .TC-MainContent .disClick:hover {
@@ -1146,7 +1147,9 @@
           TicketAndHotelTotalPrice: "0", // 机票加酒店组合总费用
           ContractShopList: [], //自愿购物活动补充协议
           ContractGuestList: [], //旅客名单
-          ContractTripList: [] //行程列表
+          ContractTripList: [], //行程列表
+          TCID: 0,
+          OrderId: 0,
         },
 
         rules: {
@@ -1227,9 +1230,14 @@
             res => {
               this.isSubmit = true;
               if (res.data.resultCode == 1) {
-                this.CtObj.ID = res.data.data;
-                this.GetData();
                 this.Success(res.data.message);
+                this.CtObj.ID = res.data.data;
+                this.$router.push({
+                  name: 'onedayTripContract',
+                  query: {
+                    id: res.data.data,
+                  }
+                });
               } else {
                 this.Error(res.data.message);
               }
@@ -1238,7 +1246,6 @@
           );
         }
       },
-
       //提交
       submitForm(addMsg) {
         //提交创建、修改表单
@@ -1503,6 +1510,14 @@
         this.$forceUpdate();
       },
     },
+    created() {
+      if (this.$route.query.TCID && this.$route.query.TCID > 0) {
+        this.CtObj.TCID = this.$route.query.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) {
         this.CtObj.ID = this.$route.query.id;