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

src/components/TravelContractDetail.vue

@@ -381,6 +381,7 @@
     font-size: 12px;
     color: gray;
   }
+
   .TD_MainContent .TCbtn-info {
     color: #ffffff;
     text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -404,12 +405,13 @@
     outline: none;
     cursor: pointer;
   }
-  
+
   .TCbtn-info:hover,
   .btn-warning:hover {
     color: #ffffff;
     opacity: 0.8;
   }
+
   .TD_MainContent .singeRowTable {
     width: 100%;
     border-collapse: collapse;
@@ -455,8 +457,8 @@
               销售人员:{{dataList.saleName}}</template>
             <span>
               <template v-if="dataList.orderType==0">
-          <input type="button" class="TCbtn-info" @click="(dialogVisible = true), getGuestList()" value="复制合同" />
-        </template>
+                <input type="button" class="TCbtn-info" @click="(dialogVisible = true), getGuestList()" value="复制合同" />
+              </template>
               <input type="button" class="TCbtn-info" v-if="dataList.status==1" @click="getinvalid()" value="作废" />
               <input type="button" class="TCbtn-info" v-if="dataList.companySignature==''"
                 @click="isShowFade=true,GetQrCode()" value="客户签字" />
@@ -1208,9 +1210,9 @@
         dialogVisible: false,
         QRCodeStr: "",
         pdfLoading: false,
-          //旅客名单
+        //旅客名单
         backGuest: [],
-           //旅客名单
+        //旅客名单
         guestList: [],
         //线路名称
         LineName: '',
@@ -1295,8 +1297,8 @@
 
         })
       },
-       //点击合同获取旅客信息
-       getGuestList() {
+      //点击合同获取旅客信息
+      getGuestList() {
         let msg = {
           orderId: this.msg.orderID,
         };
@@ -1378,7 +1380,7 @@
         this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
           if (res.data.resultCode === 1) {
             this.dataList = res.data.data;
-            this.guestList =  this.dataList.allGuestList;
+            this.guestList = this.dataList.allGuestList;
           } else {
             this.Error(res.data.message);
           }
@@ -1475,6 +1477,7 @@
         TID = this.$route.query.Id;
       }
       if (this.$route.query.ID) {
+        this.msg.Id = this.$route.query.ID;
         TID = this.$route.query.ID;
       }
       this.getList();