From 85eb05f5a4739741bf11de93e27b15a9b42e25ac Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 13 Sep 2024 13:22:57 +0800
Subject: [PATCH] md

---
 .../emis/emisCustomerAddress/recipientAddress.vue | 15 +++++++++------
 .../emis/emisCustomerAddress/senderAddress.vue    |  7 +++++++
 .../emis/emisWaybill/waybillDetailReadOnly.vue    |  4 +++-
 .../emis/emisWaybillAjustApply/adjustPanel.vue    |  4 ++--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/views/emis/emisCustomerAddress/recipientAddress.vue b/src/views/emis/emisCustomerAddress/recipientAddress.vue
index f259a878..da4ed8ec 100644
--- a/src/views/emis/emisCustomerAddress/recipientAddress.vue
+++ b/src/views/emis/emisCustomerAddress/recipientAddress.vue
@@ -6,8 +6,6 @@
           v-model="queryParams.name"
           :placeholder="$t('收件人')"
           clearable
-          @keyup.enter.native="handleQuery"
-          @input="handleQuery"
         />
       </el-form-item>
       <el-form-item label="收件电话" prop="phone">
@@ -15,15 +13,20 @@
           v-model="queryParams.phone"
           :placeholder="$t('收件电话')"
           clearable
-          @keyup.enter.native="handleQuery"
-          @input="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="公司名称" prop="company">
+        <el-input
+          v-model="queryParams.company"
+          :placeholder="$t('公司名称')"
+          clearable
         />
       </el-form-item>
       <el-form-item :label="$t('所属国家')" prop="country">
-            <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
+            <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" ></CountryPicker>
        </el-form-item>
        <el-form-item :label="$t('使用网点')" prop="useSiteCode">
-          <EmisSiteSimplePicker :placeholder="$t('使用网点')" :countryCode="queryParams.country"  v-model="queryParams.useSiteCode" @onChange="handleQuery"></EmisSiteSimplePicker>
+          <EmisSiteSimplePicker :placeholder="$t('使用网点')" :countryCode="queryParams.country"  v-model="queryParams.useSiteCode" ></EmisSiteSimplePicker>
         </el-form-item>
     </SearchForm>
 
diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue
index b27c5f48..7896f6a2 100644
--- a/src/views/emis/emisCustomerAddress/senderAddress.vue
+++ b/src/views/emis/emisCustomerAddress/senderAddress.vue
@@ -20,6 +20,13 @@
           @input="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="公司名称" prop="company">
+        <el-input
+          v-model="queryParams.company"
+          :placeholder="$t('公司名称')"
+          clearable
+        />
+      </el-form-item>
       <el-form-item :label="$t('所属国家')" prop="country">
             <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
        </el-form-item>
diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index 89e49571..802a679f 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -57,9 +57,11 @@
       <el-descriptions :title="$t('货物信息')" size="small" :column="4" style="margin-top:10px">
             <el-descriptions-item label="货物名称" :span="4">{{ form.goodsInfo }}</el-descriptions-item>
             <el-descriptions-item label="件数">{{ form.parcelQty }}件</el-descriptions-item>
-            <el-descriptions-item label="包装类型" :span="4">
+            <el-descriptions-item label="包装类型" >
               <dict-tag v-if="form.packType&&form.packType!=''" :options="dict.type.emis_tab_packing_type" :value="form.packType.split(',')"/>
             </el-descriptions-item>
+            <el-descriptions-item label="货值" :span="4">{{ form.realValue }}</el-descriptions-item>
+
             <el-descriptions-item label="实际重量">{{ form.billWeight }}(kg)</el-descriptions-item>
             <el-descriptions-item label="体积">{{ form.totalVolume }}(m³)</el-descriptions-item>
             <el-descriptions-item label="体积重量" :span="4">{{ form.volumeWeight }}(kg)</el-descriptions-item>
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index 268e95c0..7a3b53bf 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -26,7 +26,7 @@
                     </el-col>
                     <el-col :span="14">
                       <el-form-item label="目的国" prop="transLine">
-                        <CountryPicker0 v-model="form.reciever.country" disabled></CountryPicker0>
+                        <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -42,7 +42,7 @@
                     </el-col>
                     <el-col :span="14">
                       <el-form-item label="线路" prop="transLine">
-                        <TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" isInitiated="true"  @onChange="calcBillFee" :disabled="applyTypeArr.includes('4')"></TransLinePicker>
+                        <TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" isInitiated="true"  @onChange="calcBillFee" ></TransLinePicker>
                       </el-form-item>
                     </el-col>