From 038688e4b704a4dea2a99efed710b31d0b3efad1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 7 May 2025 16:04:58 +0800
Subject: [PATCH] md

---
 .../emisQuotePrice/transQuotePriceList.vue    | 29 ++++++++++++++++---
 .../emisWarehouseInBatch/WsInBatchList.vue    |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/emis/emisQuotePrice/transQuotePriceList.vue b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
index 0eaabce6..640058fd 100644
--- a/src/views/emis/emisQuotePrice/transQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
@@ -130,7 +130,7 @@
           </el-col>
           <!-- <el-col :span="1.5">
             <el-button
-              type="success"
+              type="danger"
               plain
               icon="el-icon-edit"
               size="mini"
@@ -254,6 +254,10 @@
       <emisQuotePriceForm :key="resetRefreshId" :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisQuotePriceForm>
     </el-dialog>
 
+    <el-dialog :title="titleBatchForm" :visible.sync="openBatchUpdateForm" width="50%" :destroy-on-close="true" :close-on-click-modal="false" v-dialogDrag append-to-body>
+      <BatchQuotePriceUpdateForm :ids="ids"  @on-changed="handleBatchFormChanged" @on-cancel="cancelBatchForm"></BatchQuotePriceUpdateForm>
+    </el-dialog>
+
   </XdPageContainer>
 </template>
 
@@ -269,15 +273,17 @@ import EmisSiteSimplePicker0 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
 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 BatchQuotePriceUpdateForm from '@/views/emis/emisQuotePrice/batchQuotePriceUpdateForm.vue';
+
+
 export default {
   name: "TransQuotePriceList",
   components: { elDateSimplePicker,emisQuotePriceForm,CountryPicker,
   EmisSiteSimplePicker0,EmisSiteSimplePicker1,EmisSiteSimplePicker2,
-  TransLinePicker,TransProductPicker
+  TransLinePicker,TransProductPicker,BatchQuotePriceUpdateForm
   },
   dicts: [
     'sys_normal_disable','emis_create_area_type','emis_fee_type','emis_price_type'
@@ -311,6 +317,9 @@ export default {
 
       chargeType:null,
 
+      openBatchUpdateForm:false,
+      titleBatchForm: "",
+
       openForm: false,
       titleForm: "",
       isCopy: false,
@@ -435,7 +444,19 @@ export default {
       this.isCopy = false;
       this.titleForm = "新增干线运输费";
     },
-
+    /** 修改按钮操作 */
+    handleBatchUpdate(row) {
+        // this.currentId= row.id;
+        this.openBatchUpdateForm = true;
+        this.titleBatchForm = "批量修改";
+    },
+    handleBatchFormChanged(){
+        this.openBatchUpdateForm = false;
+        this.getList();
+    },
+    cancelBatchForm(){
+      this.openBatchUpdateForm = false;
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.resetRefreshId="vipquote-"+this.getUUID();
diff --git a/src/views/emis/emisWarehouseInBatch/WsInBatchList.vue b/src/views/emis/emisWarehouseInBatch/WsInBatchList.vue
index d64d2f05..b2a5912c 100644
--- a/src/views/emis/emisWarehouseInBatch/WsInBatchList.vue
+++ b/src/views/emis/emisWarehouseInBatch/WsInBatchList.vue
@@ -7,7 +7,7 @@
       <!-- <el-scrollbar style="height: 100%"> -->
         <!-- 如果显示子单勾选则循环显示子单 -->
         <div v-for="(item,index) in emisWarehouseInBatchList" :key="resetRefreshId+'.'+index">
-          <CardWithHeader :header="'入仓时间:'+item.entryDate + '          操作员:' + item.createByName" >
+          <CardWithHeader :header="'入仓时间:'+item.entryDate + '          操作员:' + item.createByName+' 进仓子单号:'+item.inNo+'-'+item.inBatchNo" >
               <template v-slot:body>
                 <div>
                         <el-row :gutter="0" style="display: flex;flex-wrap: wrap;margin-top: 8px;margin-bottom:8px;color:black;font-weight:bold">