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

src/components/SalesModule/demandInquiry.vue

@@ -72,7 +72,7 @@
                                     placeholder="请选择"
                                     v-for="item in AppCoustomer" 
                                     :key="item.customerId" 
-                                    :label="item.customerName" 
+                                    :label="`${item.customerName}(${item.contact})`"
                                     :value="item.customerId">
                                 </el-option>
                             </el-select> 
@@ -197,8 +197,10 @@ export default {
 			},
         getAppCoustomer(){   // 获取客户列表      
             this.apipost('app_get_my_select_coustomer',{},res=>{
+                // console.log(res,"safaf")
                 if(res.data.resultCode==1){
                     this.AppCoustomer = res.data.data;
+                    // console.log("this.AppCoustomer",this.AppCoustomer)
                 }else{
                     this.$message.error(res.data.message)
                 }

src/components/TravelContractDetail.vue

@@ -304,16 +304,16 @@
 </style>
 
 <template>
-    <div class="TD_MainContent">
+    <div class="TD_MainContent" v-loading="pdfLoading">
         <div class="container-fluid">
             <div class="block mtop15">
                 <div class="blockTitle">
                     <span class="icon"><i class="iconfont icon-wenjian"></i></span>
                     <h2>合同详情
                         <span>
-                            <input type="button" class="TCbtn-info" v-if="dataList.status==1" @click="getinvalid()" value="作废" />
+                            <input type="button" class="TCbtn-info" v-if="dataList.status==1" @click="getinvalid()" value="作废" style="display:none;" />
                             <input type="button" class="TCbtn-info" v-if="dataList.companySignature==''" @click="isShowFade=true,GetQrCode()" value="客户签字" />
-                            <input type="button" class="TCbtn-info" v-if="dataList.companySignature!=''" value="下载" @click="toContractPDF(dataList.contractNum)" />
+                            <input type="button" class="TCbtn-info" v-if="dataList.companySignature!=''"  value="下载" @click="toContractPDF(dataList.contractNum)" />
                         </span>
                     </h2>
                 </div>
@@ -925,6 +925,7 @@
             "msg": msg
           }
         }).then(res => {
+            this.pdfLoading = false
           if (res.data.resultCode === 1) {
             let sign = title + "V2"
             const a = document.createElement('a');
@@ -935,7 +936,6 @@
           } else {
             this.Error('PDF获取失败');
           }
-          this.pdfLoading = false
         }).catch(err => {
 
         })

src/components/TravelContractNew.vue

@@ -157,6 +157,10 @@
     .TC-MainContent .pull-right{
         float:right;
     }
+    .TC-MainContent .TC_disabled{
+        color:#57a3f3;
+        cursor: not-allowed!important;
+    }
     .TC-MainContent .TCbtn-info {
         color: #ffffff;
         text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -232,7 +236,7 @@
                 <input type="button" v-if="CtObj.status==1&&CtObj.auditContract==3" class="TCbtn-info" @click="sendAudit()" value="审核已被驳回,重新提交"/>
                 <input type="button" class="TCbtn-info" v-if="CtObj.status==1" @click="goUrl()"  value="预览">
                 <input type="button" class="TCbtn-info" v-if="CtObj.status==1" @click="getinvalid()" value="作废" style="display:none;">
-                <input type="button" v-if="!msg.guestId" class="TCbtn-info" @click="dialogVisible=true,getGuestList()" value="复制合同"/>
+                <input type="button" class="TCbtn-info" @click="dialogVisible=true,getGuestList()" value="复制合同"/>
                 <input type="button" class="TCbtn-info" v-if="CtObj.status==1" @click="msgDialog=true,getMsgList()" value="发送短信"/>
                 <input type="button" v-if="CtObj.auditContract==0||CtObj.auditContract==3" class="btn-warning" @click="submitForm('CtObj')" value="保存"/>
             </div>
@@ -1201,7 +1205,7 @@
         </el-dialog>
 
         <el-dialog custom-class='w600' title='发送信息' :visible.sync="msgDialog" center>
-            <input type="button" class="TCbtn-info" style="padding:8px 10px;float:right;margin-bottom:10px;" @click="sendMsg()"  value="发送短信"/>
+            <input type="button" class="TCbtn-info" :class='{"TC_disabled":!this.canClick}' style="padding:8px 10px;float:right;margin-bottom:10px;" @click="sendMsg11()"  :value="content"/>
             <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
                 <tr>
                     <th>
@@ -1215,7 +1219,7 @@
                 </tr>
                 <tr v-for="(item,index) in msgGuest">
                     <td>
-                        <input v-model="item.checked" type="checkbox"/>
+                        <input v-model="item.checked" :disabled="item.isCanck" type="checkbox"/>
                     </td>
                     <td>{{item.clientName}}</td>  
                     <td>{{item.clientCall}}</td>  
@@ -1417,6 +1421,9 @@
         //短信旅客名单
         msgGuest:[],
         ckedAll:false,
+        content:'发送短信',  //按钮显示内容
+        totalTime:10,
+        canClick: true //添加canClick
       };
     },
     methods: {
@@ -1761,6 +1768,11 @@
                 this.msgGuest=res.data.data;
                 this.msgGuest.forEach(x=>{
                     x.checked=false;
+                    if(x.msgSendStatus==3){
+                        x.isCanck=true;
+                    }else{
+                        x.isCanck=false;
+                    }
                 })
             } else {
                 this.Error(res.data.message);
@@ -1781,7 +1793,11 @@
         var that=this;
         if(that.ckedAll){
             this.msgGuest.forEach(x=>{
-                x.checked = true;
+                if(x.msgSendStatus==3){
+                    x.checked=false;
+                }else{
+                    x.checked = true;
+                }
             })
         }else{
             this.msgGuest.forEach(x=>{
@@ -1789,6 +1805,34 @@
             })
         }
     },
+    sendMsg11(){
+        let newArr = [];
+        this.msgGuest.forEach(x=>{
+            let obj={};            
+            if(x.checked){
+                newArr.push(x);
+            }
+        })
+        if(newArr.length==0){
+            this.Error('请勾选要发送信息的旅客！');
+            return;
+        }
+       if (!this.canClick) 
+            return
+            this.sendMsg(); //调用发送短信
+            this.canClick = false
+            this.content = this.totalTime + 's后重新发送'
+            let clock = window.setInterval(() => {
+            this.totalTime--
+            this.content = this.totalTime + 's后重新发送'
+        if (this.totalTime < 0) {
+            window.clearInterval(clock)
+            this.content = '重新发送验证码'
+            this.totalTime = 10
+            this.canClick = true  //这里重新开启
+            }
+        },1000)
+    },
     //发送短信
     sendMsg(){
         let msgObj=[];

src/components/administrative/ElectronicAudit.vue

@@ -160,6 +160,7 @@ export default {
             name: 'TravelContractDetail',
             query: {
                 TCID: item.tcid,
+                guestId:item.guestId,
                 orderID: item.orderId,
                 blank: "y",
             }