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

src/components/FinancialModule/FinancialDocuments.vue

@@ -395,6 +395,9 @@
                     <button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button>
                     <button class="normalBtn"  @click="method5()">{{$t('visa.v_daochu')}}</button>
                     <button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
+                    <button v-if="active==3 && !hbState && hbShow" class="hollowFixedBtn" @click="HebingSP">合并审批</button>
+                    <button v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">审批</button>
+                    <button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">关闭合并审批</button>
                     <button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>
                     <button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false" v-if="msg.Conditon === 3 && userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
                     <button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
@@ -408,7 +411,7 @@
         <div class="_fnDm_content" v-loading='loading' :style="{minHeight:minHeight+'px'}">
             <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable" style="margin-bottom:30px;">
                 <tr class="_t_head">
-                   <th v-if="checkboxShow || BOSSBtn || BOSSBtn2"><input type="checkbox" v-model="isCkedAll"  @click='checkedAll()'></th>
+                   <th v-if="hbState || checkboxShow || BOSSBtn || BOSSBtn2"><input type="checkbox" v-model="isCkedAll"  @click='checkedAll()'></th>
                    <th width="90">{{$t('system.query_company')}}</th>
                    <th>{{$t('fnc.danhao')}}</th>
                    <th width="90">{{$t('fnc.djleixing')}}</th>
@@ -422,7 +425,7 @@
                    <th>{{$t('system.table_operation')}}</th>
                 </tr>
                 <tr class="_item_list" v-for="(item,index) in DataList">
-                    <td v-if="checkboxShow || BOSSBtn || BOSSBtn2"><input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne"></td>
+                    <td v-if="hbState || checkboxShow || BOSSBtn || BOSSBtn2"><input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne"></td>
                   <td>{{item.BranchName}}</td>
                     <td class="Bill_par">
                         <el-popover
@@ -744,6 +747,12 @@ import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
 export default {
     data(){
         return{
+            hbMsg:{
+                FrIDList:[],
+                Type:1,
+            },
+            hbState:false,
+            hbShow:false,
             HandMsg:{
                 TCNUM:"",
                 ReFinanceId:'',
@@ -887,6 +896,9 @@ export default {
     created(){
         let userinfo = this.getLocalStorage();
         let ActionMenuCode=userinfo.ActionMenuCode;
+        if(ActionMenuCode.indexOf('F_AccountantFinanceMerge')!=-1){
+            this.hbShow=true;
+        }
         if(ActionMenuCode.indexOf('F_HandWithFee')!=-1){
             this.HandShow=true;
         }
@@ -942,6 +954,39 @@ export default {
         this.AccountType_post_GetList();        
     },
     methods:{
+        HebingSPLast(){
+            console.log("fssf",this.checkList)
+            this.$confirm("是否合并审批? 合并审批后不可恢复", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+        })
+            .then(() => {
+                this.hbMsg.FrIDList=this.checkList;
+                this.apipost("Financial_post_SetAccountantFinanceMerge",this.hbMsg,res => {
+                    console.log("res,",res)
+                    if (res.data.resultCode == 1) {
+                        
+                    }
+                    else{
+                        this.Error(res.data.message);
+                    }
+                },err => {});
+            })
+        .catch(() => {});
+           
+
+        },
+        HebingSP(){
+            if(this.msg.Type==1 || this.msg.Type==2){
+                this.hbState=true;
+                this.hbMsg.Type=this.msg.Type;
+                this.getPageList();
+            }else{
+                this.Error("单据类型只能为收入或支出！")
+            }
+            
+        },
         setHand(){
             if(this.HandMsg.TCNUM==''){
                 this.Error("请输入团号!");
@@ -1195,7 +1240,11 @@ export default {
             this.checkList = [];
             if ((t&&this.BOSSBtn)||(t&&this.BOSSBtn2)) {
                 this.msg.pageSize = 1000;
-            } else {
+            }
+            else if(this.hbState){
+                this.msg.pageSize = 30;
+            }
+            else {
                 this.msg.pageSize = 6;
             }
             if(this.msg.Status==0){