From ec4d3fb8ce718e4ae34cb5ca30f791b351246a92 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 27 Dec 2024 15:54:10 +0800
Subject: [PATCH] md

---
 package.json                                              | 1 +
 src/views/emis/customerService/traceWaybillDetailView.vue | 6 +++---
 src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue | 6 +++---
 src/views/emis/emisWaybill/sendWaybillList.vue            | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 0633c850..44051a80 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "codemirror": "^6.0.1",
     "coordtransform": "^2.1.2",
     "core-js": "^3.32.1",
+    "custom-event-polyfill": "^1.0.7",
     "dayjs": "^1.11.10",
     "default-passive-events": "^2.0.0",
     "echarts": "4.9.0",
diff --git a/src/views/emis/customerService/traceWaybillDetailView.vue b/src/views/emis/customerService/traceWaybillDetailView.vue
index ae70dd82..9f5765f0 100644
--- a/src/views/emis/customerService/traceWaybillDetailView.vue
+++ b/src/views/emis/customerService/traceWaybillDetailView.vue
@@ -30,9 +30,9 @@
       <div style="width:20%;font-size: 11px;color: gray; padding: 0px 10px;display: inline-flex;">
         <div>
             <div style="text-align: center;">
-            <ImagePreview height="50px" v-for="pic in (billDetail.billPicSendRmk.split(',') )" :key="pic" :src="pic" >
-            </ImagePreview>
-          </div>
+              <ImagePreview height="50px" v-for="pic in (billDetail.billPicSendRmk.split(',') )" :key="pic" :src="pic" >
+              </ImagePreview>
+            </div>
           <div style="text-align: center;">
             揽收底单
           </div>
diff --git a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
index 2a295a1c..adc4f508 100644
--- a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
+++ b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
@@ -223,9 +223,9 @@
       <el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('进仓状态')" align="center" prop="status" min-width="100" >
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.status=='0'" type="info">未入库</el-tag>
-                <el-tag v-if="scope.row.status=='1'" type="success">已入仓</el-tag>
-                <el-tag v-if="scope.row.status=='2'" type="warning">部分入仓</el-tag>
+                <el-tag v-if="scope.row.stockInFlag=='0'" type="info">未入仓</el-tag>
+                <el-tag v-if="scope.row.stockInFlag=='1'" type="success">已入仓</el-tag>
+                <el-tag v-if="scope.row.stockInFlag=='2'" type="warning">部分入仓</el-tag>
               </template>
       </el-table-column>
 
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 877c6e0b..5d6a9382 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -428,7 +428,7 @@
               <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>
       <el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" width="80" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :show-overflow-tooltip="true"/>