md

src/views/emis/emisSettleBill/MergeBillForm.vue

@@ -41,304 +41,68 @@
            show-summary :summary-method="getSummaries"
           >
 
-     <div slot="toolbar" v-if="actionType==1 || actionType==2">
+     <div slot="toolbar" >
        <el-row :gutter="10" class="mb8">
-             <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
+             <el-col :span="1.5"  >
+               <el-button
+                 type="primary"
+                 plain
+                 size="mini"
+                 @click="handleAddBillCode"
+               >追加运单到此账单</el-button>
+             </el-col>
+             <el-col :span="1.5" >
                <el-button
                  type="primary"
                  plain
                  size="mini"
                  :disabled="multiple"
-                 @click="handleConfirmByCenter"
+                 @click="handleRemovceBillCode"
-                 v-hasPermi="['emis:emisSettleSubBill:confirmBillByCenter']"
+               >从账单内删除运单</el-button>
-               >批量确认</el-button>
-             </el-col>
-             <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleConfirmNoBillByCenter"
-                 v-hasPermi="['emis:emisSettleSubBill:confirmNoBillByCenter']"
-               >确认不出账</el-button>
-             </el-col>
-             <el-col :span="1.5" v-if="activeTab=='waitConfirm'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleSetBillErrorByCenter"
-                 v-hasPermi="['emis:emisSettleSubBill:setBillErrorByCenter']"
-               >置账单异常</el-button>
-             </el-col>
-             <el-col :span="1.5" v-if="activeTab!='waitConfirm'">
-               <el-button
-                 type="danger"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleCancelConfirmByCenter"
-                 v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillByCenter']"
-               >取消确认</el-button>
              </el-col>
 
-             <!-- <el-col :span="1.5">
-               <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="toolbar" v-if="actionType==3">
-       <el-row :gutter="10" class="mb8">
-             <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleConfirmBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:confirmBillBySite']"
-               >批量确认</el-button>
-             </el-col>
-             <el-col :span="1.5"  v-if="activeTab=='waitConfirm'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleConfirmNoBillBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:confirmNoBillBySite']"
-               >确认不出账</el-button>
-             </el-col>
-             <el-col :span="1.5" v-if="activeTab=='waitConfirm'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleSetBillErrorBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:setBillErrorBySite']"
-               >置账单异常</el-button>
-             </el-col>
-             <el-col :span="1.5" v-if="activeTab!='waitConfirm'">
-               <el-button
-                 type="danger"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleCancelConfirmBySite"
-                 v-hasPermi="['emis:emisSettleSubBill:cancelConfirmBillBySite']"
-               >取消确认</el-button>
-             </el-col>
-
-       </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'">
-               <div style="display:inline-flex;font-size:13px;font-weight:bold;font-weight: bold;line-height: 30px;">
-                 <span>账单名称:</span>
-                 <el-input
-                   size="mini"
-                   style="width:280px"
-                   v-model="billName"
-                   :placeholder="$t('账单名称')"
-                   clearable
-                 />
-                 <span>账单月:</span>
-                 <el-date-picker  size="mini" style="width:120px" v-model="billMonth" type="month" placeholder="" value-format="yyyy-MM"></el-date-picker>
-               </div>
-             </el-col>
-
-             <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
-               <el-button
-                 type="primary"
-                 plain
-                 size="mini"
-                 :disabled="multiple"
-                 @click="handleMergeBill"
-                 v-hasPermi="['emis:emisSettleBill:add']"
-               >合账</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>,
-       总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span>
+       总费用:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span>
      </div>
 
      <el-table-column type="selection" width="55" align="center" />
-     <el-table-column type="expand">
+     <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="130" />
-       <template slot-scope="scope">
-           <div style="padding: 8px 50px;background: white;">
-
-             <div style="display:inline-flex;padding: 15px 0px;" >
-               <div style="font-weight:500">总费用:<span>{{scope.row.billFee}}</span></div>
-               <div>
-                 <el-button
-                   type="text"
-                   size="mini"
-                   style="padding: 2px 10px;font-size: 13px;border: 1px solid #e1e1e1;"
-                   @click="handleShowTraceInfo(scope.row)"
-                 >运单详情</el-button>
-               </div>
-             </div>
-             <div style="font-weight:500">费用备注:<span>{{scope.row.waybillDetail.feeRemark}}</span></div>
-              <div class="feeItem">
-                 <ul class="th">
-                   <li>费用名称</li>
-                   <li>费用</li>
-                   <!-- <li>币种</li> -->
-                   <li>描述</li>
-                 </ul>
-                 <ul v-for="(item,index) in scope.row.feeitemList" :key="index">
-                   <li style="background: #f4f4f4;font-weight: 600;">{{$t(item.feeName)}}</li>
-                   <li>{{item.billFee}}</li>
-                   <!-- <li>{{item.currency}}</li> -->
-                   <li>{{item.remark}}</li>
-                 </ul>
-
-               </div>
-
-           </div>
-       </template>
-     </el-table-column>
-
-     <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
-     <!-- <el-table-column :label="$t('是否特殊报价')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/> -->
-      <el-table-column :label="$t('是否特殊报价')" align="center" prop="waybillDetail.blSpecialQuote" width="150" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <span v-if="scope.row.waybillDetail.blSpecialQuote==1">是</span>
-            <span v-else>否</span>
-          </template>
-      </el-table-column>
-      <el-table-column :label="$t('计费方式')" align="center" prop="waybillDetail.calcFeeType" width="150" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.emis_calc_fee_type" :value="scope.row.waybillDetail.calcFeeType"/>
-          </template>
-      </el-table-column>
      <el-table-column :label="$t('寄件日期')" align="center" prop="waybillDetail.sendDate" min-width="170" :show-overflow-tooltip="true"/>
-      <!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="200" :show-overflow-tooltip="true">
+     <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
-         <template slot-scope="scope">
-           <span>{{ scope.row.waybillDetail.sendName }}--{{ scope.row.waybillDetail.receiveName }}</span>
-         </template>
-      </el-table-column> -->
-     <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
-     <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/>
-
-     <el-table-column v-if="actionType!=1"  :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
-       <template slot-scope="scope">
-           <span  type="normal">{{ scope.row.custNo }}</span>
-         </template>
-     </el-table-column>
-
-     <el-table-column v-if="actionType!=1"  :label="$t('月结客户')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
        <template slot-scope="scope">
            <span v-if="['2','4','5'].includes(scope.row.waybillDetail.paymentType)" type="normal">{{ scope.row.customerName }}</span>
          </template>
      </el-table-column>
+     <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
+     <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
+     <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
 
-     <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="120" :show-overflow-tooltip="true">
+     <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="150" :show-overflow-tooltip="true"/>
+     <!-- <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="150" :show-overflow-tooltip="true"/> -->
+
+     <!-- <el-table-column  :label="$t('月结编号')" align="center" prop="customerName" min-width="150" :show-overflow-tooltip="true">
        <template slot-scope="scope">
-            <span >{{scope.row.waybillDetail.productTypeName}}({{scope.row.waybillDetail.timeType}})</span>
+           <span  type="normal">{{ scope.row.custNo }}</span>
          </template>
-     </el-table-column>
+     </el-table-column> -->
 
-       <el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
+       <!-- <el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="80" :show-overflow-tooltip="true"/>
-       <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="80" />
+            <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
-       <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" min-width="80" />
        <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
        <el-table-column :label="$t('体积重量')" align="center" prop="waybillDetail.volumeWeight" min-width="80" />
-       <el-table-column :label="$t('结算重量')" align="center" prop="waybillDetail.settlementWeight" min-width="80" />
-       <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="80" />
        <el-table-column :label="$t('费用备注')" align="center" prop="waybillDetail.feeRemark" min-width="80" :show-overflow-tooltip="true"/>
        <el-table-column :label="$t('支付类型')" align="center" prop="waybillDetail.paymentType" min-width="80" :show-overflow-tooltip="true" >
          <template slot-scope="scope">
            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
          </template>
-       </el-table-column>
+       </el-table-column> -->
-       <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
+       <!-- <el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" /> -->
-       <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" />
+       <!-- <el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="100" /> -->
-       <el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" />
+       <!-- <el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="100" /> -->
-
-       <el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
-           <template slot-scope="scope">
-               <el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
-               <span v-else >/</span>
-           </template>
-         </el-table-column>
-       <el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true"/>
-       <el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true"/>
-
-       <el-table-column :label="$t('财务确认状态')" align="center" prop="blConfirmCenter" min-width="120" >
-         <template slot-scope="scope">
-           <span v-if="scope.row.blConfirmCenter=='0'" >未确认</span>
-           <el-tag v-if="scope.row.blConfirmCenter=='1'" type="success">已确认</el-tag>
-           <el-tag v-if="scope.row.blConfirmCenter=='2'" type="error">确认不出账</el-tag>
-           <el-tag v-if="scope.row.blConfirmCenter=='3'" type="error">账单异常</el-tag>
-         </template>
-       </el-table-column>
-       <el-table-column :label="$t('财务确认人')" align="center" prop="confirmCenterManName" min-width="100" />
-       <el-table-column :label="$t('财务确认时间')" align="center" prop="confirmCenterDate" min-width="170" />
-       <el-table-column :label="$t('财务备注')" align="center" prop="confirmCenterNote" min-width="100" />
-
-       <el-table-column :label="$t('业务确认状态')" align="center" prop="blConfirmSite" min-width="120" >
-         <template slot-scope="scope">
-           <span v-if="scope.row.blConfirmSite=='0'" >未确认</span>
-           <el-tag v-if="scope.row.blConfirmSite=='1'" type="success">已确认</el-tag>
-           <el-tag v-if="scope.row.blConfirmSite=='2'" type="error">确认不出账</el-tag>
-           <el-tag v-if="scope.row.blConfirmSite=='3'" type="error">账单异常</el-tag>
-         </template>
-     </el-table-column>
-     <el-table-column :label="$t('业务确认时间')" align="center" prop="confirmSiteDate" min-width="170" />
-     <el-table-column :label="$t('业务确认人')" align="center" prop="confirmSiteManName" min-width="100" />
-     <el-table-column :label="$t('业务备注')" align="center" prop="confirmSiteNote" min-width="100" />
 
 
    </XdTable>
@@ -438,6 +202,7 @@ export default {
           getEmisSettleBill(this.id).then(response => {
             this.form = response.data;
             this.loading = false;
+            this.getSubBillList(this.form.settleBillNo);
           });
         }
         else if(this.settleBillNo){
@@ -445,18 +210,36 @@ export default {
           getEmisSettleBill(this.settleBillNo).then(response => {
             this.form = response.data;
             this.loading = false;
+            this.getSubBillList(this.form.settleBillNo);
           });
         }else{
-          this.$modal.msgError("信息不存在");
+          this.$modal.msgError("账单不存在");
           this.$emit("on-cancel");
         }
     },
+    getSubBillList(settleBillNo) {
+     this.loading = true;
+      let qParam={
+        settleBillNo:settleBillNo
+      }
+     listEmisSettleSubBill(qParam).then(response => {
+       this.emisSettleSubBillList = response.rows;
+       this.total = response.total;
+       this.loading = false;
+     });
+
+     // 查询统计
+    //  getQueryStatInfoMap(qParam).then(response => {
+    //    this.queryStatInfoMap = response.data;
+    //  });
+
+   },
 
 
     initSubBillList() {
      this.loading = true;
 
-  
+
      listEmisSettleSubBill(this.queryParams).then(response => {
        this.emisSettleSubBillList = response.rows;
        this.total = response.total;
@@ -480,7 +263,6 @@ export default {
                return;
              }
 
-
              if (
                column.property === 'waybillDetail.billWeight'
                ) {

src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue

@@ -12,7 +12,7 @@
              v-model="queryParams.billCode"
              :placeholder="$t('多个流水号逗号或换行隔开')"
              clearable
-             :rows="2"
+             :rows="1"
            />
          </el-form-item>
        <el-form-item label="寄件日期" prop="sendDate">
@@ -106,7 +106,7 @@
 
    <el-tabs slot="pageTabs" 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-tab-pane label="已合账" name="hasMerge" /> -->
    </el-tabs>
 
    <XdTable
@@ -279,8 +279,18 @@
                >合账</el-button>
              </el-col>
 
+             <!-- <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
+               <el-button
+                 type="primary"
+                 plain
+                 size="mini"
+                 :disabled="multiple"
+                 @click="handleMergeBill"
+                 v-hasPermi="['emis:emisSettleBill:add']"
+               >自动合账</el-button>
+             </el-col> -->
 
-             <el-col :span="1.5" v-if="activeTab=='waitMerge'">
+             <!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
                <el-button
                  type="primary"
                  plain
@@ -289,7 +299,7 @@
                  @click="handleSplit"
                  v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
                >拆子账单</el-button>
-             </el-col>
+             </el-col> -->
 
              <el-col :span="1.5">
                <el-button
@@ -514,6 +524,7 @@ import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDet
 import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue';
 import { parseTime,genJsSeqNo } from "@/utils/custom";
 
+
 export default {
  name: "SubBillConfirmByMoneyList",
  // name: "SubBillConfirmByMonthList",
@@ -1062,25 +1073,62 @@ export default {
             subBillList:this.selectBillList,
         }
 
+
         // 生成合账单号
         addEmisSettleBill(settleBillForm).then(response => {
               this.$modal.msgSuccess("合并成功");
               this.$emit("on-changed");
-              this.titleMergeForm="合并账单";
+              // this.titleMergeForm="账单-"+this.currentSettleBillNo;
-              this.openMergeForm=true;
+              // this.openMergeForm=true;
         });
 
 
       }).catch(() => {});
-
-    //  this.titleMergeForm="合并账单";
-    //  this.openMergeForm=true;
-
-     //   titleMergeForm:null,
-     // openMergeForm:false,
-     // selectBillList:[],
    },
 
+   handleAutoMergeBill(){
+
+      if(!this.billMonth){
+        this.$message.error("账单月不能为空!");
+        return;
+      }
+
+      this.$confirm("确定自动合账吗?", "提示", {
+            cancelButtonText: "否",
+            confirmButtonText: "确定",
+            type: "warning",
+            distinguishCancelAndClose: true,
+            closeOnClickModal: false
+        }).then(() => {
+
+          this.currentSettleBillNo=genJsSeqNo();
+
+          let startDate =  new Date(this.billMonth+"-01 00:00:00");
+          let endDate= this.getMonthLast(startDate);
+          endDate.setHours(23,59,59,0)
+
+          let settleBillForm={
+              settleBillNo: this.currentSettleBillNo,
+              settleBillName: this.billName,
+              billMonth: this.billMonth,
+              settleStartDate:parseTime(startDate),
+              settleEndDate:parseTime(endDate),
+              subBillList:this.selectBillList,
+          }
+
+
+          // 生成合账单号
+          addEmisSettleBill(settleBillForm).then(response => {
+                this.$modal.msgSuccess("合并成功");
+                this.$emit("on-changed");
+                this.titleMergeForm="账单-"+this.currentSettleBillNo;
+                this.openMergeForm=true;
+          });
+
+
+        }).catch(() => {});
+  },
+
    // 获取当前月的最后一天
   getMonthLast(date) {
         var currentMonth = date.getMonth()

src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue

@@ -12,7 +12,7 @@
              v-model="queryParams.billCode"
              :placeholder="$t('多个流水号逗号或换行隔开')"
              clearable
-             :rows="2"
+             :rows="1"
            />
          </el-form-item>
        <el-form-item label="寄件日期" prop="sendDate">
@@ -106,7 +106,7 @@
 
    <el-tabs slot="pageTabs" 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-tab-pane label="已合账" name="hasMerge" /> -->
    </el-tabs>
 
    <XdTable
@@ -279,8 +279,18 @@
                >合账</el-button>
              </el-col>
 
+             <!-- <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
+               <el-button
+                 type="primary"
+                 plain
+                 size="mini"
+                 :disabled="multiple"
+                 @click="handleMergeBill"
+                 v-hasPermi="['emis:emisSettleBill:add']"
+               >自动合账</el-button>
+             </el-col> -->
 
-             <el-col :span="1.5" v-if="activeTab=='waitMerge'">
+             <!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
                <el-button
                  type="primary"
                  plain
@@ -289,7 +299,7 @@
                  @click="handleSplit"
                  v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
                >拆子账单</el-button>
-             </el-col>
+             </el-col> -->
 
              <el-col :span="1.5">
                <el-button
@@ -1063,25 +1073,62 @@ export default {
             subBillList:this.selectBillList,
         }
 
+
         // 生成合账单号
         addEmisSettleBill(settleBillForm).then(response => {
               this.$modal.msgSuccess("合并成功");
               this.$emit("on-changed");
-              this.titleMergeForm="合并账单";
+              // this.titleMergeForm="账单-"+this.currentSettleBillNo;
-              this.openMergeForm=true;
+              // this.openMergeForm=true;
         });
 
 
       }).catch(() => {});
-
-    //  this.titleMergeForm="合并账单";
-    //  this.openMergeForm=true;
-
-     //   titleMergeForm:null,
-     // openMergeForm:false,
-     // selectBillList:[],
    },
 
+   handleAutoMergeBill(){
+
+      if(!this.billMonth){
+        this.$message.error("账单月不能为空!");
+        return;
+      }
+
+      this.$confirm("确定自动合账吗?", "提示", {
+            cancelButtonText: "否",
+            confirmButtonText: "确定",
+            type: "warning",
+            distinguishCancelAndClose: true,
+            closeOnClickModal: false
+        }).then(() => {
+
+          this.currentSettleBillNo=genJsSeqNo();
+
+          let startDate =  new Date(this.billMonth+"-01 00:00:00");
+          let endDate= this.getMonthLast(startDate);
+          endDate.setHours(23,59,59,0)
+
+          let settleBillForm={
+              settleBillNo: this.currentSettleBillNo,
+              settleBillName: this.billName,
+              billMonth: this.billMonth,
+              settleStartDate:parseTime(startDate),
+              settleEndDate:parseTime(endDate),
+              subBillList:this.selectBillList,
+          }
+
+
+          // 生成合账单号
+          addEmisSettleBill(settleBillForm).then(response => {
+                this.$modal.msgSuccess("合并成功");
+                this.$emit("on-changed");
+                this.titleMergeForm="账单-"+this.currentSettleBillNo;
+                this.openMergeForm=true;
+          });
+
+
+        }).catch(() => {});
+  },
+
    // 获取当前月的最后一天
   getMonthLast(date) {
         var currentMonth = date.getMonth()

src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue

@@ -12,7 +12,7 @@
              v-model="queryParams.billCode"
              :placeholder="$t('多个流水号逗号或换行隔开')"
              clearable
-             :rows="2"
+             :rows="1"
            />
          </el-form-item>
        <el-form-item label="寄件日期" prop="sendDate">
@@ -106,7 +106,7 @@
 
    <el-tabs slot="pageTabs" 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-tab-pane label="已合账" name="hasMerge" /> -->
    </el-tabs>
 
    <XdTable
@@ -279,8 +279,18 @@
                >合账</el-button>
              </el-col>
 
+             <!-- <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
+               <el-button
+                 type="primary"
+                 plain
+                 size="mini"
+                 :disabled="multiple"
+                 @click="handleMergeBill"
+                 v-hasPermi="['emis:emisSettleBill:add']"
+               >自动合账</el-button>
+             </el-col> -->
 
-             <el-col :span="1.5" v-if="activeTab=='waitMerge'">
+             <!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
                <el-button
                  type="primary"
                  plain
@@ -289,7 +299,7 @@
                  @click="handleSplit"
                  v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
                >拆子账单</el-button>
-             </el-col>
+             </el-col> -->
 
              <el-col :span="1.5">
                <el-button
@@ -1063,25 +1073,62 @@ export default {
             subBillList:this.selectBillList,
         }
 
+
         // 生成合账单号
         addEmisSettleBill(settleBillForm).then(response => {
               this.$modal.msgSuccess("合并成功");
               this.$emit("on-changed");
-              this.titleMergeForm="合并账单";
+              // this.titleMergeForm="账单-"+this.currentSettleBillNo;
-              this.openMergeForm=true;
+              // this.openMergeForm=true;
         });
 
 
       }).catch(() => {});
-
-    //  this.titleMergeForm="合并账单";
-    //  this.openMergeForm=true;
-
-     //   titleMergeForm:null,
-     // openMergeForm:false,
-     // selectBillList:[],
    },
 
+   handleAutoMergeBill(){
+
+      if(!this.billMonth){
+        this.$message.error("账单月不能为空!");
+        return;
+      }
+
+      this.$confirm("确定自动合账吗?", "提示", {
+            cancelButtonText: "否",
+            confirmButtonText: "确定",
+            type: "warning",
+            distinguishCancelAndClose: true,
+            closeOnClickModal: false
+        }).then(() => {
+
+          this.currentSettleBillNo=genJsSeqNo();
+
+          let startDate =  new Date(this.billMonth+"-01 00:00:00");
+          let endDate= this.getMonthLast(startDate);
+          endDate.setHours(23,59,59,0)
+
+          let settleBillForm={
+              settleBillNo: this.currentSettleBillNo,
+              settleBillName: this.billName,
+              billMonth: this.billMonth,
+              settleStartDate:parseTime(startDate),
+              settleEndDate:parseTime(endDate),
+              subBillList:this.selectBillList,
+          }
+
+
+          // 生成合账单号
+          addEmisSettleBill(settleBillForm).then(response => {
+                this.$modal.msgSuccess("合并成功");
+                this.$emit("on-changed");
+                this.titleMergeForm="账单-"+this.currentSettleBillNo;
+                this.openMergeForm=true;
+          });
+
+
+        }).catch(() => {});
+  },
+
    // 获取当前月的最后一天
   getMonthLast(date) {
         var currentMonth = date.getMonth()

src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue

@@ -12,7 +12,7 @@
              v-model="queryParams.billCode"
              :placeholder="$t('多个流水号逗号或换行隔开')"
              clearable
-             :rows="2"
+             :rows="1"
            />
          </el-form-item>
        <el-form-item label="寄件日期" prop="sendDate">
@@ -106,7 +106,7 @@
 
    <el-tabs slot="pageTabs" 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-tab-pane label="已合账" name="hasMerge" /> -->
    </el-tabs>
 
    <XdTable
@@ -279,8 +279,18 @@
                >合账</el-button>
              </el-col>
 
+             <!-- <el-col :span="1.5"  v-if="activeTab=='waitMerge'">
+               <el-button
+                 type="primary"
+                 plain
+                 size="mini"
+                 :disabled="multiple"
+                 @click="handleMergeBill"
+                 v-hasPermi="['emis:emisSettleBill:add']"
+               >自动合账</el-button>
+             </el-col> -->
 
-             <el-col :span="1.5" v-if="activeTab=='waitMerge'">
+             <!-- <el-col :span="1.5" v-if="activeTab=='waitMerge'">
                <el-button
                  type="primary"
                  plain
@@ -289,7 +299,7 @@
                  @click="handleSplit"
                  v-hasPermi="['emis:emisSettleSubBill:splitSubBill']"
                >拆子账单</el-button>
-             </el-col>
+             </el-col> -->
 
              <el-col :span="1.5">
                <el-button
@@ -1068,21 +1078,57 @@ export default {
         addEmisSettleBill(settleBillForm).then(response => {
               this.$modal.msgSuccess("合并成功");
               this.$emit("on-changed");
-              this.titleMergeForm="账单-"+this.currentSettleBillNo;
+              // this.titleMergeForm="账单-"+this.currentSettleBillNo;
-              this.openMergeForm=true;
+              // this.openMergeForm=true;
         });
 
 
       }).catch(() => {});
-
-    //  this.titleMergeForm="合并账单";
-    //  this.openMergeForm=true;
-
-     //   titleMergeForm:null,
-     // openMergeForm:false,
-     // selectBillList:[],
    },
 
+   handleAutoMergeBill(){
+
+      if(!this.billMonth){
+        this.$message.error("账单月不能为空!");
+        return;
+      }
+
+      this.$confirm("确定自动合账吗?", "提示", {
+            cancelButtonText: "否",
+            confirmButtonText: "确定",
+            type: "warning",
+            distinguishCancelAndClose: true,
+            closeOnClickModal: false
+        }).then(() => {
+
+          this.currentSettleBillNo=genJsSeqNo();
+
+          let startDate =  new Date(this.billMonth+"-01 00:00:00");
+          let endDate= this.getMonthLast(startDate);
+          endDate.setHours(23,59,59,0)
+
+          let settleBillForm={
+              settleBillNo: this.currentSettleBillNo,
+              settleBillName: this.billName,
+              billMonth: this.billMonth,
+              settleStartDate:parseTime(startDate),
+              settleEndDate:parseTime(endDate),
+              subBillList:this.selectBillList,
+          }
+
+
+          // 生成合账单号
+          addEmisSettleBill(settleBillForm).then(response => {
+                this.$modal.msgSuccess("合并成功");
+                this.$emit("on-changed");
+                this.titleMergeForm="账单-"+this.currentSettleBillNo;
+                this.openMergeForm=true;
+          });
+
+
+        }).catch(() => {});
+  },
+
    // 获取当前月的最后一天
   getMonthLast(date) {
         var currentMonth = date.getMonth()