From 98874d947af6e4212b984797c5de12d3934e06ff Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 12 Jun 2025 15:11:02 +0800
Subject: [PATCH] md

---
 .../emis/emisSettleSubBill/subBillMergeMgnt.vue   | 15 ++++++++-------
 src/views/emis/emisTmsSiteBatchMiss/index.vue     | 10 +++++++---
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
index 75bbaa6c..091c5c4d 100644
--- a/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
+++ b/src/views/emis/emisSettleSubBill/subBillMergeMgnt.vue
@@ -153,7 +153,7 @@
                  :disabled="multiple"
                  @click="handleBatchGenBill"
                  v-hasPermi="['emis:emisSettleBill:add']"
-               >批量生成</el-button>
+               >批量生成现金账单</el-button>
              </el-col>
 
              <el-col :span="1.5" >
@@ -910,17 +910,19 @@ export default {
 
    // 批量生成
    handleBatchGenBill(){
-    if(!this.billMonth){
-      this.$modal.msgError("账单月不能为空!");
-      return;
-    }
+    // if(!this.billMonth){
+    //   this.$modal.msgError("账单月不能为空!");
+    //   return;
+    // }
 
     if(!this.selectBillList){
       this.$modal.msgError("请先选择单号 !");
       return
     }
 
-    this.$confirm("确定批量生成吗?", "提示", {
+    // 检查单号是否包含月结账单
+
+    this.$confirm("注意:现金账单账期是根据寄件日期月生成，确定批量生成吗?", "提示", {
           cancelButtonText: "否",
           confirmButtonText: "确定",
           type: "warning",
@@ -928,7 +930,6 @@ export default {
           closeOnClickModal: false
       }).then(async () => {
 
-
         let startDate =  new Date(this.billMonth+"-01 00:00:00");
         let endDate= this.getMonthLast(startDate);
         endDate.setHours(23,59,59,0)
diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue
index 265322cd..14580a59 100644
--- a/src/views/emis/emisTmsSiteBatchMiss/index.vue
+++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue
@@ -84,7 +84,7 @@
            ref="refTable"
            row-key="id"
 
-           storageName="emisTmsSiteBatchMissList_main_240702"
+           storageName="emisTmsSiteBatchMissList_main_240703"
 
            size="small"
            :data="emisTmsSiteBatchMissList"
@@ -114,8 +114,12 @@
       <el-table-column :label="$t('运单号')" align="left" prop="billCode" min-width="170" />
       <el-table-column :label="$t('漏组批次原因')" align="left" prop="missReason" min-width="200" :show-overflow-tooltip="true"/>
 
-      <el-table-column :label="$t('起始节点')" align="left" prop="sendSiteName" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('下一节点')" align="left" prop="destinationName" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('起始节点')" align="left" prop="startSiteName" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('下一节点')" align="left" prop="nextSiteName" min-width="100" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('寄件网点')" align="left" prop="sendSiteName" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('目的网点')" align="left" prop="destinationName" min-width="100" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('线路')" align="left" prop="transLineTypeName" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('产品类型')" align="left" prop="productTypeName" min-width="100" :show-overflow-tooltip="true"/>