From fd78596eff3c8c3863836996be3419a0d536197f Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Mon, 3 Jun 2024 15:28:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F=E5=92=8C?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisTmsPack/packageManagement.vue    | 39 +++++++++++++------
 .../emis/emisTmsScanRecord/signAndRecord.vue  |  2 +-
 .../signForModificationAndDeletion.vue        |  2 +-
 .../signatureRecordQuery.vue                  |  2 +-
 .../orderEntryAndReceiptPictureManagement.vue | 28 +++++++++++--
 ...loadThePictureOfTheSendWaybillShipment.vue |  2 +-
 .../uploadThePictureOfTheWaybillSigning.vue   |  2 +-
 7 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index cc166a8f..33e4f299 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -11,7 +11,7 @@
               </el-radio-group>
             </div>
             <el-input
-              v-model="queryParams.packCode"
+              v-model="queryParams.packNo"
               :placeholder="$t('多个合包号逗号可换行隔开')"
               clearable
               type="textarea"
@@ -181,7 +181,7 @@
     </XdTable>
 
     <el-dialog :title="titleForm" :visible.sync="openForm" width="80%" :destroy-on-close="true" @close="handleCancelCo" v-dialogDrag append-to-body>
-      <el-form ref="formCo" size="mini"  :model="coData"  label-width="100px">
+      <el-form ref="formCo" size="mini"  :model="coData"  label-width="100px" class="overflowhidden" >
         <el-row :gutter="20">
           <el-col :span="16">
             <el-col :span="12">
@@ -329,17 +329,29 @@
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
         <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
-        <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
+        <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" min-width="100" />
         <el-table-column :label="$t('扫描状态')" align="center" prop="waybillStatus" min-width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.waybillStatus == "1" ? "是" : "否" }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('扫描时间')" align="center" prop="xxx" min-width="100" />
-        <el-table-column :label="$t('状态')" align="center" prop="xxx" min-width="100" />
-        <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteCode" min-width="100" />
-        <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteCode" min-width="100" />
-        <el-table-column :label="$t('国家')" align="center" prop="destinationCounty" min-width="100" />
+        <el-table-column :label="$t('扫描时间')" align="center" prop="xxx" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(coData.scanDate) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('状态')" align="center" prop="emis_pack_status" min-width="100">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_pack_status" :value="coData.packStatus"/>
+          </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 :label="$t('国家')" align="center" prop="destinationCounty" min-width="100">
+          <template slot-scope="scope">
+            <span>{{ coData.destCountryName }}</span>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('线路')" align="center" prop="transLineType" min-width="100" />
         <el-table-column :label="$t('产品类型')" align="center" prop="productType" min-width="100" />
         <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" />
@@ -362,7 +374,7 @@
 
 
     <el-dialog :title="titleWayBill" :visible.sync="openWayBillForm" width="70%" @close="handleCloseWayBill" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <el-form ref="formCo" size="mini"  :model="wayBillData"  label-width="100px">
+      <el-form ref="formCo" size="mini"  :model="wayBillData"  label-width="100px" class="overflowhidden" >
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="" prop="billCode">
@@ -454,8 +466,8 @@
         <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
         <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100" />
         <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
-        <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteCode" min-width="100" />
-        <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteCode" min-width="100" />
+        <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="destinationCounty" min-width="100" />
         <el-table-column :label="$t('线路')" align="center" prop="transLineType" min-width="100" />
         <el-table-column :label="$t('产品类型')" align="center" prop="productType" min-width="100" />
@@ -969,6 +981,8 @@ export default {
         ;
         this.emisCoPackDetail.push(resList.rows[p].waybillDetail);
       }
+      this.coData.packStatus = this.tempCoPackInfo.packStatus;
+      this.coData.scanDate = this.tempCoPackInfo.scanDate;
       this.computeTotal();
       this.currentId=null;
       this.openForm= true;
@@ -1074,4 +1088,7 @@ export default {
         margin-right: 0;
     }
   }
+   .overflowhidden{
+    overflow: hidden;
+  }
 </style>
diff --git a/src/views/emis/emisTmsScanRecord/signAndRecord.vue b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
index 570af854..dcaa748f 100644
--- a/src/views/emis/emisTmsScanRecord/signAndRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/signAndRecord.vue
@@ -169,7 +169,7 @@
         <el-table-column :label="$t('上传图片')" align="center" prop="picUrls" width="200" >
           <template slot-scope="scope">
             <!-- <span class="ellipsis">{{scope.row.picUrl}}</span> -->
-            <ImagePreview v-for="pic in scope.row.picUrls" :key="pic" :src="pic" ></ImagePreview>
+            <ImagePreview height="50px" v-for="pic in scope.row.picUrls" :key="pic" :src="pic" ></ImagePreview>
           </template>
         </el-table-column> 
         <el-table-column :label="$t('上传网点')" align="center" prop="scanSite" min-width="100" >
diff --git a/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue b/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
index 2ea5fa1f..ad5a9699 100644
--- a/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
+++ b/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
@@ -189,7 +189,7 @@
       </el-table-column>
       <el-table-column :label="$t('签收图片')" align="center" prop="picUrl" min-width="100">
         <template slot-scope="scope">
-          <ImagePreview v-for="pic in (scope.row.picUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
+          <ImagePreview height="50px" v-for="pic in (scope.row.picUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
         </template>
       </el-table-column>
     </xd-table>
diff --git a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
index 3cf94afd..2530a093 100644
--- a/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
@@ -158,7 +158,7 @@
       </el-table-column>
       <el-table-column :label="$t('签收图片')" align="center" prop="picUrl" min-width="100">
         <template slot-scope="scope">
-          <ImagePreview v-for="pic in (scope.row.picUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
+          <ImagePreview height="50px" v-for="pic in (scope.row.picUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
         </template>
       </el-table-column>
     </xd-table>
diff --git a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
index 6a86777f..f0d657ae 100644
--- a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
+++ b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
@@ -87,10 +87,18 @@
       <el-table-column type="selection" width="55" align="center" />
 
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" />
-      <el-table-column :label="$t('图片类型')" align="center" prop="attachType" min-width="100" />
-      <el-table-column :label="$t('图片URL')" align="center" prop="fileUrl" min-width="100" />
-      <el-table-column :label="$t('上传网点')" align="center" prop="createSiteName" min-width="100" />
-      <el-table-column :label="$t('上传人')" align="center" prop="createByName" min-width="100" />
+      <el-table-column :label="$t('图片类型')" align="center" prop="attachType" min-width="100">
+        <template slot-scope="scope">
+          <span>{{ (attachType[scope.row.attachType]) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('图片URL')" align="center" prop="fileUrl" min-width="100">
+        <template slot-scope="scope">
+          <ImagePreview height="50px" v-for="pic in (scope.row.fileUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('上传网点')" align="center" prop="createSite" min-width="100" />
+      <el-table-column :label="$t('上传人')" align="center" prop="createBy" min-width="100" />
       <el-table-column :label="$t('上传时间')" align="center" prop="createTime" min-width="170" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -145,6 +153,11 @@ export default {
 
       dataMap:new Map(),
 
+      attachType:{
+        "1":"寄件底单",
+        "2":"签收底单"
+      },
+
       // 弹出展示层
       currentId:null,
       id:null,
@@ -211,6 +224,13 @@ export default {
       this.tableHeight = window.innerHeight - tableH;
     });
   },
+  mounted() {
+    const end = new Date()
+    const start = new Date()
+    start.setHours(0,0,0,0)
+    end.setHours(23,59,59,0)
+    this.dateTimeRange=[start,end];
+  },
   methods: {
     /** 查询扫描记录列表 */
     getList() {
diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
index 096b1bcc..0f72b6f8 100644
--- a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
+++ b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
@@ -146,7 +146,7 @@ export default {
         record.createTime=getDateTimeToString(new Date());
         record.remark = "";
         record.fileName="寄件底单";
-        record.attachType="2";
+        record.attachType="1";
         record.dataFrom="pc";
         for(let name in size){
           if(name.indexOf(billCode) > -1){
diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
index f4d557b6..4bedc5d6 100644
--- a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
+++ b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
@@ -146,7 +146,7 @@ export default {
         record.createTime=getDateTimeToString(new Date());
         record.remark = "";
         record.fileName="签收底单";
-        record.attachType="3";
+        record.attachType="2";
         record.dataFrom="pc";
         for(let name in size){
           if(name.indexOf(billCode) > -1){