From 1d8c6f0b8f710ccfb2c9ed111e8b9012d7cfd842 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 7 Jun 2024 16:19:39 +0800
Subject: [PATCH] md

---
 src/views/emis/EmisBaseTools/PayeePicker.vue       |  8 +++++---
 src/views/emis/EmisBaseTools/SalemanPicker.vue     | 11 +++++++----
 src/views/emis/customerService/waybillTracking.vue |  6 +++---
 .../emisTmsSiteBatch/waitGenBatchWaybillList.vue   | 14 +++++++-------
 src/views/emis/emisWaybill/feeItemForm.vue         |  2 +-
 src/views/emis/emisWaybill/sendWaybillList.vue     | 10 ++++++----
 6 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/PayeePicker.vue b/src/views/emis/EmisBaseTools/PayeePicker.vue
index d2142f0d..6f46c296 100644
--- a/src/views/emis/EmisBaseTools/PayeePicker.vue
+++ b/src/views/emis/EmisBaseTools/PayeePicker.vue
@@ -43,6 +43,10 @@
       return {
         optionItems: [],
         svalue: this.value,
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10,
+        }
       };
     },
     watch: {
@@ -75,9 +79,7 @@
         }
       },
       queryData(val) {
-        let queryParams = {
-          searchValue:val
-        };
+        this.queryParams.searchValue=val;
         getPayeeList(queryParams).then(response => {
           this.optionItems =response.rows;
         });
diff --git a/src/views/emis/EmisBaseTools/SalemanPicker.vue b/src/views/emis/EmisBaseTools/SalemanPicker.vue
index dc93dff4..659330e9 100644
--- a/src/views/emis/EmisBaseTools/SalemanPicker.vue
+++ b/src/views/emis/EmisBaseTools/SalemanPicker.vue
@@ -43,6 +43,10 @@
       return {
         optionItems: [],
         svalue: this.value,
+        queryParams:{
+          pageNum: 1,
+          pageSize: 10,
+        }
       };
     },
     watch: {
@@ -75,10 +79,9 @@
         }
       },
       queryData(val) {
-        let queryParams = {
-          searchValue:val
-        };
-        getSalemanList(queryParams).then(response => {
+
+        this.queryParams.searchValue=val;
+        getSalemanList(this.queryParams).then(response => {
           this.optionItems =response.rows;
         });
       },
diff --git a/src/views/emis/customerService/waybillTracking.vue b/src/views/emis/customerService/waybillTracking.vue
index 2710bcee..1869b268 100644
--- a/src/views/emis/customerService/waybillTracking.vue
+++ b/src/views/emis/customerService/waybillTracking.vue
@@ -23,7 +23,7 @@
 
         </el-col>
       </el-row>
-      
+
     </SearchForm>
 
     <el-collapse v-model="activeNames">
@@ -44,7 +44,7 @@
       </el-collapse-item>
 
     </el-collapse>
-    
+
 
 
 
@@ -318,7 +318,7 @@ export default {
         delFlag: null,
         remark: null,
         params:{
-          signStatus:null,
+          blSign:null,
           expireNotSign:null,
           problemQueryType:null,
         }
diff --git a/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue b/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue
index 874c692c..f87519f1 100644
--- a/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue
+++ b/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue
@@ -176,10 +176,10 @@
               <ProvincePicker2  v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry"  style="margin-left:5px"  ></ProvincePicker2>
             </el-form-item>
 
-            <el-form-item label="签收状态" prop="signStatus">
-              <el-select clearable="" v-model="queryParams.params.signStatus" placeholder="请选择">
+            <el-form-item label="签收状态" prop="blSign">
+              <el-select clearable="" v-model="queryParams.params.blSign" placeholder="请选择">
                 <el-option label="已签收" :value="1"></el-option>
-                <el-option label="未签收" :value="2"></el-option>
+                <el-option label="未签收" :value="0"></el-option>
               </el-select>
             </el-form-item>
 
@@ -326,7 +326,7 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
-       
+
            >
 
       <div slot="toolbar">
@@ -830,7 +830,7 @@ export default {
         delFlag: null,
         remark: null,
         params:{
-          signStatus:null,
+          blSign:null,
           expireNotSign:null,
           problemQueryType:null,
         }
@@ -868,10 +868,10 @@ export default {
     tableRowClassName({row, rowIndex}) {
       if (row.blIsQuestion=='1') {
         return 'warning-row';
-      } 
+      }
       else if (row.waybillStatus=='50') {
         return 'success-row';
-      } 
+      }
 
       return '';
     },
diff --git a/src/views/emis/emisWaybill/feeItemForm.vue b/src/views/emis/emisWaybill/feeItemForm.vue
index 158f379d..a22ea1a6 100644
--- a/src/views/emis/emisWaybill/feeItemForm.vue
+++ b/src/views/emis/emisWaybill/feeItemForm.vue
@@ -11,7 +11,7 @@
                     <el-option
                     v-for="dict in feeTypeList"
                       :key="dict.value"
-                      :label="dict.value+'-'+dict.label"
+                      :label="dict.label"
                       :value="dict.value"
                     />
              </el-select>
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 01c5c832..9bfe7688 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -160,8 +160,8 @@
               <ProvincePicker2  v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry"  style="margin-left:5px"  ></ProvincePicker2>
             </el-form-item>
 
-            <el-form-item label="签收状态" prop="signStatus">
-              <el-select clearable="" v-model="queryParams.params.signStatus" placeholder="请选择">
+            <el-form-item label="签收状态" prop="blSign">
+              <el-select clearable="" v-model="queryParams.params.blSign" placeholder="请选择">
                 <el-option label="已签收" :value="1"></el-option>
                 <el-option label="未签收" :value="2"></el-option>
               </el-select>
@@ -814,7 +814,7 @@ export default {
         delFlag: null,
         remark: null,
         params:{
-          signStatus:null,
+          blSign:null,
           expireNotSign:null,
           problemQueryType:null,
         }
@@ -822,7 +822,9 @@ export default {
     };
   },
   created() {
-    this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
+    if(this.$store.getters.ownerSiteCode!='88888'){
+      this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
+    }
     this.queryOrderType="1";
     this.queryOrderDateType="1";
     // this.queryExpireNotSign="1"