From cd8b8afd6e68285e4c663575d9f900e77f36c1c1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 10 Jun 2025 07:49:05 +0800
Subject: [PATCH] md

---
 src/api/emis/emisTransPlanRule.js             |   9 +
 src/components/XdTable/index.vue              |   2 +-
 .../emis/EmisBaseTools/EmisSupplierPicker.vue |   2 +-
 .../emisTransPlanRuleForm.vue                 |  77 ++--
 src/views/emis/emisTransPlanRule/index.vue    | 357 ++++++++----------
 .../emis/emisWaybill/sendWaybillList.vue      |   1 +
 6 files changed, 215 insertions(+), 233 deletions(-)

diff --git a/src/api/emis/emisTransPlanRule.js b/src/api/emis/emisTransPlanRule.js
index 2b1f2377..a9ee2cad 100644
--- a/src/api/emis/emisTransPlanRule.js
+++ b/src/api/emis/emisTransPlanRule.js
@@ -17,6 +17,15 @@ export function getEmisTransPlanRule(id) {
   })
 }
 
+// 草稿下单
+export function draftSubmitRule(data) {
+  return request({
+    url: '/emis/emisTransPlanRule/draftSubmitRule',
+    method: 'post',
+    data: data
+  })
+}
+
 // 新增供应商线路规划表
 export function addEmisTransPlanRule(data) {
   return request({
diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index 10c99ba7..470a8afa 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -223,7 +223,7 @@ export default {
     },
     showStatInfo: {
       type: Boolean,
-      default: true,
+      default: false,
     },
     canHideColumns: {
       type: Boolean,
diff --git a/src/views/emis/EmisBaseTools/EmisSupplierPicker.vue b/src/views/emis/EmisBaseTools/EmisSupplierPicker.vue
index 03e54c09..264259a7 100644
--- a/src/views/emis/EmisBaseTools/EmisSupplierPicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisSupplierPicker.vue
@@ -100,7 +100,7 @@
         this.optionItems=[];
         let queryParams = {
           pageNum:1,
-          pageSize:2,
+          pageSize:5,
           code:key,
           name:val
         };
diff --git a/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue b/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue
index 583e7db8..ff3a0c26 100644
--- a/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue
+++ b/src/views/emis/emisTransPlanRule/emisTransPlanRuleForm.vue
@@ -2,34 +2,38 @@
   <div >
        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-          <el-col :span="24">
-            <el-form-item label="线路编码" prop="lineCode">
-              <el-input v-model="form.lineCode" placeholder="请输入线路编码" />
+          <el-col :span="12">
+            <el-form-item label="线路" prop="lineCode">
+                <TransLinePicker v-model="form.lineCode"  isInitiated="true" ></TransLinePicker>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="产品类型" prop="productType">
-              <el-input v-model="form.productType" placeholder="请输入产品类型" />
+               <TransProductMultiplePicker placeholder="产品类型" v-model="form.productType" :transLineCode="form.lineCode"></TransProductMultiplePicker>
+                <!-- <TransProductPicker placeholder="产品类型" v-model="form.productType" :transLineCode="form.lineCode" ></TransProductPicker> -->
             </el-form-item>
           </el-col>
           <el-col :span="24">
+            <el-form-item label="供应商" prop="supplierCode">
+                <EmisSupplierPicker :placeholder="$t('请选择')"  v-model="form.supplierCode"  ></EmisSupplierPicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="起始网点" prop="startSiteCode">
-              <el-input v-model="form.startSiteCode" placeholder="请输入起始网点" />
+                <EmisSiteSimplePicker1  v-model="form.startSiteCode"  ></EmisSiteSimplePicker1>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="节点负责人" prop="manager">
-              <el-input v-model="form.manager" placeholder="请输入节点负责人" />
+           <el-col :span="12">
+            <el-form-item label="下一网点" prop="nextSiteCode">
+              <EmisSiteSimplePicker2  v-model="form.nextSiteCode"  ></EmisSiteSimplePicker2>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="供应商编码" prop="supplierCode">
-              <el-input v-model="form.supplierCode" placeholder="请输入供应商编码" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
+
+        <el-col :span="12">
             <el-form-item label="生效时间" prop="startDate">
-              <el-date-picker clearable
+              <el-date-picker
+                style="width:100%"
+                clearable
                 v-model="form.startDate"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -37,9 +41,11 @@
               </el-date-picker>
             </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
             <el-form-item label="失效时间" prop="endDate">
-              <el-date-picker clearable
+              <el-date-picker
+                style="width:100%"
+                clearable
                 v-model="form.endDate"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -47,9 +53,14 @@
               </el-date-picker>
             </el-form-item>
         </el-col>
+        <el-col :span="24">
+            <el-form-item label="负责人" prop="manager" >
+                <EmpNamePicker :placeholder="$t('节点负责人')" v-model="form.manager"  ></EmpNamePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
+              <el-input type="textarea" rows="2" v-model="form.remark" placeholder="请输入备注" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -58,13 +69,25 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    
+
   </div>
 </template>
 
 <script>
 import { listEmisTransPlanRule, getEmisTransPlanRule, delEmisTransPlanRule, addEmisTransPlanRule, updateEmisTransPlanRule } from "@/api/emis/emisTransPlanRule";
 
+import emisTransPlanRuleForm from '@/views/emis/emisTransPlanRule/emisTransPlanRuleForm';
+import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
+
+import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+
+import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+import TransProductMultiplePicker from '@/views/emis/EmisBaseTools/TransProductMultiplePicker.vue';
+
+import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+
 export default {
   name: "emisTransPlanRuleForm",
   props:{
@@ -72,7 +95,16 @@ export default {
         type:Number
     }
   },
-  components: {  },
+  components: {
+    emisTransPlanRuleForm,
+    EmisSupplierPicker,
+    EmisSiteSimplePicker1,
+    EmisSiteSimplePicker2,
+    TransLinePicker,
+    TransProductPicker,
+    TransProductMultiplePicker,
+    EmpNamePicker
+  },
   dicts: [
   ],
   data() {
@@ -108,7 +140,7 @@ export default {
 
   methods: {
     initData() {
-       
+
         if(this.id !=null) {
           this.loading = true;
           getEmisTransPlanRule(this.id).then(response => {
@@ -118,7 +150,6 @@ export default {
         }else{
             this.reset();
         }
-        // this.getTreeselect();
     },
     // 取消按钮
     cancel() {
diff --git a/src/views/emis/emisTransPlanRule/index.vue b/src/views/emis/emisTransPlanRule/index.vue
index aad6ae6a..0b8ad018 100644
--- a/src/views/emis/emisTransPlanRule/index.vue
+++ b/src/views/emis/emisTransPlanRule/index.vue
@@ -1,85 +1,62 @@
 <template>
-  <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-   
-      <el-form-item label="" prop="lineCode">
-        <el-input
-          v-model="queryParams.lineCode"
-          :placeholder="$t('线路编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+  <XdPageContainer class="app-container">
+    <SearchForm  slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="30"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+
+      <el-form-item label="线路" prop="lineCode">
+          <TransLinePicker v-model="queryParams.lineCode"  isInitiated="true" ></TransLinePicker>
       </el-form-item>
-      <el-form-item label="" prop="productType">
-        <el-input
-          v-model="queryParams.productType"
-          :placeholder="$t('产品类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="产品类型" prop="productType">
+          <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.lineCode" ></TransProductPicker>
       </el-form-item>
-      <el-form-item label="" prop="startSiteCode">
-        <el-input
-          v-model="queryParams.startSiteCode"
-          :placeholder="$t('起始网点')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="起始网点" prop="startSiteCode">
+           <EmisSiteSimplePicker1  v-model="queryParams.startSiteCode"  ></EmisSiteSimplePicker1>
       </el-form-item>
-      <el-form-item label="" prop="manager">
-        <el-input
-          v-model="queryParams.manager"
-          :placeholder="$t('节点负责人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="下一网点" prop="nextSiteCode">
+            <EmisSiteSimplePicker1  v-model="queryParams.nextSiteCode"  ></EmisSiteSimplePicker1>
       </el-form-item>
-      <el-form-item label="" prop="supplierCode">
-        <el-input
-          v-model="queryParams.supplierCode"
-          :placeholder="$t('供应商编码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+       <el-form-item label="供应商" prop="supplierCode">
+        <EmisSupplierPicker :placeholder="$t('请选择')"  v-model="queryParams.supplierCode"  ></EmisSupplierPicker>
       </el-form-item>
-      <el-form-item label="" prop="startDate">
+      <el-form-item label="节点负责人" prop="manager" label-width="100px">
+        <EmpNamePicker :placeholder="$t('节点负责人')" v-model="queryParams.manager"  ></EmpNamePicker>
+      </el-form-item>
+      <!-- <el-form-item label="生效时间" prop="startDate">
         <el-date-picker clearable
           v-model="queryParams.startDate"
           type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd"
           :placeholder="$t('生效时间')">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="endDate">
+      <el-form-item label="失效时间" prop="endDate">
         <el-date-picker clearable
           v-model="queryParams.endDate"
           type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd"
           :placeholder="$t('失效时间')">
         </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          :placeholder="$t('备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+      </el-form-item> -->
+
     </SearchForm>
 
-   
-    <XdTable v-loading="loading" 
-           border stripe
-           size="small"
+
+    <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
+
+          ref="refTable"
+
+          storageName="emisTransPlanRuleList_main_240706"
+
+          size="mini"
+
+           border
+           stripe
+
            :data="emisTransPlanRuleList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
@@ -88,7 +65,7 @@
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
            >
-      
+
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
@@ -99,9 +76,10 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['emis:emisTransPlanRule:add']"
-                >新增</el-button>
+                >新增规则</el-button>
               </el-col>
-              <!-- 
+
+
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -111,8 +89,8 @@
                   :disabled="single"
                   @click="handleUpdate"
                   v-hasPermi="['emis:emisTransPlanRule:edit']"
-                >修改</el-button>
-              </el-col> -->
+                >修改规则</el-button>
+              </el-col>
               <el-col :span="1.5">
                 <el-button
                   type="danger"
@@ -124,7 +102,7 @@
                   v-hasPermi="['emis:emisTransPlanRule:remove']"
                 >删除</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
@@ -133,101 +111,74 @@
                   @click="handleExport"
                   v-hasPermi="['emis:emisTransPlanRule:export']"
                 >导出</el-button>
+              </el-col>
+                <!-- <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleBatchAdd"
+                  v-hasPermi="['emis:emisTransPlanRule:add']"
+                >批量导入</el-button>
               </el-col> -->
           </el-row>
       </div>
-      
+
       <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-       
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
-
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
-      -->
-
-      <el-table-column :label="$t('线路编码')" align="center" prop="lineCode" min-width="100" />
-      <el-table-column :label="$t('产品类型')" align="center" prop="productType" min-width="100" />
-      <el-table-column :label="$t('起始网点')" align="center" prop="startSiteCode" min-width="100" />
+      <el-table-column :label="$t('线路名称')" align="center" prop="lineName" min-width="120" />
+      <el-table-column :label="$t('产品名称')" align="center" prop="productTypeName" min-width="120" />
+      <el-table-column :label="$t('起始网点')" align="center" prop="startSiteName" min-width="100" />
+      <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
       <el-table-column :label="$t('节点负责人')" align="center" prop="manager" min-width="100" />
-      <el-table-column :label="$t('供应商编码')" align="center" prop="supplierCode" min-width="100" />
+      <el-table-column :label="$t('供应商')" align="center" prop="supplierName" min-width="180" />
       <el-table-column :label="$t('生效时间')" align="center" prop="startDate" min-width="100" />
       <el-table-column :label="$t('失效时间')" align="center" prop="endDate" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisTransPlanRule:edit']"
-          >修改</el-button>
-          <!-- 
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['emis:emisTransPlanRule:remove']"
-          >删除</el-button> -->
-        </template>
-      </el-table-column>
+
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" v-dialogDrag append-to-body>
       <emisTransPlanRuleForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisTransPlanRuleForm>
     </el-dialog>
-    
 
-    <!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
-        <emisTransPlanRuleView :id="id" ></EmisTransPlanRuleView>
-    </el-dialog>
-    -->
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
 import { listEmisTransPlanRule, getEmisTransPlanRule, delEmisTransPlanRule, addEmisTransPlanRule, updateEmisTransPlanRule } from "@/api/emis/emisTransPlanRule";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-// import emisTransPlanRuleView from '@/views/emis/emisTransPlanRule/emisTransPlanRuleView';
+
 import emisTransPlanRuleForm from '@/views/emis/emisTransPlanRule/emisTransPlanRuleForm';
+import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
+
+import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+
+import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+
+import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+
 
 export default {
   name: "emisTransPlanRule",
-  components: { elDateSimplePicker,emisTransPlanRuleForm },
+  components: {
+    elDateSimplePicker,
+    emisTransPlanRuleForm,
+    EmisSupplierPicker,
+    EmisSiteSimplePicker1,
+    EmisSiteSimplePicker2,
+    TransLinePicker,
+    TransProductPicker,
+    EmpNamePicker
+   },
   dicts: [
   ],
   data() {
@@ -248,7 +199,8 @@ export default {
       total: 0,
       // 供应商线路规划表表格数据
       emisTransPlanRuleList: [],
-    
+      selectList:null,
+
       currentId:null,
       openForm: false,
       titleForm: "",
@@ -257,14 +209,6 @@ export default {
       id:null,
       titleView:"",
       openView: false,
-      // 更新站点时间范围
-      daterangeStartDate: [],
-      // 更新站点时间范围
-      daterangeEndDate: [],
-      // 更新站点时间范围
-      daterangeCreateTime: [],
-      // 更新站点时间范围
-      daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -272,12 +216,18 @@ export default {
         lineCode: null,
         productType: null,
         startSiteCode: null,
+        nextSiteCode: null,
         manager: null,
         supplierCode: null,
         startDate: null,
         endDate: null,
         remark: null,
-        delFlag: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        createSite: null,
+        updateSite: null
       },
     };
   },
@@ -288,30 +238,13 @@ export default {
     /** 查询供应商线路规划表列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeStartDate && '' != this.daterangeStartDate) {
-        this.queryParams.params["beginStartDate"] = this.daterangeStartDate[0];
-        this.queryParams.params["endStartDate"] = this.daterangeStartDate[1];
-      }
-      if (null != this.daterangeEndDate && '' != this.daterangeEndDate) {
-        this.queryParams.params["beginEndDate"] = this.daterangeEndDate[0];
-        this.queryParams.params["endEndDate"] = this.daterangeEndDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
       listEmisTransPlanRule(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisTransPlanRuleList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -327,6 +260,7 @@ export default {
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
+      this.selectList = selection
     },
     // 排序 查询字段是表格中字段名字 动态取值排序顺序
     handleSortChange(column) {
@@ -338,16 +272,16 @@ export default {
     handleAdd(row) {
       this.currentId=null;
       this.openForm= true;
-      this.titleForm = "新增";
+      this.titleForm = "新增规则";
     },
     handleShowMoreInput(){
       this.moreInputVisible = !this.moreInputVisible;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-       this.currentId= row.id;
+       this.currentId= row.id||this.ids[0];
        this.openForm = true;
-       this.titleForm = "修改";
+       this.titleForm = "修改规则";
     },
     handleView(row) {
        this.id=row.id;
@@ -372,53 +306,60 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-    //   this.download('emis/emisTransPlanRule/export', {
-    //     ...this.queryParams
-    //   }, `emisTransPlanRule_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
-            text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
 
-       listEmisTransPlanRule(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
-        this.downloadLoading = false
-        if (response.code === 200) {
-                const curList = response.rows
-                import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','线路编码','产品类型','起始网点','下一网点','节点负责人','供应商编码','生效时间','失效时间','备注','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建站点','更新站点',];
-                  const filterVal = ['id','lineCode','productType','startSiteCode','nextSiteCode','manager','supplierCode','startDate','endDate','remark','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                  const data = this.formatJson(filterVal, curList, response.rows)
-                  excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: '供应商线路规划表',
-                    autoWidth: true
-                  })
-                  loadingInstance.close()
-                })
-        }
-      });
+     /** 导出按钮操作 */
+     handleExport() {
+      const loadingInstance = this.$loading({
+            text: '正在导出...'
+      })
+
+      if(this.selectList&&this.selectList.length>0){
+        this.exportData(this.selectList,loadingInstance);
+      }
+      else{
+
+          this.initQueryParams();
+
+          let qExportParam={...this.queryParams};
+          qExportParam=this.addDateRange(qExportParam, this.dateTimeRange,'createTime')
+          qExportParam.pageNum=1;
+          qExportParam.pageSize=20000;
+
+          listEmisSettleBill(qExportParam).then(response => {
+            if (response.code === 200) {
+              this.exportData(response.rows,loadingInstance);
+            }
+          });
+      }
+    },
+    exportData(selData,loadingInstance){
+      const curList =selData
+      import('@/vendor/Export2Excel').then(excel => {
+        const exportParam=this.$refs.refTable.getExportParam();
+        const tHeader = exportParam.header;
+        const filterVal = exportParam.filter;
+        const data = this.formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '批次规则列表',
+          autoWidth: true
+        })
+        loadingInstance.close()
+      })
     },
     formatJson(filterVal, jsonData, resData) {
       let index = 0
       return jsonData.map(v => filterVal.map(j => {
+
         if (j === 'index') {
           return ++index
         }
-        if (j === 'status') {
-          var statusStr='xxx'
-          if(v[j] == 10){
-              statusStr='xxx'
-          }
-          return statusStr;
-        }
+
         return v[j]
       }))
     },
+
     /** 列索引函数  */
     getIndex($index) {
           return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index ad949d79..9b932690 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -277,6 +277,7 @@
           row-key="id"
 
           storageName="sendWaybillList_main_240702"
+          :showStatInfo="true"
 
            v-loading="loading"
            border