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

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

@@ -8134,6 +8134,14 @@ export const obj = {
     chakpakfy: '查看PAK返佣信息',
     dangqianfyje: '当前返佣金额',
     dahongbaoht: '大红包合同',
+    hetongshu: '合同数量',
+    jiesuants: '结算天数',
+    hetongdjsts: '合同到期几天之后可以结算',
+    youxiaoqks: '有效日期开始',
+    youxiaoqjs: '有效日期结束',
+    hetongtongguo: '合同通过',
+    fanyongnianfen: '返佣年份',
+    hetongdhbts: '请填写结算天数、合同开始日期、合同结束日期、合同返佣年份',
   },
   //#endregion
 }

src/components/administrative/ElectronicAudit.vue

@@ -238,7 +238,6 @@
                   <el-option :label="$t('fnc.daishen')" :value="1" :key="1"> </el-option>
                   <el-option :label="$t('objFill.shenhetongguo')" :value="2" :key="2"> </el-option>
                   <el-option :label="$t('fnc.bohui')" :value="3" :key="3"> </el-option>
-                  <el-option :label="$t('objFill.v102.dahongbaoht')" :value='4' :key="4"></el-option>
                 </el-select>
               </span>
             </li>
@@ -331,7 +330,7 @@
             <td>
               <el-tooltip class="item" effect="dark" :content="$t('objFill.shenhetongguo')" placement="top-start"
                 v-if="item.Status==1">
-                <el-button type="primary" icon="iconfont icon-shenpi" circle @click="SubmitContract(item,2)">
+                <el-button type="primary" icon="iconfont icon-shenpi" circle @click="item.CType==4?showTongGuo(item,2):SubmitContract(item,2)">
                 </el-button>
               </el-tooltip>
               <el-tooltip class="item" effect="dark" :content="$t('fnc.bohui')" placement="top-start"
@@ -366,16 +365,64 @@
       </div>
     </template>
 
-    <el-dialog custom-class='w500' :title="$t('objFill.v101.administrative.hetongbohui')" 
+    <el-dialog custom-class='w500' :title="hetongTitle" 
     :visible.sync="isShowContract"
       center :before-close="closeContractDialog">
       <table class="layerTable" border="0" cellspacing="0" cellpadding="0">
-        <tr>
+        <tr v-if="isBoHui==1">
           <td width="80" align="right">{{$t('objFill.bohuiyy')}}：</td>
           <td>
             <el-input type='textarea' v-model='auditMsg.AuditContractReason' maxlength='100'></el-input>
           </td>
         </tr>
+        <template v-else>
+          <tr>
+            <td width="100" align="right">{{$t('objFill.v102.jiesuants')}}：</td>
+            <td>
+              <el-input v-model="BoHuiObj.C_DayNum" :placeholder="$t('objFill.v102.hetongdjsts')"></el-input>
+            </td>
+          </tr>
+          <tr>
+            <td width="100" align="right">{{$t('objFill.v102.youxiaoqks')}}：</td>
+            <td>
+              <el-date-picker v-model="BoHuiObj.C_StartDate" style="width: 100%;"
+              format="yyyy-MM-dd" type="date"
+                  :picker-options="pickerBeginDateBefore3" :clearable="false">
+                </el-date-picker>
+            </td>
+          </tr>
+          <tr>
+            <td width="100" align="right">{{$t('objFill.v102.youxiaoqjs')}}：</td>
+            <td>
+              <el-date-picker v-model="BoHuiObj.C_EndDate" style="width: 100%;" 
+                  format="yyyy-MM-dd" type="date"
+                  :picker-options="pickerBeginDateBefore3" :clearable="false">
+                </el-date-picker>
+            </td>
+          </tr>
+          <tr>
+            <td width="100" align="right">{{$t('objFill.v102.fanyongnianfen')}}：</td>
+            <td>
+              <el-select
+                v-model="BoHuiObj.C_NightNum"
+                placeholder="Select"
+                size="large"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in NightNumList"
+                  :key="item.Year"
+                  :label="item.Year"
+                  :value="item.Year"
+                />
+              </el-select>
+              <!-- <el-date-picker v-model="BoHuiObj.C_NightNum" style="width: 100%;"
+                  format="yyyy-MM-dd" type="date" :clearable="false">
+                </el-date-picker> -->
+            </td>
+          </tr>
+        </template>
+        
       </table>
       <div slot="footer" class="dialog-footer">
         <button class="hollowFixedBtn" @click="closeContractDialog">{{$t('pub.cancelBtn')}}</button> &nbsp;
@@ -461,17 +508,49 @@
             return startTime.getTime() >= time.getTime();
           }
         },
+        pickerBeginDateBefore3: {
+          disabledDate: time => {
+            if (this.BoHuiObj.C_EndDate == null) {
+              return false;
+            } else {
+              let endTime = new Date(this.BoHuiObj.C_EndDate);
+              return endTime.getTime() < time.getTime();
+            }
+          }
+        },
+        pickerBeginDateAfter3: {
+          disabledDate: time => {
+            let startTime = new Date(this.BoHuiObj.C_StartDate);
+            return startTime.getTime() >= time.getTime();
+          }
+        },
         isShowContract: false,
         auditMsg: {
           Id: 0, //合同编号
           AuditContract: 0, //审核状态
           AuditContractReason: "", //审核原因
         },
-        BoHuiObj: null,
+        BoHuiObj: {
+          C_DayNum: '',
+          C_StartDate: '',
+          C_EndDate: '',
+          C_NightNum: '',
+        },
         isBoHui: 0, //是否是单项、一日游、境内旅游合同驳回
+        NightNumList: [],
+        hetongTitle: '',
       };
     },
     methods: {
+      getYearList(){
+        this.apipost('customer_post_GetCustomerCommissionRatioYearList',{},
+        res=>{
+          if(res.data.resultCode===1){
+              this.NightNumList = res.data.data.YearList;
+            }
+          }
+        )
+      },
       //下载合同
       DownLoadContract(item) {
         let msg = {
@@ -519,7 +598,12 @@
       },
       //关闭合同弹窗
       closeContractDialog() {
-        this.BoHuiObj = null
+        this.BoHuiObj = {
+          C_DayNum: '',
+          C_StartDate: '',
+          C_EndDate: '',
+          C_NightNum: '',
+        }
         this.isBoHui = 0;
         this.auditMsg.Id = 0;
         this.auditMsg.AuditContract = 0;
@@ -592,14 +676,28 @@
       },
       // 单项、一日游、境内旅游合同 驳回原因
       showBoHui(item, status) {
+        this.hetongTitle = `${this.$t('objFill.v101.administrative.hetongbohui')}`
         this.BoHuiObj = JSON.parse(JSON.stringify(item));
         this.auditMsg.AuditContract = status;
         this.isShowContract = true
         this.isBoHui = 1;
       },
+      showTongGuo(item, status) {
+        this.hetongTitle = `${this.$t('objFill.v102.hetongtongguo')}`
+        this.BoHuiObj = JSON.parse(JSON.stringify(item));
+        this.auditMsg.AuditContract = status;
+        this.isShowContract = true 
+        this.isBoHui = 2
+      },
       //提交并盖章
       SubmitContract(item, status) {
         var that = this;
+        if(status==2){
+          if(item.C_DayNum==''||item.C_StartDate==''||item.C_EndDate==''||item.C_NightNum==''){
+            this.Error(this.$t('objFill.v102.hetongdhbts'));
+            return;
+          }
+        }
         var message = this.$t('objFill.shenhetongguo');
         if (status == 3) {
           message = this.$t('fnc.bohui');
@@ -615,9 +713,10 @@
               ID: item.ID,
               Status: status,
               AuditContractReason: status==3?this.auditMsg.AuditContractReason:'',
-              C_DayNum: status!=3?item.C_DayNum:'',
-              C_StartDate: status!=3?item.StartDateStr:'',
-              C_EndDate: status!=3?item.EndDateStr:'',
+              C_DayNum: item.C_DayNum,
+              C_StartDate: item.StartDateStr,
+              C_EndDate: item.EndDateStr,
+              C_NightNum: item.C_NightNum,
             }, res => {
               if (res.data.resultCode == 1) {
                   that.Success(res.data.message);
@@ -715,6 +814,7 @@
     },
     mounted() {
       this.getOtherList();
+      this.getYearList()
     }
   };