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

src/assets/common/lang/EN/fill.js

@@ -8160,6 +8160,9 @@ export const obj = {
     lianmeng: 'Union ',
     fanyongjefw: 'Rebate Transaction Amount Range ',
     qingxuanzbohtg: 'Please select Pass or reject',
+    jinyinxkez: 'Business License',
+    faren: 'Legal person',
+    kaihuzhih: 'Opening Branch',
   },
   //#endregion
 }

src/assets/common/lang/Japan/fill.js

@@ -8160,6 +8160,9 @@ export const obj = {
     lianmeng: '同盟」です',
     fanyongjefw: '取引金額の範囲です',
     qingxuanzbohtg: '通過または却下を選択します',
+    jinyinxkez: '経営許可証',
+    faren: '法人',
+    kaihuzhih: '口座開設します',
   },
   //#endregion
 }

src/assets/common/lang/zhCN/fill.js

@@ -8160,6 +8160,9 @@ export const obj = {
     lianmeng: '联盟',
     fanyongjefw: '返佣交易金额范围',
     qingxuanzbohtg: '请选择通过或驳回',
+    jinyinxkez: '经营许可证',
+    faren: '法人',
+    kaihuzhih: '开户支行',
   },
   //#endregion
 }

src/assets/common/lang/zhTW/fill.js

@@ -8159,7 +8159,10 @@ export const obj = {
     shenqinjsr: '申請結算日期',
     lianmeng: '聯盟',
     fanyongjefw: '返傭交易金額範圍',
-    qingxuanzbohtg: '請選擇通過或駁回'
+    qingxuanzbohtg: '請選擇通過或駁回',
+    jinyinxkez: '經營許可證',
+    faren: '法人',
+    kaihuzhih: '開戶支行'
   },
   //#endregion
 }

src/components/administrative/AllianceContract.vue

@@ -408,6 +408,13 @@ export default {
         list.forEach(item=>{
           this.addMsg.CustomerChildrenIdList.push(Number(item))
         })
+        let lists = this.CustomerList.filter(x=>{
+          return x.ID == this.addMsg.Id
+        })
+        if(lists.length>0){
+          this.addMsg.CustomerId = lists[0].CustomerId;
+          this.getAccountPageList()
+        }
       },
       ViewContract(item){
         window.open(item.TravelAgency_SignAddress, '_blank');
@@ -431,8 +438,6 @@ export default {
             this.addMsg.CustomerId = list[0].CustomerId;
             this.getAccountPageList()
           }
-          this.addMsg.CustomerChildrenIds = ''
-          this.addMsg.CustomerChildrenIdList = []
           this.addMsg.accountId = ''
           this.addMsg.OpenBankName = '';
           this.addMsg.AccountHolder = '';

src/components/administrative/ElectronicAudit.vue

@@ -398,11 +398,11 @@
       center :before-close="closeContractDialog">
       <el-row v-if="isBoHui>0" v-loading="inforLoading">
           <el-col :span="24" class="shenheInfoBox">
-            <p class="shenheInfoTitle">公司名称:</p>
+            <p class="shenheInfoTitle">{{ $t('admin.admin_company') }}:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.Tourists_Name }}</div>
           </el-col>
           <el-col :span="6" class="shenheInfoBox">
-            <p class="shenheInfoTitle">营业执照:</p>
+            <p class="shenheInfoTitle">{{ $t('salesModule.BusinessLicense') }}:</p>
             <div class="shenheInfoCenter">
               <el-image 
                 style="width: 20px; height: 20px"
@@ -412,15 +412,15 @@
             </div>
           </el-col>
           <el-col :span="11" class="shenheInfoBox">
-            <p class="shenheInfoTitle">经营许可证:</p>
+            <p class="shenheInfoTitle">{{ $t('objFill.v102.jinyinxkez') }}:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.Tourists_Email }}</div>
           </el-col>
           <el-col :span="7" class="shenheInfoBox">
-            <p class="shenheInfoTitle">法人:</p>
+            <p class="shenheInfoTitle">{{ $t('objFill.v102.faren') }}:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.LegalPersonName }}</div>
           </el-col>
           <el-col :span="6" class="shenheInfoBox">
-            <p class="shenheInfoTitle">身份证:</p>
+            <p class="shenheInfoTitle">{{ $t('objFill.shengfenzheng') }}:</p>
             <div class="shenheInfoCenter">
               <el-image 
                 style="width: 20px; height: 20px"
@@ -435,27 +435,27 @@
             </div>
           </el-col>
           <el-col :span="11" class="shenheInfoBox">
-            <p class="shenheInfoTitle">身份证号:</p>
+            <p class="shenheInfoTitle">{{ $t('system.table_IDcard') }}:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.LegalIdCardNumber }}</div>
           </el-col>
           <el-col :span="7" class="shenheInfoBox">
-            <p class="shenheInfoTitle">有效期:</p>
+            <p class="shenheInfoTitle">{{ $t('objFill.youxiaoqi') }}:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.LegalIdCardTime }}</div>
           </el-col>
           <el-col :span="6" class="shenheInfoBox">
-            <p class="shenheInfoTitle">开户支行:</p>
+            <p class="shenheInfoTitle">{{ $t('objFill.v102.kaihuzhih') }}:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.OpenBankName }}</div>
           </el-col>
           <el-col :span="11" class="shenheInfoBox ">
-            <p class="shenheInfoTitle">所属银行:</p>
+            <p class="shenheInfoTitle">{{ $t('objFill.v102.suoshuyinh') }}:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.BankName }}</div>
           </el-col>
           <el-col :span="7" class="shenheInfoBox">
-            <p class="shenheInfoTitle">开户人:</p>
+            <p class="shenheInfoTitle">{{ $t('fnc.khuren') }}:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.AccountHolder }}</div>
           </el-col>
           <el-col :span="24" class="shenheInfoBox">
-            <p class="shenheInfoTitle">卡号:</p>
+            <p class="shenheInfoTitle">{{ $t('objFill.kaihao') }}:</p>
             <div class="shenheInfoCenter">{{ ContractInfor.CardNum }}</div>
           </el-col>
       </el-row>
@@ -830,7 +830,7 @@
           if(!this.isBoHui) return this.Error(this.$t('objFill.v102.qingxuanzbohtg'));
         }
         var that = this;
-        if(status==2){
+        if(item.CType==4&&status==2){
           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