From c1835d4d210eddac786eb800fec8707966105cda Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Mon, 1 Dec 2025 14:00:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B4=A7=E7=89=A9=E7=BB=84=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E8=BF=90=E8=BE=93=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panel/BigBatchListPanel.vue                 | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
index 6f415d47..6f5c8a80 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
@@ -8,6 +8,7 @@
               <el-radio-group class="query-label" v-model="queryOrderType">
                 <el-radio label="1">运单号</el-radio>
                 <el-radio label="0">批次号</el-radio>
+                <el-radio label="2">运输号</el-radio>
               </el-radio-group>
             </div>
             <XdTextareaInput
@@ -52,13 +53,13 @@
           <el-form-item label="下一网点" prop="nextSiteCode">
             <EmisSiteSimplePicker :placeholder="$t('请选择')"    v-model="queryParams.nextSiteCode"  ></EmisSiteSimplePicker>
           </el-form-item>
-          <el-form-item label="运输号" prop="carNo">
+          <!-- <el-form-item label="运输号" prop="carNo">
             <el-input
               v-model="queryParams.carNo"
               :placeholder="$t('运输号')"
               clearable
             />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="目的国" prop="destCountry">
               <CountryPicker :placeholder="$t('目的国')" v-model="queryParams.destCountry" ></CountryPicker>
           </el-form-item>
@@ -467,9 +468,15 @@ export default {
         if(this.queryOrderType=='1'){
           rqParams.params.billCode=this.queryParams.queryKey;
           rqParams.batchNo=null;
+          rqParams.carNo=null;
+        }else if(this.queryOrderType=='2'){
+          rqParams.carNo=this.queryParams.queryKey;
+          rqParams.batchNo=null;
+          rqParams.params.billCode=null;
         }else{
           rqParams.batchNo=this.queryParams.queryKey;
           rqParams.params.billCode=null;
+          rqParams.carNo=null;
         }
       }else{
         if(this.queryETDType=='2'){
@@ -492,9 +499,15 @@ export default {
       if(this.queryOrderType=='1'){
         this.queryParams.params.billCode=this.queryParams.queryKey;
         this.queryParams.batchNo=null;
+        this.queryParams.carNo=null;
+      }else if(this.queryOrderType=='2'){
+        this.queryParams.carNo=this.queryParams.queryKey;
+        this.queryParams.batchNo=null;
+        this.queryParams.params.billCode=null;
       }else{
         this.queryParams.batchNo=this.queryParams.queryKey;
         this.queryParams.params.billCode=null;
+        this.queryParams.carNo=null;
       }
 
 

From d205cb6a9e227c7625fe34cc895444e04a5145c2 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Mon, 1 Dec 2025 14:01:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=BF=90=E8=BE=93=E5=8F=B7=E6=8F=90=E9=86=92=E5=8A=A0=E2=80=98?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index e09f5cc4..94adf72f 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -91,9 +91,9 @@
                   <EmisTmsSiteBatchSupplierPicker :placeholder="$t('请选择')" :startSiteCode="form.startSiteCode" :nextSiteCode="form.nextSiteCode" @onChange="onSupplierSelect"  v-model="form.supplierCode"  ></EmisTmsSiteBatchSupplierPicker>
               </el-form-item>
             </el-col>
-              <el-col :span="8" >
+            <el-col :span="8" >
               <el-form-item :label="$t('运输号')" prop="carNo">
-                  <el-input v-model="form.carNo" clearable="" placeholder="车牌号/船次号/提单号"  @change="calcBatchName"></el-input>
+                  <el-input v-model="form.carNo" clearable="" placeholder="车牌号/船次号/提单号/订单号"  @change="calcBatchName"></el-input>
               </el-form-item>
             </el-col>
 

From d7784eda2695310c80706a08c9237e13b5e8404e Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Mon, 1 Dec 2025 15:12:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=90=E8=BE=93=E5=8F=B7=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=96=87=E5=AD=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index 94adf72f..ad031015 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -93,7 +93,7 @@
             </el-col>
             <el-col :span="8" >
               <el-form-item :label="$t('运输号')" prop="carNo">
-                  <el-input v-model="form.carNo" clearable="" placeholder="车牌号/船次号/提单号/订单号"  @change="calcBatchName"></el-input>
+                  <el-input v-model="form.carNo" clearable="" placeholder="同行单号/订单号/车牌号/船次号/提单号"  @change="calcBatchName"></el-input>
               </el-form-item>
             </el-col>