From f00dac4cf6d71ba2180873b42262b217f0bb39a0 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 30 Dec 2024 08:50:02 +0800
Subject: [PATCH] md

---
 .../panel/WarehouseInPanel.vue                | 78 +++++++++++++++++--
 1 file changed, 71 insertions(+), 7 deletions(-)

diff --git a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
index 322fcb78..a1c651b6 100644
--- a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
+++ b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
@@ -212,7 +212,7 @@
       <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="150" :show-overflow-tooltip="true"/>
       <!-- <el-table-column :label="$t('客户编号')" align="center" prop="customerCode" min-width="100" /> -->
       <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('预计进仓日期')" align="center" prop="entryDate" min-width="170" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column :label="$t('预计进仓日期')" align="center" prop="entryDate" min-width="170" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="150" /> -->
       <el-table-column :label="$t('确认状态')" align="center" prop="confirmStatus" min-width="100" >
               <template slot-scope="scope">
@@ -256,10 +256,9 @@
       <!-- <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
        -->
-
-      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/> -->
 
     </XdTable>
 
@@ -282,8 +281,10 @@ import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
 export default {
   name: "emisWarehouseIn",
   components: { elDateSimplePicker,elDateAdvPicker,emisWarehouseInForm,SalemanPicker },
-  dicts: [
-  ],
+  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+       'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+       'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
+ ],
   data() {
     return {
       // 遮罩层
@@ -511,7 +512,7 @@ export default {
         excel.export_json_to_excel({
           header: tHeader,
           data,
-          filename: '账单导出',
+          filename: '进仓导出',
           autoWidth: true
         })
         loadingInstance.close()
@@ -615,6 +616,69 @@ export default {
           return  v['waybillDetail']['problemCause'];
         }
 
+
+        if (j === 'waybillDetail.intoWarehouseName') {
+          return  v['waybillDetail']['intoWarehouseName'];
+        }
+
+        if (j === 'waybillDetail.intoWarehouseContact') {
+          return  v['waybillDetail']['intoWarehouseContact'];
+        }
+
+        if (j === 'waybillDetail.intoWarehousePhone') {
+          return  v['waybillDetail']['intoWarehousePhone'];
+        }
+
+        if (j === 'waybillDetail.intoWarehouseAddress') {
+          return  v['waybillDetail']['intoWarehouseAddress'];
+        }
+
+        if (j === 'waybillDetail.pickStartDate') {
+          return  v['waybillDetail']['pickStartDate'];
+        }
+
+        if (j === 'waybillDetail.sendName') {
+          return  v['waybillDetail']['sendName'];
+        }
+
+
+        if (j === 'waybillDetail.sendCompany') {
+          return  v['waybillDetail']['sendCompany'];
+        }
+
+        if (j === 'waybillDetail.sendCountryName') {
+          return  v['waybillDetail']['sendCountryName'];
+        }
+
+        if (j === 'waybillDetail.sendAddress') {
+          return  v['waybillDetail']['sendAddress'];
+        }
+
+        if (j === 'waybillDetail.receiveName') {
+          return  v['waybillDetail']['receiveName'];
+        }
+
+        if (j === 'waybillDetail.receiveCompany') {
+          return  v['waybillDetail']['receiveCompany'];
+        }
+
+        if (j === 'waybillDetail.receiveCountryName') {
+          return  v['waybillDetail']['receiveCountryName'];
+        }
+
+        if (j === 'waybillDetail.receiveAddress') {
+          return  v['waybillDetail']['receiveAddress'];
+        }
+
+        if (j === 'waybillDetail.destinationName') {
+          return  v['waybillDetail']['destinationName'];
+        }
+
+        if (j === 'waybillDetail.dispatchUnderlingSiteName') {
+          return  v['waybillDetail']['dispatchUnderlingSiteName'];
+        }
+
+
         if (j === 'waybillDetail.sendMobile') {
           return "";
         }