From 205accb71c9e766f2c627366ccb98ed4a71288f8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 09:28:47 +0800
Subject: [PATCH 1/6] md

---
 src/components/HeaderSearch/index3.vue       |  5 ++--
 src/layout/components/Sidebar/BizNav.vue     | 25 ++++----------------
 src/store/modules/tagsView.js                |  2 +-
 src/views/emis/emisWaybill/waybillRecord.vue | 14 +++++------
 4 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/src/components/HeaderSearch/index3.vue b/src/components/HeaderSearch/index3.vue
index 347d3333..c78b9aac 100644
--- a/src/components/HeaderSearch/index3.vue
+++ b/src/components/HeaderSearch/index3.vue
@@ -13,7 +13,7 @@
           >
             <el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
           </el-select>
-          <div style="margin-top: 20px;">
+          <div style="margin-top: 20px;display: flex; flex-wrap: wrap; justify-content: flex-start; align-items: center;    padding-top: 5px;">
               <el-button size="mini"  type="text" plain v-for="(quickItem,index) in quickActionList" :key="index" @click="change(quickItem)"><span>{{ quickItem.title }}</span></el-button>
           </div>
       </div>
@@ -53,7 +53,6 @@ watch: {
   },
   searchPool(list) {
     this.initFuse(list)
-    this.initQuickActionList();
   },
   show(value) {
     if (value) {
@@ -65,6 +64,7 @@ watch: {
 },
 mounted() {
   this.searchPool = this.generateRoutes(this.routes);
+  this.initQuickActionList();
 },
 methods: {
   initQuickActionList() {
@@ -101,6 +101,7 @@ methods: {
     this.$nextTick(() => {
       this.show = false
     })
+    this.initQuickActionList();
   },
   initFuse(list) {
     this.fuse = new Fuse(list, {
diff --git a/src/layout/components/Sidebar/BizNav.vue b/src/layout/components/Sidebar/BizNav.vue
index 32fcef9e..0bd20228 100644
--- a/src/layout/components/Sidebar/BizNav.vue
+++ b/src/layout/components/Sidebar/BizNav.vue
@@ -28,34 +28,16 @@
       </div>
       <div class="quick-tool" style="line-height: 34px;">
         <el-popover
-
           placement="right"
           width="400"
           trigger="click"
           ref="popoverRef"
           effect="light"
           :show-arrow="false"
+          :persistent="false"
+          @show="refreshId=Math.random().toString(36).substring(3,10)"
         >
-        <!--
-           ref="popoverRef"
-          width="400"
-          placement="right-bottom"
-          trigger="click"
-          popper-class="quick-menu-popover"
-          :offset="{ x: 10, y: 10 }"
-          :show-arrow="false"
-          :open-delay="500"
-
-        placement="right"
-          width="200"
-          trigger="hover"
-          ref="popoverRef"
-          effect="light"
-          :show-arrow="false"
-           -->
-          <!-- <div style="text-align: center;">
-          </div> -->
-          <search3 id="header-search"/>
+          <search3 id="header-search" :key="refreshId"/>
           <span  slot="reference">
               <i class="icon iconfont icon-icon_menhukuaijiecaidan" ></i>
           </span>
@@ -79,6 +61,7 @@ export default {
   },
   data() {
     return {
+      refreshId:'0',
       // 当前激活菜单的 index
       currentIndex: undefined,
       domainId:undefined,
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index 6f75baac..8ab2fb4b 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -21,7 +21,7 @@ const mutations = {
     try{
       var addActionLogData = {
         title: view.meta.title,
-        path:  view.path,
+        path:  view.fullPath,
         menuId: view.meta.menuId,
         navPath: "",
         groupName: "",
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index cfa495b2..94b34300 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -313,8 +313,8 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item  :label="$t('目的网点')"  prop="dispatchUnderlingSiteCode">
-                          <el-input v-model="form.dispatchUnderlingSiteCode" placeholder="" disabled />
+                        <el-form-item  :label="$t('目的网点')"  prop="dispatchUnderlingSiteName">
+                          <el-input v-model="form.dispatchUnderlingSiteName" placeholder="" disabled />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
@@ -1456,6 +1456,7 @@ methods: {
       destinationCountry:  null,
       destinationCode:  null,
       dispatchUnderlingSiteCode: null,
+      dispatchUnderlingSiteName:null,
       destinationCenterCode: null,
       marketManCode: null,
       payee: null,
@@ -1651,7 +1652,7 @@ methods: {
           this.form.dispatchSite = response.data.siteName;
 
           this.form.dispatchUnderlingSiteCode= response.data.siteCode;
-          this.form.dispatchUnderlingSite= response.data.siteName;
+          this.form.dispatchUnderlingSiteName= response.data.siteName;
 
         });
     }
@@ -1846,10 +1847,9 @@ methods: {
   onDestinationChange(item){
     // this.form.destinationCode = item.destCode;
     this.form.dispatchUnderlingSiteCode= item.siteCode;
-    this.form.dispatchSiteCode= item.siteCode;
-
-    this.form.dispatchUnderlingSite= item.siteName;
-    this.form.dispatchSite= item.siteName;
+    // this.form.dispatchSiteCode= item.siteCode;
+    this.form.dispatchUnderlingSiteName= item.siteName;
+    // this.form.dispatchSite= item.siteName;
   },
   onGoodsChange(goodsList,selNameStr){
     this.form.goodsInfo = selNameStr;

From 3d7951ae3ce7267645b21195020044cb4c5ff9c8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 09:40:27 +0800
Subject: [PATCH 2/6] md

---
 src/views/emis/emisWaybill/waybillModify.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 82043a51..551225db 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -313,8 +313,8 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item  :label="$t('目的网点')"  prop="dispatchUnderlingSiteCode">
-                          <el-input v-model="form.dispatchUnderlingSiteCode" placeholder="" disabled />
+                        <el-form-item  :label="$t('目的网点')"  prop="dispatchUnderlingSiteName">
+                          <el-input v-model="form.dispatchUnderlingSiteName" placeholder="" disabled />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
@@ -1456,6 +1456,7 @@ methods: {
       destinationCountry:  null,
       destinationCode:  null,
       dispatchUnderlingSiteCode: null,
+      dispatchUnderlingSiteName:null,
       destinationCenterCode: null,
       marketManCode: null,
       payee: null,
@@ -1651,7 +1652,7 @@ methods: {
           this.form.dispatchSite = response.data.siteName;
 
           this.form.dispatchUnderlingSiteCode= response.data.siteCode;
-          this.form.dispatchUnderlingSite= response.data.siteName;
+          this.form.dispatchUnderlingSiteName= response.data.siteName;
 
         });
     }
@@ -1846,10 +1847,9 @@ methods: {
   onDestinationChange(item){
     // this.form.destinationCode = item.destCode;
     this.form.dispatchUnderlingSiteCode= item.siteCode;
-    this.form.dispatchSiteCode= item.siteCode;
-
-    this.form.dispatchUnderlingSite= item.siteName;
-    this.form.dispatchSite= item.siteName;
+    // this.form.dispatchSiteCode= item.siteCode;
+    this.form.dispatchUnderlingSiteName= item.siteName;
+    // this.form.dispatchSite= item.siteName;
   },
   onGoodsChange(goodsList,selNameStr){
     this.form.goodsInfo = selNameStr;

From 2ed4995371ed7478a22c56e389bcf62fa61a8b89 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 09:55:38 +0800
Subject: [PATCH 3/6] md

---
 src/views/emis/emisWaybill/waybillRecord.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 94b34300..25b1ef69 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -13,13 +13,13 @@
               <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
                 <!-- 运单录入 -->
 
-                <el-col :span="6" v-if="action=='add'">
+                <el-col :span="6" v-if="action=='add' || action=='preAdd'">
                     <el-form-item :label="$t('发货时间')" prop="sendDate">
                       <el-input v-model="sendDate" placeholder=""  disabled />
                     </el-form-item>
                 </el-col>
 
-                <el-col :span="18" v-if="action=='add'">
+                <el-col :span="18" v-if="action=='add' || action=='preAdd'">
                     <el-form-item :label="$t('运单号')" prop="billCode"  >
                       <div style="display:inline-flex">
                           <div>
@@ -158,7 +158,7 @@
 
               </el-row>
 
-              <div v-if="action=='add'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
+              <div v-if="action=='add' || action=='preAdd'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
                     <div v-if="totalAvailablePag.mainHasCnt>0" style="display:inline-flex;font-size: 15px;font-weight: 700;">
 
                       <div style="width:230px">
@@ -674,7 +674,7 @@
                       </el-form-item>
                     </el-col>
 
-                    <el-col :span="24" v-if="action=='add'">
+                    <el-col :span="24" v-if="action=='add' || action=='preAdd' ">
                         <el-form-item  :label="$t('打印选项')"  prop="printTypeCheckList">
                           <el-checkbox-group v-model="form.printTypeCheckList">
                               <el-checkbox :key="0" :label="0" >
@@ -689,7 +689,7 @@
                             </el-checkbox-group>
                        </el-form-item>
                     </el-col>
-                    <el-col :span="24" v-if="action=='add'">
+                    <el-col :span="24" v-if="action=='add' || action=='preAdd'">
                       <el-form-item :label="$t('打印组件')"  prop="printTypeCheckList">
                         <TanexPrinterPanel ref="tanexPrinter"  :isShowPinters="true" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false"  @onPrintComplete="onComplete"></TanexPrinterPanel>
                       </el-form-item>
@@ -1524,7 +1524,7 @@ methods: {
     });
   },
   startTimer(){
-    if(this.action=='add'){
+    if(this.action=='add' || action=='preAdd'){
       this.sendDate=parseTime(new Date());
       this.timer = setTimeout(this.startTimer, 1000);
     }

From 5f5ad8eee98b1a1861803265a8965c5a6e491a9c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 10:24:48 +0800
Subject: [PATCH 4/6] md

---
 src/views/emis/emisWaybill/waybillModify.vue | 23 +++++++++++---------
 src/views/emis/emisWaybill/waybillRecord.vue |  7 ++++--
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 551225db..db998b45 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -13,13 +13,13 @@
               <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
                 <!-- 运单录入 -->
 
-                <el-col :span="6" v-if="action=='add'">
+                <el-col :span="6" v-if="action=='add' || action=='preAdd'">
                     <el-form-item :label="$t('发货时间')" prop="sendDate">
                       <el-input v-model="sendDate" placeholder=""  disabled />
                     </el-form-item>
                 </el-col>
 
-                <el-col :span="18" v-if="action=='add'">
+                <el-col :span="18" v-if="action=='add' || action=='preAdd'">
                     <el-form-item :label="$t('运单号')" prop="billCode"  >
                       <div style="display:inline-flex">
                           <div>
@@ -158,7 +158,7 @@
 
               </el-row>
 
-              <div v-if="action=='add'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
+              <div v-if="action=='add' || action=='preAdd'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
                     <div v-if="totalAvailablePag.mainHasCnt>0" style="display:inline-flex;font-size: 15px;font-weight: 700;">
 
                       <div style="width:230px">
@@ -674,7 +674,7 @@
                       </el-form-item>
                     </el-col>
 
-                    <el-col :span="24" v-if="action=='add'">
+                    <el-col :span="24" v-if="action=='add' || action=='preAdd' ">
                         <el-form-item  :label="$t('打印选项')"  prop="printTypeCheckList">
                           <el-checkbox-group v-model="form.printTypeCheckList">
                               <el-checkbox :key="0" :label="0" >
@@ -689,7 +689,7 @@
                             </el-checkbox-group>
                        </el-form-item>
                     </el-col>
-                    <el-col :span="24" v-if="action=='add'">
+                    <el-col :span="24" v-if="action=='add' || action=='preAdd'">
                       <el-form-item :label="$t('打印组件')"  prop="printTypeCheckList">
                         <TanexPrinterPanel ref="tanexPrinter"  :isShowPinters="true" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false"  @onPrintComplete="onComplete"></TanexPrinterPanel>
                       </el-form-item>
@@ -771,8 +771,8 @@ import { doScan } from "@/api/emis/emisTmsScanRecord";
 import { deepClone } from '@/utils/index'
 
 export default {
-  // name: "WaybillRecord",
-  name: "WaybillModify",
+  name: "WaybillRecord",
+  // name: "WaybillModify",
 components: {
   SalemanPicker,
   PayeePicker,
@@ -853,7 +853,7 @@ data() {
           { required: true, message: "收货人国家不能为空",  trigger: ["blur",'change'] }
         ],
         province: [
-          { required: true, message: "省不能为空", trigger: ["blur",'change']  }
+          { required: true, message: "收货省不能为空", trigger: ["blur",'change']  }
         ],
         company: [
           { required: true, message: "发件公司不能为空", trigger: ["blur",'change']  }
@@ -1524,7 +1524,7 @@ methods: {
     });
   },
   startTimer(){
-    if(this.action=='add'){
+    if(this.action=='add' || action=='preAdd'){
       this.sendDate=parseTime(new Date());
       this.timer = setTimeout(this.startTimer, 1000);
     }
@@ -1642,7 +1642,10 @@ methods: {
   },
   calcDestSite(){
     let queryParams = {
-        province:this.form.reciever.province
+        country:this.form.reciever.country,
+        province:this.form.reciever.province,
+        city:this.form.reciever.city,
+        address:this.form.reciever.address
     };
 
     if(this.form.reciever.province){
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 25b1ef69..db998b45 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -853,7 +853,7 @@ data() {
           { required: true, message: "收货人国家不能为空",  trigger: ["blur",'change'] }
         ],
         province: [
-          { required: true, message: "省不能为空", trigger: ["blur",'change']  }
+          { required: true, message: "收货省不能为空", trigger: ["blur",'change']  }
         ],
         company: [
           { required: true, message: "发件公司不能为空", trigger: ["blur",'change']  }
@@ -1642,7 +1642,10 @@ methods: {
   },
   calcDestSite(){
     let queryParams = {
-        province:this.form.reciever.province
+        country:this.form.reciever.country,
+        province:this.form.reciever.province,
+        city:this.form.reciever.city,
+        address:this.form.reciever.address
     };
 
     if(this.form.reciever.province){

From ae0f3daf166ef2b3d86fc132d6a702edc0568edd Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 10:25:16 +0800
Subject: [PATCH 5/6] md

---
 src/views/emis/emisWaybill/waybillModify.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index db998b45..439033f1 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -771,8 +771,8 @@ import { doScan } from "@/api/emis/emisTmsScanRecord";
 import { deepClone } from '@/utils/index'
 
 export default {
-  name: "WaybillRecord",
-  // name: "WaybillModify",
+  // name: "WaybillRecord",
+  name: "WaybillModify",
 components: {
   SalemanPicker,
   PayeePicker,

From 5a6f8e32b5485e4c21a3bf0b86d02e4929f1c947 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Jun 2024 10:32:32 +0800
Subject: [PATCH 6/6] md

---
 src/views/emis/emisWaybill/waybillModify.vue | 5 +++--
 src/views/emis/emisWaybill/waybillRecord.vue | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 439033f1..0476e0c9 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -296,8 +296,8 @@
                           <div style="display:inline-flex">
                             <country-picker2 v-model="form.reciever.country"  ></country-picker2>
                             <ProvincePicker2  v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px" @onChange="handleCalcDestSite" ></ProvincePicker2>
-                            <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
-                            <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
+                            <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"  @onChange="handleCalcDestSite" ></city-picker2>
+                            <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"  @onChange="handleCalcDestSite" ></district-picker2>
                           </div>
                         </el-form-item>
                       </el-col>
@@ -1645,6 +1645,7 @@ methods: {
         country:this.form.reciever.country,
         province:this.form.reciever.province,
         city:this.form.reciever.city,
+        county:this.form.reciever.city,
         address:this.form.reciever.address
     };
 
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index db998b45..a0bfd024 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -296,8 +296,8 @@
                           <div style="display:inline-flex">
                             <country-picker2 v-model="form.reciever.country"  ></country-picker2>
                             <ProvincePicker2  v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px" @onChange="handleCalcDestSite" ></ProvincePicker2>
-                            <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
-                            <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
+                            <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"  @onChange="handleCalcDestSite" ></city-picker2>
+                            <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"  @onChange="handleCalcDestSite" ></district-picker2>
                           </div>
                         </el-form-item>
                       </el-col>
@@ -1645,6 +1645,7 @@ methods: {
         country:this.form.reciever.country,
         province:this.form.reciever.province,
         city:this.form.reciever.city,
+        county:this.form.reciever.city,
         address:this.form.reciever.address
     };