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

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

@@ -8133,6 +8133,29 @@ export const obj = {
     qingsrzdrs: 'Please enter maximum number of people ',
     chakpakfy: 'View pak rebate information ',
     dangqianfyje: ' Current rebate amount ',
+    dahongbaoht: 'Big red envelope contract ',
+    hetongshu: 'Contract quantity ',
+    jiesuants: 'Billing days ',
+    hetongdjsts: 'The contract can be settled after a few days ',
+    youxiaoqks: 'Effective date starts ',
+    youxiaoqjs: 'Expiration date ends ',
+    hetongtongguo: 'The contract is approved ',
+    fanyongnianfen: 'Rebate year ',
+    hetongdhbts: 'Please fill in the settlement days, contract start date, contract end date, contract rebate year ',
+    xinzenghet: 'New contract ',
+    bianjihet: 'Edit Contract ',
+    suoshuyinh: 'Affiliated bank ',
+    qingshuryhmc: 'Please enter bank name ',
+    qingshurkaih: 'Please enter card number ',
+    quanixanren: 'Please set permissions ',
+    qingxuanzfynfen: 'Please select rebate year ',
+    hetongyxq: 'Duration of contract ',
+    zhuzhanghxx: 'Main account information ',
+    qingxzzhuzhxx: 'Please select main account info ',
+    jiesuanshijian: 'Submit settlement time ',
+    chunxuzhong: 'Still in existence ',
+    dakuanzhong: 'In progress ',
+    lianmenght: 'Alliance Contract ',
   },
   //#endregion
 }

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

@@ -2181,7 +2181,7 @@ export const obj = {
   lvxingsjdtsdh: '旅行社監督、苦情の電話',
   toushudh: '苦情の電話',
   xingchengdsm: [
-    '「旅程表」は次のような内容に対して明確な説明をすべき:',
+    '「旅程表」は次のような内容に対して明確な説明をすべき: ',
     '旅行日程の出発地、通過地、目的地、終了地で、路線日程の時間(自然日に基づいて計算して、飛行机、車、船などの移動時間を含みます。24時間未満は一日で計算します。)',
     '旅行先の通信社の名前、住所、連絡先と連絡先の電話;',
     '交通サービスの手配とその標準(明確な交通机関や等級、出発時間や中継などの情報を必要とします);',
@@ -5725,7 +5725,7 @@ export const obj = {
       goumaishen: '購買省',
       qingsrgmsl: '購入数量を入力してください',
       xuanzheyh: 'ユーザーを選択して',
-      shangpin: '商品:',
+      shangpin: '商品: ',
       xinzengdiz: '新規アドレス',
       shouhuor: '荷受人',
       shenshiqu: '省市区',
@@ -8133,6 +8133,29 @@ export const obj = {
     qingsrzdrs: '最大人数を入力してください',
     chakpakfy: '査看pak帰行情報',
     dangqianfyje: '現在の繰返し手数料',
+    dahongbaoht: 'ご祝儀です',
+    hetongshu: '契約数」です',
+    jiesuants: '決済します',
+    hetongdjsts: '契約終了の数日後に決済できます',
+    youxiaoqks: '有効期日開始」です',
+    youxiaoqjs: '有効期日終了です',
+    hetongtongguo: '契約は成立しました',
+    fanyongnianfen: 'お帰りになりました',
+    hetongdhbts: '決済日数、契約開始日、契約終了日、契約返送年」を記入していただきます',
+    xinzenghet: '新規契約」です',
+    bianjihet: '編集契約書です',
+    suoshuyinh: '銀行に所属します',
+    qingshuryhmc: '銀行名を入力してください',
+    qingshurkaih: 'カード番号を入力してください',
+    quanixanren: '権限を設定してください',
+    qingxuanzfynfen: 'お手伝いさんに戻る年を選んでください',
+    hetongyxq: '契約有効期間',
+    zhuzhanghxx: '主アカウント情報',
+    qingxzzhuzhxx: '主アカウント情報を選択してください',
+    jiesuanshijian: '決済時間を提出します',
+    chunxuzhong: '継続中です',
+    dakuanzhong: '金をかけます',
+    lianmenght: 'リーグ契約」です',
   },
   //#endregion
 }

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

@@ -8144,6 +8144,18 @@ export const obj = {
     hetongdhbts: '请填写结算天数、合同开始日期、合同结束日期、合同返佣年份',
     xinzenghet: '新增合同',
     bianjihet: '编辑合同',
+    suoshuyinh: '所属银行',
+    qingshuryhmc: '请输入银行名称',
+    qingshurkaih: '请输入卡号',
+    quanixanren: '请设置权限',
+    qingxuanzfynfen: '请选择返佣年份',
+    hetongyxq: '合同有效期',
+    zhuzhanghxx: '主账号信息',
+    qingxzzhuzhxx: '请选择主账号信息',
+    jiesuanshijian: '提交结算时间',
+    chunxuzhong: '存续中',
+    dakuanzhong: '打款中',
+    lianmenght: '联盟合同',
   },
   //#endregion
 }

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

@@ -8133,6 +8133,29 @@ export const obj = {
     qingsrzdrs: '請輸入最大人數',
     chakpakfy: '查看pak返傭信息',
     dangqianfyje: '當前返傭金額',
+    dahongbaoht:　'大紅包合同',
+    hetongshu:　'合同數量',
+    jiesuants:　'結算天數',
+    hetongdjsts:　'合同到期幾天之後可以結算',
+    youxiaoqks:　'有效日期開始',
+    youxiaoqjs:　'有效日期結束',
+    hetongtongguo:　'合同通過',
+    fanyongnianfen:　'返傭年份',
+    hetongdhbts:　'請填寫結算天數、合同開始日期、合同結束日期、合同返傭年份',
+    xinzenghet:　'新增合同',
+    bianjihet:　'編輯合同',
+    suoshuyinh:　'所屬銀行',
+    qingshuryhmc:　'請輸入銀行名稱',
+    qingshurkaih:　'請輸入卡號',
+    quanixanren:　'請設置權限',
+    qingxuanzfynfen:　'請選擇返傭年份',
+    hetongyxq:　'合同有效期',
+    zhuzhanghxx:　'主賬號信息',
+    qingxzzhuzhxx:　'請選擇主賬號信息',
+    jiesuanshijian:　'提交結算時間',
+    chunxuzhong:　'存續中',
+    dakuanzhong:　'打款中',
+    lianmenght:　'聯盟合同',
   },
   //#endregion
 }

src/components/administrative/ElectronicAudit.vue

@@ -351,7 +351,7 @@
                   style="padding:5px;"></el-button>
               </el-tooltip>
 
-              <el-tooltip class="item" effect="dark" content="下载" placement="top-start"
+              <el-tooltip class="item" effect="dark" :content="$t('objFill.xz')" placement="top-start"
                 v-if="item.Status==2||item.Status==4">
                 <el-button type="success" icon="el-icon-download" circle @click="DownLoadContract(item)">
                 </el-button>

src/components/administrative/LianMengManagement.vue

@@ -40,8 +40,8 @@
           </span>
         </li>
         <li>
-          <!-- <input type="button" class="normalBtn" :value="$t('pub.addBtn')"
-            @click="dialogFormVisible = true,addType = 1, iniTAddMsg" /> -->
+          <input type="button" class="normalBtn" :value="$t('pub.addBtn')"
+            @click="dialogFormVisible = true,addType = 1, iniTAddMsg" />
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" />
         </li>
       </ul>
@@ -49,21 +49,24 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>{{$t('hotel.hotel_nameOf')}}</th>
+        <th>{{$t('objFill.v102.hetongshu')}}</th>
         <th>{{$t('objFill.v101.administrative.mendians')}}</th>
         <th>{{$t('objFill.nianfen')}}</th>
-        <th>{{$t('fnc.a_zongjine')}}</th>
-        <th>{{$t('objFill.v101.activity.shoukeshu')}}</th>
+        <!-- <th>{{$t('fnc.a_zongjine')}}</th> -->
+        <!-- <th>{{$t('objFill.v101.activity.shoukeshu')}}</th> -->
         <th>{{$t('system.table_operation')}}</th>
       </tr>
-      <tr v-for="item in dataList">
+      <tr v-for="(item,index) in dataList" :key="index">
          <td>{{item.AllianceName}}</td>
+         <td @click="goContract(item)"
+          style="color:#33B3FF;cursor: pointer;">{{item.ContractNum?item.ContractNum:'-'}}</td>
          <td><span class="cursorpointer text-decoration" @click="goCustomerList(item.ID)">{{item.CustomerCount}}</span></td>
          <td>{{item.StartYear}}-{{item.EndYear}}</td>
-         <td>{{moneyFormat(item.TradeMoney)}}</td>
-         <td><span class="cursorpointer text-decoration" @click="jiesuan(item.ID, 'happyMoneyDetails')" >{{item.TotalGuestNum}}</span></td>
+         <!-- <td>{{moneyFormat(item.TradeMoney)}}</td> -->
+         <!-- <td><span class="cursorpointer text-decoration" @click="jiesuan(item.ID, 'happyMoneyDetails')" >{{item.TotalGuestNum}}</span></td> -->
          <td class="_icon_btn">
             <el-tooltip class="item" effect="dark" :content="$t('salesModule.addCustomer')" placement="top">
-              <i class="edit el-icon-edit"@click="addCustorm(item)"></i>
+              <i class="edit el-icon-edit" @click="addCustorm(item)"></i>
             </el-tooltip>
             <el-tooltip class="item" effect="dark" :content="$t('objFill.jiesuan')" placement="top">
               <i class="edit el-icon-check"  v-if="item.IsClearing == 1" @click="jiesuan(item.ID, 'happyMoney')" ></i>
@@ -80,7 +83,7 @@
             <el-form-item :label="$t('objFill.v101.administrative.lianmemc')" prop="AllianceName" >
               <el-input type="text" v-model="addMsg.AllianceName" class=""></el-input>
             </el-form-item>
-            <el-form-item :label="$t('system.table_begTime')" prop="StartYear">
+            <!-- <el-form-item :label="$t('system.table_begTime')" prop="StartYear">
               <el-date-picker class="h34 "
                 v-model="addMsg.StartYear"
                 @change="EndYearChange"
@@ -97,7 +100,7 @@
                 value-format="yyyy"
                 :range-separator="$t('restaurant.res_To')">
               </el-date-picker>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item :label="$t('visaT.sale')" prop="Contact">
               <el-select  filterable  v-model='addMsg.Contact' class="">
                 <el-option v-for='item in EmployeeList'
@@ -136,7 +139,7 @@
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
     </el-pagination>
-    <div class="noDataNotice" v-if="dataList.length<1">
+    <div class="noDataNotice" v-if="!loading&&dataList.length<1">
       <i class="iconfont icon-kong"></i>
       <p>{{$t("active.ld_noData")}}</p>
     </div>
@@ -205,13 +208,17 @@ export default {
     this.employeeMsg.GroupId = userInfo.RB_Group_id;    //集团ID
     this.getEmployee()
   },
-    mounted() {
-      this.getList();
-      let userInfo = this.getLocalStorage();
-      this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
-      this.getEmployee()
-    },
     methods: {
+      goContract(item){
+        this.$router.push({
+          name: 'AllianceContract',
+          query: {
+            id: item.ID,
+            blank: "y",
+            tab: '联盟合同',
+          }
+        });
+      },
       jiesuan: function (ID, path, t) {
         this.$router.push({
           name: path,

src/router/config.js

@@ -686,6 +686,14 @@ export default {
                 title: '联盟管理'
               },
             },
+            {
+              path: '/AllianceContract', //联盟合同列表
+              name: 'AllianceContract',
+              component: resolve => require(['@/components/administrative/AllianceContract'], resolve),
+              meta: {
+                title: '联盟合同'
+              },
+            },
             {
               path: '/Diplomaticplat', //联盟管理
               name: 'Diplomaticplat',