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

src/components/administrative/AllianceContract.vue

@@ -175,7 +175,7 @@
                 @change="getCustomer(1)"
                 class="">
                 <el-option v-for='item in CustomerList'
-                    :label='item.CustomerName+"("+item.ContactNumber+")"'
+                    :label='item.CustomerName+"-"+item.Contact+"("+item.ContactNumber+")"'
                     :value='item.ID'
                     :key='item.ID'>
                 </el-option>
@@ -398,16 +398,16 @@ export default {
         this.dialogFormVisible = true
         this.addType = 2
         console.log(obj)
+        let list = obj.CustomerChildrenIds.split(',')
         this.addMsg = {
           ...JSON.parse(JSON.stringify(obj)),
-          CustomerChildrenIds: obj.CllianceChildList.map(x=>{
-            return x.ID
-          }).join(','),
-          CustomerChildrenIdList: obj.CllianceChildList.map(x=>{
-            return x.ID
-          }),
+          CustomerChildrenIds: obj.CustomerChildrenIds,
+          CustomerChildrenIdList: [],
           accountId: obj.ClientBankAccountId
         }
+        list.forEach(item=>{
+          this.addMsg.CustomerChildrenIdList.push(Number(item))
+        })
       },
       ViewContract(item){
         window.open(item.TravelAgency_SignAddress, '_blank');
@@ -640,7 +640,7 @@ export default {
           this.saveLoading = false
         })
       },
-      iniTAddMsg: function () {
+      iniTAddMsg() {
         this.addMsg = {
           Id: this.addMsg.Id,//	主账户信息（也就是customerId）
           CustomerId: this.addMsg.CustomerId,

src/components/administrative/ElectronicAudit.vue

@@ -401,7 +401,7 @@
             <p class="shenheInfoTitle">公司名称:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.Tourists_Name }}</div>
           </el-col>
-          <el-col :span="5" class="shenheInfoBox">
+          <el-col :span="6" class="shenheInfoBox">
             <p class="shenheInfoTitle">营业执照:</p>
             <div class="shenheInfoCenter">
               <el-image 
@@ -411,15 +411,15 @@
               </el-image>
             </div>
           </el-col>
-          <el-col :span="13" class="shenheInfoBox">
+          <el-col :span="11" class="shenheInfoBox">
             <p class="shenheInfoTitle">经营许可证:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.Tourists_Email }}</div>
           </el-col>
-          <el-col :span="6" class="shenheInfoBox shenheInfoBoxR">
+          <el-col :span="7" class="shenheInfoBox">
             <p class="shenheInfoTitle">法人:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.LegalPersonName }}</div>
           </el-col>
-          <el-col :span="5" class="shenheInfoBox">
+          <el-col :span="6" class="shenheInfoBox">
             <p class="shenheInfoTitle">身份证:</p>
             <div class="shenheInfoCenter">
               <el-image 
@@ -434,15 +434,15 @@
               </el-image>
             </div>
           </el-col>
-          <el-col :span="12" class="shenheInfoBox">
+          <el-col :span="11" class="shenheInfoBox">
             <p class="shenheInfoTitle">身份证号:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.LegalIdCardNumber }}</div>
           </el-col>
-          <el-col :span="7" class="shenheInfoBox shenheInfoBoxR">
+          <el-col :span="7" class="shenheInfoBox">
             <p class="shenheInfoTitle">有效期:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.LegalIdCardTime }}</div>
           </el-col>
-          <el-col :span="8" class="shenheInfoBox">
+          <el-col :span="6" class="shenheInfoBox">
             <p class="shenheInfoTitle">开户支行:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.OpenBankName }}</div>
           </el-col>
@@ -450,7 +450,7 @@
             <p class="shenheInfoTitle">所属银行:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.BankName }}</div>
           </el-col>
-          <el-col :span="5" class="shenheInfoBox shenheInfoBoxR">
+          <el-col :span="7" class="shenheInfoBox">
             <p class="shenheInfoTitle">开户人:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.AccountHolder }}</div>
           </el-col>
@@ -476,7 +476,7 @@
           <tr>
             <td width="100" align="right">{{$t('objFill.v102.youxiaoqks')}}：</td>
             <td>
-              <el-date-picker v-model="BoHuiObj.C_StartDate" style="width: 100%;"
+              <el-date-picker v-model="BoHuiObj.StartDateStr" style="width: 100%;"
               format="yyyy-MM-dd" type="date"
               value-format="yyyy-MM-dd"
                   :picker-options="pickerBeginDateBefore3" :clearable="false">
@@ -486,7 +486,7 @@
           <tr>
             <td width="100" align="right">{{$t('objFill.v102.youxiaoqjs')}}：</td>
             <td>
-              <el-date-picker v-model="BoHuiObj.C_EndDate" style="width: 100%;" 
+              <el-date-picker v-model="BoHuiObj.EndDateStr" style="width: 100%;" 
                   format="yyyy-MM-dd" type="date"
                   value-format="yyyy-MM-dd"
                   :picker-options="pickerBeginDateAfter3" :clearable="false">
@@ -615,10 +615,10 @@
         },
         pickerBeginDateBefore3: {
           disabledDate: time => {
-            if (this.BoHuiObj.C_EndDate == null) {
+            if (this.BoHuiObj.EndDateStr == null) {
               return false;
             } else {
-              let endTime = new Date(this.BoHuiObj.C_EndDate);
+              let endTime = new Date(this.BoHuiObj.EndDateStr);
               return endTime.getTime() < time.getTime();
             }
           }
@@ -637,8 +637,8 @@
         },
         BoHuiObj: {
           C_DayNum: '',
-          C_StartDate: '',
-          C_EndDate: '',
+          StartDateStr: '',
+          EndDateStr: '',
           C_NightNum: '',
         },
         isBoHui: 0, //是否是单项、一日游、境内旅游合同驳回
@@ -707,8 +707,8 @@
       closeContractDialog() {
         this.BoHuiObj = {
           C_DayNum: '',
-          C_StartDate: '',
-          C_EndDate: '',
+          StartDateStr: '',
+          EndDateStr: '',
           C_NightNum: '',
         }
         this.isBoHui = 0;
@@ -814,7 +814,6 @@
         { ContractId: item.ID }, 
         res => {
           if (res.data.resultCode === 1) {
-            console.log(res.data.data,'=====');
             this.ContractInfor = res.data.data;
             this.inforLoading = false
           } else {
@@ -832,9 +831,10 @@
         }
         var that = this;
         if(status==2){
-          if(item.C_DayNum==''||item.C_StartDate==''||item.C_EndDate==''
-          ||item.C_NightNum==''||!item.C_NightNum
-          ||item.C_NightNum==null){
+          if(item.C_DayNum==''||!item.C_DayNum||item.C_DayNum==null
+          ||item.StartDateStr==''||!item.StartDateStr||item.StartDateStr==null
+          ||item.EndDateStr==''||!item.EndDateStr||item.EndDateStr==null
+          ||item.C_NightNum==''||!item.C_NightNum||item.C_NightNum==null){
             this.Error(this.$t('objFill.v102.hetongdhbts'));
             return;
           }