From 1a706ddfc90ffe5206beecc787a5aa6694859191 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 17 Jul 2025 16:59:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7=E3=80=81?=
 =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E3=80=81=E4=BA=A7=E5=93=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=81=9C=E7=94=A8=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EmisBaseTools/AllMonthpayAccountPicker.vue    |  2 +-
 src/views/emis/emisWaybill/centerWaybillList.vue  | 14 ++++++++++----
 .../emis/emisWaybill/dispatchWaybillList.vue      | 15 ++++++++++-----
 src/views/emis/emisWaybill/sendWaybillList.vue    | 15 +++++++++------
 src/views/emis/emisWaybill/sendWaybillListNew.vue | 13 +++++++++----
 5 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue b/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue
index 68edd668..3960f8b2 100644
--- a/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue
+++ b/src/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue
@@ -20,7 +20,7 @@
      @click.native="onClick"
      @visible-change="reverseArrow"
   >
-       <el-option v-for="item in optionItems" :key="item.custNo" :label="item.custName" :value="item.custNo" ></el-option>
+       <el-option v-for="item in optionItems" :key="item.custNo" :label="item.custName+((item.status==0)?'-已停用':'')" :value="item.custNo" ></el-option>
    </el-select>
 </template>
 <script>
diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index e468c616..1d9bd6b2 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -35,7 +35,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="月结客户" prop="custNo">
-                <EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
+                <AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
               </el-form-item>
               <el-form-item label="付款方式" prop="paymentType" >
               <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@@ -51,10 +51,10 @@
             </el-col>
             <el-col :span="6">
                   <el-form-item label="线路" prop="transLineType">
-                    <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true"  ></TransLinePicker>
+                    <TransLineAllPicker v-model="queryParams.transLineType"  isInitiated="true"  ></TransLineAllPicker>
                   </el-form-item>
                   <el-form-item label="产品类型" prop="productType">
-                    <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
+                    <TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker>
                   </el-form-item>
 
 
@@ -628,6 +628,9 @@ import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDet
 
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 import { formatSearchStr,deepClone } from '@/utils/index'
+import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
+import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
+import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
 
 export default {
   name: "CenterWaybillList",
@@ -650,7 +653,10 @@ export default {
     EmisSiteSimplePicker2,
     ProblemTypeMultiplePicker,
 
-    TraceWaybillDetailView
+    TraceWaybillDetailView,
+    TransLineAllPicker,
+    TransProductAllPicker,
+    AllMonthpayAccountPicker
 
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 55a5c210..09708d82 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -51,7 +51,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item label="月结客户" prop="custNo">
-                <EmisMonthpayAccountPicker v-model="queryParams.custNo" ></EmisMonthpayAccountPicker>
+                <AllMonthpayAccountPicker v-model="queryParams.custNo" ></AllMonthpayAccountPicker>
               </el-form-item>
               <el-form-item label="付款方式" prop="paymentType" >
               <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@@ -67,10 +67,10 @@
             </el-col>
             <el-col :span="5">
                   <el-form-item label="线路" prop="transLineType">
-                    <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true"  ></TransLinePicker>
+                    <TransLineAllPicker v-model="queryParams.transLineType"  isInitiated="true"  ></TransLineAllPicker>
                   </el-form-item>
                   <el-form-item label="产品类型" prop="productType">
-                    <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
+                    <TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker>
                   </el-form-item>
             </el-col>
       </el-row>
@@ -623,6 +623,9 @@ import TraceWaybillDetailView from '@/views/emis/customerService/traceWaybillDet
 
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 import { formatSearchStr,deepClone } from '@/utils/index'
+import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
+import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
+import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
 
 export default {
   // name: "SendWaybillList",
@@ -644,8 +647,10 @@ export default {
     EmisSiteSimplePicker2,
     ProblemTypeMultiplePicker,
 
-    TraceWaybillDetailView
-
+    TraceWaybillDetailView,
+    TransLineAllPicker,
+    TransProductAllPicker,
+    AllMonthpayAccountPicker
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 59c84ac5..2bd7d62a 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -53,7 +53,7 @@
         </el-col>
         <el-col :span="5">
             <el-form-item label="月结客户" prop="custNo">
-              <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="onCustNoChange"></EmisMonthpayAccountPicker>
+              <AllMonthpayAccountPicker v-model="queryParams.custNo" @onChange="onCustNoChange"></AllMonthpayAccountPicker>
             </el-form-item>
             <el-form-item label="付款方式" prop="paymentType" >
             <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@@ -69,10 +69,10 @@
 
         <el-col :span="5">
             <el-form-item label="线路" prop="transLineType">
-              <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true" ></TransLinePicker>
+              <TransLineAllPicker v-model="queryParams.transLineType"  isInitiated="true" ></TransLineAllPicker>
             </el-form-item>
             <el-form-item label="产品类型" prop="productType">
-              <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
+              <TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker>
             </el-form-item>
         </el-col>
       </el-row>
@@ -568,8 +568,9 @@ import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
 
 import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
-
+import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
 import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
 
@@ -583,7 +584,7 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
 import ProblemTypeMultiplePicker from '@/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue';
 
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
-
+import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
 import TraceDetail from '@/views/emis/customerService/traceDetail.vue';
 
 import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue';
@@ -625,7 +626,9 @@ export default {
     TraceDetail,
 
     WaybillDetailReadOnly,
-
+    TransLineAllPicker,
+    TransProductAllPicker,
+    AllMonthpayAccountPicker
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index 482237a1..51ad1a6b 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -56,7 +56,7 @@
   </el-col>
   <el-col :span="5">
       <el-form-item label="月结客户" prop="custNo">
-        <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="onCustNoChange"></EmisMonthpayAccountPicker>
+        <AllMonthpayAccountPicker v-model="queryParams.custNo" @onChange="onCustNoChange"></AllMonthpayAccountPicker>
       </el-form-item>
       <el-form-item label="付款方式" prop="paymentType" >
       <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
@@ -72,10 +72,10 @@
 
   <el-col :span="5">
       <el-form-item label="线路" prop="transLineType">
-        <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true"  ></TransLinePicker>
+        <TransLineAllPicker v-model="queryParams.transLineType"  isInitiated="true" ></TransLineAllPicker>
       </el-form-item>
       <el-form-item label="产品类型" prop="productType">
-        <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductPicker>
+        <TransProductAllPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" ></TransProductAllPicker>
       </el-form-item>
   </el-col>
 </el-row>
@@ -611,6 +611,9 @@ import {  queryLastRecord } from "@/api/emis/emisTmsScanRecord";
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 import { formatSearchStr,deepClone } from '@/utils/index'
 import clip from '@/utils/clipboard'
+import TransLineAllPicker from '@/views/emis/EmisBaseTools/TransLineAllPicker.vue'
+import TransProductAllPicker from '@/views/emis/EmisBaseTools/TransProductAllPicker.vue'
+import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue';
 
 export default {
   name: "SendWaybillListNew",
@@ -638,7 +641,9 @@ export default {
     TraceDetail,
 
     WaybillDetailReadOnly,
-
+    TransLineAllPicker,
+    TransProductAllPicker,
+    AllMonthpayAccountPicker
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',