From 426cc4c30a994b3e30b8ea56784b7ba5b470d8cf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 13 Dec 2024 17:38:35 +0800
Subject: [PATCH] md

---
 src/layout/components/TopNotice/index.vue     |  3 +-
 .../panel/BigBatchEditForm.vue                | 28 ++++++++++++++++---
 .../panel/BigBatchListPanel.vue               |  8 +++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/layout/components/TopNotice/index.vue b/src/layout/components/TopNotice/index.vue
index a1144e50..eb3c22c3 100644
--- a/src/layout/components/TopNotice/index.vue
+++ b/src/layout/components/TopNotice/index.vue
@@ -150,9 +150,10 @@ export default {
       // console.log("onNoticeError")
       // this.printerStatusMessage="通知组件已断开！";
     },
-    onMessage(evt){
+    onMessage(evtStr){
 
       let that=this;
+      let evt= JSON.parse(evtStr);
       console.log("===>onMessage==>",evt)
       if(evt==null||evt==undefined){
         return;
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index 1bce6ea5..d530411e 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -181,9 +181,9 @@
         @sort-change="handleSortChange"
 
       >
-        <div slot="toolbar" v-if="!disabled">
+        <div slot="toolbar">
           <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+            <el-col :span="1.5"  v-if="!disabled">
               <el-button
                 type="primary"
                 plain
@@ -192,7 +192,7 @@
                 @click="handleAddWayBill"
               >加入运单</el-button>
             </el-col>
-            <el-col :span="1.5">
+            <el-col :span="1.5"  v-if="!disabled">
               <el-button
                 type="primary"
                 plain
@@ -201,6 +201,16 @@
                 :disabled="coMultiple"
               >移除运单</el-button>
             </el-col>
+            <el-col :span="1.5" v-if="this.coData.id!=null">
+              <el-button style="margin-right: 5px;"
+                type="warning"
+                plain
+                 :disabled="single"
+                icon="el-icon-download"
+                size="mini"
+                @click="handleDownBatchDtl"
+              >导出批次明细</el-button>
+            </el-col>
           </el-row>
         </div>
         <el-table-column type="selection" width="55" align="center" />
@@ -237,6 +247,16 @@
             <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
           </template>
         </el-table-column>
+        <el-table-column :label="$t('报关方式')" align="center" prop="customsEclaration" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_declare_mode" :value="scope.row.customsEclaration"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.customsClear"/>
+          </template>
+        </el-table-column>
         <!-- <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="80" /> -->
         <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="80">
           <template slot-scope="scope">
@@ -319,7 +339,7 @@ export default {
 
   },
   components: { EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView},
-  dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status'],
+  dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status','emis_declare_mode','emis_customs_clear'],
   data() {
     return {
       // 遮罩层
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
index 433b85ef..58f35ccf 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
@@ -176,9 +176,9 @@
             </el-table-column>
             <el-table-column :label="$t('承运重量')" align="center" prop="transWeight" min-width="100" />
             <el-table-column :label="$t('包裹数')" align="center" prop="packNum" min-width="100" />
-            <el-table-column :label="$t('发出时间')" align="center" prop="carTime" min-width="100" >
+            <el-table-column :label="$t('发出时间')" align="center" prop="etd" min-width="100" >
               <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.carTime, '{y}-{m}-{d}') }}</span>
+                <span>{{ parseTime(scope.row.etd, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
             <!-- <el-table-column :label="$t('异常信息')" align="center" prop="remark" min-width="170">
@@ -578,8 +578,8 @@ export default {
     exportDataDtl(batchName,selData,loadingInstance){
       const curList =selData
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['运单号','寄件国家','目的国家','线路','产品类型','预计到达时间','总件数','实际重量','总体积','体积重量','结算重量','收件人','收件公司','取件方式','付款方式','运费','寄件人','寄件公司','录单备注','寄件网点'];
-        const filterVal = [''];
+        const tHeader = ['运单号','寄件国家','目的国家','线路','产品类型','预计到达时间','总件数','实际重量','总体积','体积重量','结算重量','收件人','收件公司','取件方式','付款方式','运费','寄件人','寄件公司','录单备注','寄件网点','清关方式','报关方式'];
+        const filterVal = ['billCode','sendCountryName','receiveCountryName','transLineTypeName','productTypeName','estimateDate','parcelQty','billWeight','totalVolume','volumeWeight','settlementWeight','receiveName','receiveCompany','pickupMethod','paymentType','freight','sendName','sendCompany','remark','sendSiteName','customsClear','customsEclaration'];
         const data = this.formatJsonDtl(filterVal, curList, selData)
         excel.export_json_to_excel({
           header: tHeader,