From 4e673d3490cf5d80a8945a6c98ce69939111b8ce Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 07:35:24 +0800
Subject: [PATCH] md

---
 src/views/emis/emisBrand/index.vue            |  9 +++
 src/views/emis/emisSiteAccount/index.vue      | 10 +--
 .../emis/emisWaybill/waybillIsPrinted.vue     | 15 ++--
 src/views/emis/emisWaybill/waybillList.vue    | 69 ++++++++++++-------
 .../emis/emisWaybillProblemInfo/index.vue     | 11 ++-
 5 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/src/views/emis/emisBrand/index.vue b/src/views/emis/emisBrand/index.vue
index 4f46c4b9..21d6e479 100644
--- a/src/views/emis/emisBrand/index.vue
+++ b/src/views/emis/emisBrand/index.vue
@@ -128,6 +128,15 @@
             <!-- <dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/> -->
           </template>
         </el-table-column>
+
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/emis/emisSiteAccount/index.vue b/src/views/emis/emisSiteAccount/index.vue
index e00e9f0e..3e1b60cb 100644
--- a/src/views/emis/emisSiteAccount/index.vue
+++ b/src/views/emis/emisSiteAccount/index.vue
@@ -301,11 +301,11 @@
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />
 
       <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-          <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
-          <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-          <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-          <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
-          <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index 0147fad7..776396d3 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -392,7 +392,14 @@
             <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" />
+
+        <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
+          <template slot-scope="scope">
+             <span v-if="scope.row.paymentType==3">{{scope.row.freight}}</span>
+             <span v-else>0</span>
+          </template>
+        </el-table-column>
+
         <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
         <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
@@ -415,12 +422,8 @@
         <el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
 
-      <!-- <el-table-column label="签收信息" align="center">
 
-      </el-table-column> -->
-
-
-      <el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('运单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
       <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
diff --git a/src/views/emis/emisWaybill/waybillList.vue b/src/views/emis/emisWaybill/waybillList.vue
index f602095c..bf18ce2e 100644
--- a/src/views/emis/emisWaybill/waybillList.vue
+++ b/src/views/emis/emisWaybill/waybillList.vue
@@ -240,37 +240,40 @@
                 <span v-text="getIndex(scope.$index)"> </span>
              </template>
       </el-table-column>
-
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
-
       -->
 
       <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" /> -->
-
-      <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="100" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column :label="$t('子单号,逗号隔开')" align="center" prop="billCodeSub" min-width="100" /> -->
       <!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> -->
        <!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" /> -->
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" width="100" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
+          </template>
+       </el-table-column>
+      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="80" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+             <span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.customerName}}</span>
+             <span v-else></span>
+          </template>
+        </el-table-column>
 
-      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('销售回款人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
       <el-table-column :label="$t('操作员')" align="center" prop="operateEmployeeName" min-width="100" />
+      <el-table-column :label="$t('收件业务员')" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true"/>
+      <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="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true"/>
-        <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="sendCountryName" width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
@@ -285,6 +288,7 @@
 
         <!-- </el-table-column> -->
       <!-- <el-table-column label="寄件信息" align="center" > -->
+        <el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/>
 
         <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
@@ -363,15 +367,21 @@
             <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" />
+        <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" >
+          <template slot-scope="scope">
+             <span v-if="scope.row.paymentType==3">{{scope.row.freight}}</span>
+             <span v-else>0</span>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
         <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/>
-
-      <!-- </el-table-column> -->
-
-      <!-- <el-table-column label="签收信息" align="center"> -->
+        <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_status" :value="scope.row.paymentStatus"/>
+          </template>
+        </el-table-column>
 
         <el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" >
           <template slot-scope="scope">
@@ -385,9 +395,16 @@
         <el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
 
-      <!-- </el-table-column> -->
+        <el-table-column :label="$t('问题件')" align="center" prop="blIsQuestion" min-width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
+              <el-tag v-else type="info">否</el-tag>
+          </template>
+        </el-table-column>
+      <el-table-column :label="$t('问题件类型')" align="center" prop="problemType" width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('延期天数')" align="center" prop="problemDelayDays" width="80" :show-overflow-tooltip="true"/>
 
-      <!-- <el-table-column label="打印信息" align="center"> -->
         <el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" >
           <template slot-scope="scope">
               <el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
@@ -399,8 +416,8 @@
         <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-width="80" :show-overflow-tooltip="true"/>
-      <!-- </el-table-column> -->
-      <el-table-column :label="$t('运单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
+
+        <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
 
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
@@ -438,7 +455,7 @@ export default {
   components: { elDateAdvPicker,emisWaybillForm,CountryPicker0,CountryPicker1 },
   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_calc_fee_type','emis_print_type','emis_payment_status'
   ],
   data() {
     return {
diff --git a/src/views/emis/emisWaybillProblemInfo/index.vue b/src/views/emis/emisWaybillProblemInfo/index.vue
index bbe4acdc..1da9f308 100644
--- a/src/views/emis/emisWaybillProblemInfo/index.vue
+++ b/src/views/emis/emisWaybillProblemInfo/index.vue
@@ -325,9 +325,16 @@
       <el-table-column :label="$t('是否检查')" align="center" prop="blCheckok" min-width="100" />
       <el-table-column :label="$t('是否查看')" align="center" prop="blSee" min-width="100" />
       <el-table-column :label="$t('文件路径')" align="center" prop="filePath" min-width="100" />
-      <el-table-column :label="$t('修改站点代码')" align="center" prop="modifySiteCode" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
+
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button