From 9d43665776c972f2215a67c5b1472249d2366fe8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 1 Jan 2025 16:07:01 +0800
Subject: [PATCH] md

---
 .../panel/WarehouseInPanel.vue                | 37 ++++++++++++++-----
 .../emis/emisWaybill/sendWaybillList.vue      | 10 ++++-
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
index eb046792..238c1f2a 100644
--- a/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
+++ b/src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
@@ -54,6 +54,13 @@
                 </el-select>
         </el-form-item>
 
+        <el-form-item   :label="$t('图片上传')" prop="confirmStatus">
+                <el-select  clearable v-model="queryParams.params.blUploadGoodsPic" placeholder="">
+                    <el-option key="1" label="已上传" value="1"></el-option>
+                    <el-option key="0" label="未上传" value="0"></el-option>
+                </el-select>
+        </el-form-item>
+
 
 
                     <el-form-item label="寄件人" prop="sendName">
@@ -186,19 +193,28 @@
       <!-- <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">
-                <el-tag v-if="scope.row.confirmStatus=='0'" type="info">未确认</el-tag>
-                <el-tag v-if="scope.row.confirmStatus=='1'" type="success">已确认</el-tag>
-                <el-tag v-if="scope.row.confirmStatus=='2'" type="warning">部分确认</el-tag>
-              </template>
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.confirmStatus=='0'" type="info">未确认</el-tag>
+          <el-tag v-if="scope.row.confirmStatus=='1'" type="success">已确认</el-tag>
+          <el-tag v-if="scope.row.confirmStatus=='2'" type="warning">部分确认</el-tag>
+        </template>
       </el-table-column>
       <el-table-column :label="$t('确认时间')" align="center" prop="confirmDate" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('进仓状态')" align="center" prop="stockInFlag" min-width="100" >
-              <template slot-scope="scope">
-                <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>
+        <template slot-scope="scope">
+          <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>
+      <el-table-column :label="$t('总件数')" align="center" prop="totalParcelQty" min-width="100" />
+      <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
+      <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
+      <el-table-column :label="$t('图片上传')" align="center" prop="up" min-width="100" >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.waybillDetail.billPicGoodsRmk&&scope.row.waybillDetail.billPicGoodsRmk!=''" type="success">是</el-tag>
+          <el-tag v-else type="danger">否</el-tag>
+        </template>
       </el-table-column>
 
       <el-table-column :label="$t('仓库名称')" align="center" prop="waybillDetail.intoWarehouseName" min-width="80" :show-overflow-tooltip="true"/>
@@ -319,6 +335,7 @@ export default {
           sendName:null,
           sendMobile:null,
           sendCompany:null,
+          blUploadGoodsPic:null
         }
       },
     };
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 10dacc70..4fc3d81e 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -254,10 +254,15 @@
           <el-form-item :label="$t('录单员')" prop="registerManCode">
                 <EmisUserSimplePicker1  :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
           </el-form-item>
+          <el-form-item   :label="$t('图片上传')" prop="confirmStatus">
+              <el-select  clearable v-model="queryParams.params.blUploadGoodsPic" placeholder="">
+                  <el-option key="1" label="已上传" value="1"></el-option>
+                  <el-option key="0" label="未上传" value="0"></el-option>
+              </el-select>
+        </el-form-item>
         </el-col>
       </el-row>
     </SearchForm>
-    <!--XdTable-->
 
     <XdTable
 
@@ -808,7 +813,8 @@ export default {
           problemQueryType:null,
           problemQueryIds:null,
           queryTabType:"1",
-          querySendType:"1"
+          querySendType:"1",
+          blUploadGoodsPic:null,
         }
       },
     };