From c801fe9fa7aad76a0a2085124e0ea4d11a3f08d1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 1 Jul 2025 11:44:01 +0800
Subject: [PATCH] md

---
 src/views/emis/emisSalesmenRel/emisSalesmenRelForm.vue     | 5 +++--
 src/views/emis/emisTmsCostFeeSplit/index.vue               | 2 +-
 src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue | 7 ++-----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/views/emis/emisSalesmenRel/emisSalesmenRelForm.vue b/src/views/emis/emisSalesmenRel/emisSalesmenRelForm.vue
index d5952cc5..be799023 100644
--- a/src/views/emis/emisSalesmenRel/emisSalesmenRelForm.vue
+++ b/src/views/emis/emisSalesmenRel/emisSalesmenRelForm.vue
@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="业务助理" prop="salesAss">
-              <SalesAssPicker  :placeholder="$t('业务助理')" v-model="form.salesAss"  ></SalesAssPicker>
+              <EmpNamePicker1  :placeholder="$t('业务助理')" v-model="form.salesAss"  ></EmpNamePicker1>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -70,6 +70,7 @@ import { listEmisSalesmenRel, getEmisSalesmenRel, delEmisSalesmenRel, addEmisSal
 import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 import SalesAssPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 import {addDateTimeByDay,dateToStr} from '@/utils/custom'
+import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
 export default {
   name: "emisSalesmenRelForm",
@@ -78,7 +79,7 @@ export default {
         type:[Number,Array]
     }
   },
-  components: { SalemanPicker,SalesAssPicker },
+  components: { SalemanPicker,SalesAssPicker,EmpNamePicker1 },
   dicts: [
   ],
   data() {
diff --git a/src/views/emis/emisTmsCostFeeSplit/index.vue b/src/views/emis/emisTmsCostFeeSplit/index.vue
index 8206ce47..30748619 100644
--- a/src/views/emis/emisTmsCostFeeSplit/index.vue
+++ b/src/views/emis/emisTmsCostFeeSplit/index.vue
@@ -4,7 +4,7 @@
    
       <el-form-item label="运单号" prop="billCode">
         <XdTextareaInput
-          :rows="2"
+          :rows="1"
           v-model="queryParams.billCode"
           :placeholder="$t('运单号')"
           clearable
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index 4778bd3e..4adf6381 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -284,7 +284,6 @@
           </template>
         </el-table-column>
 
-
         <el-table-column :label="$t('总件数')" align="center" prop="parcelQty" min-width="100" />
         <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
         <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
@@ -365,8 +364,9 @@ import { listEmisTmsSiteBatch,
 } from "@/api/emis/emisTmsSiteBatch";
 import { listEmisTmsSiteBatchDtl, delEmisTmsSiteBatchDtl, addEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl";
 import { addEmisTmsSiteBatchLoading, listEmisTmsSiteBatchLoading, updateEmisTmsSiteBatchLoading } from "@/api/emis/emisTmsSiteBatchLoading";
-import { listEmisWaybill } from "@/api/emis/emisWaybill";
+import { getWaybillDetail,listEmisWaybill } from "@/api/emis/emisWaybill";
 import { listSimpleEmisSite } from "@/api/emis/emisSite";
+// import { getWaybillDetail} from "@/api/emis/emisWaybill";
 
 import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
@@ -385,8 +385,6 @@ import EmisTmsSiteBatchSupplierPicker from '@/views/emis/EmisBaseTools/EmisTmsSi
 import EmisTmsSiteBatchNextSitePicker from '@/views/emis/EmisBaseTools/EmisTmsSiteBatchNextSitePicker.vue';
 
 
-
-
 export default {
   name: "BigBatchEditForm",
   props: {
@@ -494,7 +492,6 @@ export default {
           { required: true, message: "包裹数量不能为空", trigger: ["blur","change"] },
         ],
 
-
       },
 
       openBatch: false,