md

src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue

@@ -73,14 +73,18 @@
       </SearchForm>
 
 
-    <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+    <el-tabs v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
       <el-tab-pane label="全部" name="all" />
       <el-tab-pane label="未确认" name="waitConfirm" />
       <el-tab-pane label="已确认" name="hasConfirm" />
       <el-tab-pane label="确认不出账" name="confirmNotBill" />
       <el-tab-pane label="财务置账单异常" name="billError" />
       <el-tab-pane label="业务置账单异常" name="siteBillError" />
+    </el-tabs>
 
+    <el-tabs v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+      <el-tab-pane label="待合账" name="waitMerge" />
+      <el-tab-pane label="已合账" name="hasMerge" />
     </el-tabs>
 
     <XdTable v-loading="loading"
@@ -107,7 +111,7 @@
             show-summary :summary-method="getSummaries"
            >
 
-      <div slot="toolbar" v-if="settleType==1 || settleType==2">
+      <div slot="toolbar" v-if="actionType==1 || actionType==2">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
                 <el-button
@@ -174,7 +178,7 @@
           </el-row>
       </div>
 
-      <div slot="toolbar" v-if="settleType==3">
+      <div slot="toolbar" v-if="actionType==3">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
                 <el-button
@@ -210,6 +214,43 @@
         </el-row>
       </div>
 
+      <div slot="toolbar"  v-if="actionType==4">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleMergeBill"
+                >合账</el-button>
+              </el-col>
+
+
+              <el-col :span="1.5" v-if="activeTab=='waitMerge'">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="single"
+                  @click="handleSplit"
+                  v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
+                >拆子账单</el-button>
+              </el-col>
+
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisSettleSubBill:export']"
+                >导出</el-button>
+              </el-col>
+          </el-row>
+      </div>
+
 
       <div slot="statInfo" style="font-size: 13px;">
         总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
@@ -441,6 +482,11 @@ export default {
       actionType:null,
       settleType:null,
 
+
+      titleMergeForm:null,
+      openMergeForm:false,
+      selectBillList:[],
+
       storageName:null,
 
       queryStatInfoMap:null,
@@ -682,7 +728,7 @@ export default {
           }
 
         }
-        else if(this.actionType==2){
+        else if(this.actionType==3){
             this.queryParams.blSiteConfirm=null;
             this.queryParams.blConfirm=1;
               if (tab.name == 'all') {
@@ -701,6 +747,18 @@ export default {
                 this.queryParams.blSiteConfirm='3';
               }
         }
+        else if(this.actionType==4){
+            this.queryParams.blConfirm=1;
+            this.queryParams.blSiteConfirm='1';
+            if (tab.name == 'waitMerge') {
+              this.queryParams.mergeStatus='1';
+              // this.queryParams.blSiteConfirm='0';
+            }
+            else if (tab.name == 'hasMerge') {
+              this.queryParams.mergeStatus='2';
+            }
+
+        }
         this.getList();
 		},
 
@@ -849,6 +907,15 @@ export default {
         this.openTraceInfo=true;
     },
 
+    handleMergeBill(){
+      this.titleMergeForm="合并账单";
+      this.openMergeForm=true;
+
+      //   titleMergeForm:null,
+      // openMergeForm:false,
+      // selectBillList:[],
+    },
+
     handleSplit(){
 
     },

src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue

@@ -73,14 +73,18 @@
       </SearchForm>
 
 
-    <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+    <el-tabs v-if="actionType==1 || actionType==2 || actionType==3" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
       <el-tab-pane label="全部" name="all" />
       <el-tab-pane label="未确认" name="waitConfirm" />
       <el-tab-pane label="已确认" name="hasConfirm" />
       <el-tab-pane label="确认不出账" name="confirmNotBill" />
       <el-tab-pane label="财务置账单异常" name="billError" />
       <el-tab-pane label="业务置账单异常" name="siteBillError" />
+    </el-tabs>
 
+    <el-tabs v-if="actionType==4" v-model="activeTab" class="center-tabs" @tab-click="handleClick">
+      <el-tab-pane label="待合账" name="waitMerge" />
+      <el-tab-pane label="已合账" name="hasMerge" />
     </el-tabs>
 
     <XdTable v-loading="loading"
@@ -107,7 +111,7 @@
             show-summary :summary-method="getSummaries"
            >
 
-      <div slot="toolbar" v-if="settleType==1 || settleType==2">
+      <div slot="toolbar" v-if="actionType==1 || actionType==2">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
                 <el-button
@@ -174,7 +178,7 @@
           </el-row>
       </div>
 
-      <div slot="toolbar" v-if="settleType==3">
+      <div slot="toolbar" v-if="actionType==3">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
                 <el-button
@@ -210,6 +214,43 @@
         </el-row>
       </div>
 
+      <div slot="toolbar"  v-if="actionType==4">
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="multiple"
+                  @click="handleMergeBill"
+                >合账</el-button>
+              </el-col>
+
+
+              <el-col :span="1.5" v-if="activeTab=='waitMerge'">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="single"
+                  @click="handleSplit"
+                  v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
+                >拆子账单</el-button>
+              </el-col>
+
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisSettleSubBill:export']"
+                >导出</el-button>
+              </el-col>
+          </el-row>
+      </div>
+
 
       <div slot="statInfo" style="font-size: 13px;">
         总票数:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalNum:0}}</span>,
@@ -441,6 +482,11 @@ export default {
       actionType:null,
       settleType:null,
 
+
+      titleMergeForm:null,
+      openMergeForm:false,
+      selectBillList:[],
+
       storageName:null,
 
       queryStatInfoMap:null,
@@ -682,7 +728,7 @@ export default {
           }
 
         }
-        else if(this.actionType==2){
+        else if(this.actionType==3){
             this.queryParams.blSiteConfirm=null;
             this.queryParams.blConfirm=1;
               if (tab.name == 'all') {
@@ -701,6 +747,18 @@ export default {
                 this.queryParams.blSiteConfirm='3';
               }
         }
+        else if(this.actionType==4){
+            this.queryParams.blConfirm=1;
+            this.queryParams.blSiteConfirm='1';
+            if (tab.name == 'waitMerge') {
+              this.queryParams.mergeStatus='1';
+              // this.queryParams.blSiteConfirm='0';
+            }
+            else if (tab.name == 'hasMerge') {
+              this.queryParams.mergeStatus='2';
+            }
+
+        }
         this.getList();
 		},
 
@@ -849,6 +907,15 @@ export default {
         this.openTraceInfo=true;
     },
 
+    handleMergeBill(){
+      this.titleMergeForm="合并账单";
+      this.openMergeForm=true;
+
+      //   titleMergeForm:null,
+      // openMergeForm:false,
+      // selectBillList:[],
+    },
+
     handleSplit(){
 
     },