From f1ce5eb6f5f1325bcfa13378a20a760faa228cf7 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 5 Jul 2024 20:01:45 +0800
Subject: [PATCH] md

---
 src/components/XdTable/index.vue              |  4 ++
 .../emis/EmisBaseTools/TanexPrinterPanel.vue  |  6 +-
 .../emis/emisTmsPack/packageManagement.vue    | 33 +++++----
 .../emis/emisWaybill/sendWaybillList.vue      |  8 +--
 .../emisWaybill/waybillDetailReadOnly.vue     |  2 +
 .../emis/emisWaybill/waybillIsPrinted.vue     | 18 ++++-
 src/views/emis/emisWaybill/waybillModify.vue  | 72 +++++++++++++++----
 7 files changed, 109 insertions(+), 34 deletions(-)

diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index f8a22777..c043a797 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -206,6 +206,10 @@ export default {
     showSearch: {
       type: Boolean,
       default: true,
+    },
+     showSearch: {
+      type: Boolean,
+      default: true,
     },
     canHideColumns: {
       type: Boolean,
diff --git a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
index 32e51ce1..324ab100 100644
--- a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
+++ b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
@@ -365,9 +365,9 @@
                     that.openPdfView = true;
                   }
 
-                  if(that.pdfList.length == newOrderList.length){
-                    that.isLoadComplete=true;
-                  }
+                  // if(that.pdfList.length == newOrderList.length){
+                  //   that.isLoadComplete=true;
+                  // }
 
                   that.showCounter++;
 
diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index 1f3f126d..82dd247f 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -292,7 +292,7 @@
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column type="expand">
               <template slot-scope="props">
-                <XdTable v-loading="loadingDone"
+                <el-table v-loading="loadingDone"
                   height="200px"
                   style="margin-left: 5%;width:90%;"
                   border
@@ -301,21 +301,22 @@
                   showSearch.sync="false"
                   :queryParams="queryDoneParams"
                   :total="doneTotal"
-                  :showRightButton="false"
                   @queryTable="handleQueryDone"
                   @selection-change="handleDoneSelectionChange"
                   @sort-change="handleSortChange"
                 >
                   <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
-                  <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
-                  <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
-                  <el-table-column :label="$t('扫描状态')" align="center" prop="waybillStatus" width="100" >
+                  <el-table-column :label="$t('所属主单号')" align="center" prop="mainBillCode" min-width="170" />
+
+                  <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" /> -->
+                  <!-- <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" /> -->
+                  <!-- <el-table-column :label="$t('扫描状态')" align="center" prop="waybillStatus" width="100" >
                     <template slot-scope="scope">
                       <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
                     </template>
-                  </el-table-column>
-                  <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
-                  <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
+                  </el-table-column> -->
+                  <!-- <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" /> -->
+                  <!-- <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" /> -->
                   <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
                     <template slot-scope="scope">
                       <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
@@ -333,11 +334,15 @@
                       <span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
                     </template>
                   </el-table-column>
-                  <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
-                  <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-                  <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
-                  <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
-                  <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
+                  <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" >
+                    <template>
+                      <span>1</span>
+                    </template>
+                  </el-table-column>
+                  <!-- <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" /> -->
+                  <!-- <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" /> -->
+                  <!-- <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" /> -->
+                  <!-- <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" /> -->
                   <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150" />
                   <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
                     <template slot-scope="scope">
@@ -367,7 +372,7 @@
                       <span class="ellipsis">{{ scope.row.remark }}</span>
                     </template>
                   </el-table-column>
-                </XdTable>
+                </el-table>
               </template>
             </el-table-column>
             <el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 20d1f6d8..3a9cbd6b 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -152,7 +152,7 @@
                   />
                 </el-form-item>
 
-            <el-form-item label="目的国家" prop="sendCountry">
+            <el-form-item label="目的国家" prop="receiveCountry">
               <CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2>
             </el-form-item>
 
@@ -214,7 +214,7 @@
                   </el-form-item>
 
                   <el-form-item label="取件方式" prop="pickupMethod">
-                      <el-select v-model="queryParams.pickupMethod" placeholder="请选择">
+                      <el-select v-model="queryParams.pickupMethod" clearable="" placeholder="请选择">
                         <el-option
                           v-for="dict in dict.type.emis_qujian_fangshi"
                           :key="dict.value"
@@ -229,7 +229,7 @@
               </el-form-item>
 
               <el-form-item label="收款状态" prop="paymentStatus">
-                      <el-select v-model="queryParams.paymentStatus" placeholder="请选择">
+                      <el-select v-model="queryParams.paymentStatus" clearable="" placeholder="请选择">
                         <el-option
                           v-for="dict in dict.type.emis_payment_status"
                           :key="dict.value"
@@ -243,7 +243,7 @@
         </el-col>
         <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
 
-          <el-form-item label="问题件方式" prop="problemQueryType">
+          <el-form-item label="问题件方式" prop="params.problemQueryType">
             <el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
               <el-option label="只查问题件类型" :value="1"></el-option>
               <el-option label="剔除问题件类型" :value="2"></el-option>
diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index d3348517..2e9efc84 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -26,6 +26,8 @@
             <el-descriptions-item label="派送方式">
               <dict-tag :options="dict.type.emis_tab_dispatch_mode" :value="form.dispatchMethod"/>
             </el-descriptions-item>
+            <el-descriptions-item label="派件员">{{ form.dispatchManName }}/{{ form.operateEmployeeName }}</el-descriptions-item>
+
             <el-descriptions-item label="合同号"  :span="4">{{ form.custOrderId }}</el-descriptions-item>
             <el-descriptions-item label="取件员/操作员">{{ form.takePieceEmployeeName }}/{{ form.operateEmployeeName }}</el-descriptions-item>
             <el-descriptions-item label="录单员">{{ form.registerManName }}</el-descriptions-item>
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index 728469a6..8dc36763 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -1,6 +1,12 @@
 <template>
   <XdPageContainer class="app-container">
-    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"
+      size="mini" :maxShow="8"  label-width="100px"
+      v-show="showSearch"
+      @search="handleQuery"
+      @reset="resetQuery"
+      :isShowSearchBtn="false"
+      >
             <el-form-item label="" prop="billCode">
               <div slot="label">
               <el-radio-group class="query-label" v-model="queryOrderType">
@@ -53,6 +59,16 @@
 
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8" style="display: flex;flex-wrap: wrap;">
+          <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="handleQuery"
+                >查询</el-button>
+              </el-col>
+
 
           <el-col :span="1.5">
                 <el-button
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index e88b8b3f..fadf3f4e 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -57,9 +57,6 @@
                 </el-col>
 
                 <!-- 运单修改 end -->
-
-
-
                   <el-col :span="6">
                     <el-form-item :label="$t('目的国')"  prop="destinationCountry">
                         <CountryPicker0 v-model="form.destinationCountry" @onChange="onDestCountryChange"></CountryPicker0>
@@ -446,6 +443,7 @@
                         </el-form-item>
                       </el-col>
 
+
                       <el-col :span="12">
                         <el-form-item  :label="$t('体积重量')"  prop="volumeWeight" label-width="70px">
                           <el-input v-model="form.volumeWeight"   placeholder="" disabled>
@@ -461,6 +459,15 @@
                           </el-input>
                         </el-form-item>
                       </el-col>
+                      <el-col :span="12">
+                        <el-form-item  :label="$t('货值')"  prop="realValue" label-width="70px" >
+                          <div style="">
+                            <el-input v-model="form.realValue"  style="text-align: right;width: 120px" placeholder="货值" >
+                              <span slot="suffix">(USD)</span>
+                            </el-input>
+                          </div>
+                        </el-form-item>
+                      </el-col>
                       <el-col :span="12">
                         <el-form-item  :label="$t('包装类型')"  prop="packType" label-width="70px"">
                             <el-select multiple="" v-model="form.packType" placeholder="">
@@ -510,7 +517,8 @@
                       </el-col>
                       <el-col :span="24">
                         <el-form-item :label="$t('运单备注')" prop="remark" label-width="70px">
-                          <el-input v-model="form.remark" type="textarea" placeholder="" />
+                          <el-input v-model="form.remark" type="textarea" placeholder=""  maxlength="150"
+                          show-word-limit />
                         </el-form-item>
                       </el-col>
                   </el-row>
@@ -669,7 +677,8 @@
                             <el-input v-else v-model="form.freight" disabled placeholder="" >   </el-input>
                       </el-form-item>
                       <el-form-item  :label="$t('费用备注')" prop="feeRemark" label-width="70px">
-                            <el-input v-model="form.feeRemark" type="textarea" placeholder="" >
+                            <el-input v-model="form.feeRemark" type="textarea" maxlength="150"
+                            show-word-limit placeholder="" >
                         </el-input>
                       </el-form-item>
                     </el-col>
@@ -694,10 +703,7 @@
                         <TanexPrinterPanel ref="tanexPrinter"  :isShowPinters="true" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false"  @onPrintComplete="onComplete"></TanexPrinterPanel>
                       </el-form-item>
                     </el-col>
-
-
                   </el-row>
-
                </el-col>
             </el-row>
           </el-collapse-item>
@@ -1499,7 +1505,7 @@ methods: {
   /** 提交按钮 */
   submitForm() {
     this.form.sendDate =this.sendDate;
-    this.$refs["form"].validate(valid => {
+    this.$refs["form"].validate((valid,obj) => {
       if (valid) {
 
         if(this.form.destinationCountry!=this.form.reciever.country){
@@ -1522,10 +1528,27 @@ methods: {
         }
 
       }
+      else {
+        var fail = [];
+        for (let key in obj) {
+          fail.push(obj[key][0].message);
+        }
+        this.$notify({
+            title: '校验失败',
+            message: '<span style="color:red;font-weight:600">'+fail[0]+'</span>',
+            type: 'error',
+            dangerouslyUseHTMLString: true,
+            showClose: false,
+            duration: 2000,
+            // position: 'bottom-right',
+            offset: 100
+          });
+        return false;
+      }
     });
   },
   startTimer(){
-    if(this.action=='add' || action=='preAdd'){
+    if(this.action=='add' || this.action=='preAdd'){
       this.sendDate=parseTime(new Date());
       this.timer = setTimeout(this.startTimer, 1000);
     }
@@ -1692,14 +1715,18 @@ methods: {
 
   handleCalcFeeItem(row){
 
+    console.log("===>handleCalcFeeItem==>",row);
     if(row!=null){
-
       if(row.calcExp){
         let expr=row.calcExp;
         expr=expr.replace("s",row.initialWeightFee);
         expr=expr.replace("d",row.addWeightPrice);
         expr=expr.replace("w",this.form.settlementWeight);
+
+        console.log("===>eval(expr):",eval(expr));
         row.realFee=parseFloat(eval(expr)).toFixed(2);
+
+        console.log("===>row.calcExp==>expr==>row.realFee:",row.calcExp,expr,row.realFee);
       }
     }
 
@@ -1782,11 +1809,15 @@ methods: {
 
         let calcFeeType=this.form.calcFeeType;
         if(calcFeeType==3){
-          calcFeeType=1;
+          // calcFeeType=1;
+          // 不要重算费用
+          return;
         }
 
 
 
+
+
         let postData={
           productType: this.form.productType,
           customerCode: this.form.customerCode,
@@ -2082,5 +2113,22 @@ methods: {
     pointer-events: auto;
   }
 
+// .notify-success{
+//     top: 1.7rem !important;
+//     right: 0.32rem !important;
+//     width: 2rem !important;
+//     height: 0.96rem !important;
+//     background: rgba(131, 213, 134, 0.1) !important;
+//     border-radius: 0.04rem 0px 0px 0.04rem !important;
+// }
+// .notify-error{
+//     top: 2.7rem !important;
+//     right: 0.32rem !important;
+//     width: 2rem !important;
+//     height: 0.96rem !important;
+//     background:  rgba(255, 31, 36, 0.05) !important;
+//     border-radius: 0.04rem 0px 0px 0.04rem !important;
+// }
+
 </style>