From 1593b448a38f05ef3f012137d1b33b038ff6ebab Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com>
Date: Wed, 26 Jun 2024 15:12:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=89=E6=95=88=E6=9C=9F?=
 =?UTF-8?q?=E5=A4=A9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/material/seekByNum.vue | 41 +++++++++++++++++-------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/material/seekByNum.vue b/src/views/modules/material/seekByNum.vue
index 00c5e12..3268577 100644
--- a/src/views/modules/material/seekByNum.vue
+++ b/src/views/modules/material/seekByNum.vue
@@ -65,7 +65,6 @@
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
-
     </el-table>
 
     <el-pagination
@@ -186,7 +185,7 @@ export default {
           serialNumber: '200003TableWarehouseId',
           tableId: "200003Table",
           tableName: "仓位编码",
-          columnWidth: 150,
+          columnWidth: 130,
           columnProp: 'warehouseID',
           headerAlign: 'left',
           align: "left",
@@ -204,7 +203,7 @@ export default {
           serialNumber: '200003TablePartNo',
           tableId: "200003Table",
           tableName: "物料编码",
-          columnWidth: 150,
+          columnWidth: 130,
           columnProp: 'partNo',
           headerAlign: 'left',
           align: "left",
@@ -222,7 +221,7 @@ export default {
           serialNumber: '200003TablePartDesc',
           tableId: "200003Table",
           tableName: "料号描述",
-          columnWidth: 150,
+          columnWidth: 130,
           columnProp: 'partDesc',
           headerAlign: 'left',
           align: "left",
@@ -240,7 +239,7 @@ export default {
           serialNumber: '200003TableNum',
           tableId: "200003Table",
           tableName: "卷数量",
-          columnWidth: 100,
+          columnWidth: 130,
           columnProp: 'num',
           headerAlign: 'right',
           align: "right",
@@ -258,7 +257,7 @@ export default {
           serialNumber: '200003TableTransQty',
           tableId: "200003Table",
           tableName: "出入库数量",
-          columnWidth: 150,
+          columnWidth: 130,
           columnProp: 'transQty',
           headerAlign: 'right',
           align: "right",
@@ -277,7 +276,7 @@ export default {
           serialNumber: '200003TableBatchNo',
           tableId: "200003Table",
           tableName: "批号",
-          columnWidth: 150,
+          columnWidth: 130,
           columnProp: 'batchNo',
           headerAlign: 'left',
           align: "left",
@@ -295,7 +294,7 @@ export default {
           serialNumber: '200003TableLocationID',
           tableId: "200003Table",
           tableName: "库位",
-          columnWidth: 150,
+          columnWidth: 130,
           columnProp: 'locationID',
           headerAlign: 'left',
           align: "left",
@@ -313,7 +312,7 @@ export default {
           serialNumber: '200003TableWdrNo',
           tableId: "200003Table",
           tableName: "W/D/R",
-          columnWidth: 150,
+          columnWidth: 130,
           columnProp: 'wdrNo',
           headerAlign: 'left',
           align: "left",
@@ -331,7 +330,7 @@ export default {
           serialNumber: '200003TableManufactureDate',
           tableId: "200003Table",
           tableName: "生产日期",
-          columnWidth: 150,
+          columnWidth: 130,
           columnProp: 'manufactureDate',
           headerAlign: 'center',
           align: "center",
@@ -349,7 +348,7 @@ export default {
           serialNumber: '200003TableEnterDate',
           tableId: "200003Table",
           tableName: "录入时间",
-          columnWidth: 150,
+          columnWidth: 130,
           columnProp: 'enterDate',
           headerAlign: 'center',
           align: "center",
@@ -367,7 +366,7 @@ export default {
           serialNumber: '200003TableExpiredDate',
           tableId: "200003Table",
           tableName: "失效日期",
-          columnWidth: 150,
+          columnWidth: 130,
           columnProp: 'expiredDate',
           headerAlign: 'center',
           align: "center",
@@ -379,6 +378,24 @@ export default {
           status: true,
           fixed: '',
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 200003,
+          serialNumber: '200003TableDaysUntilExpired',
+          tableId: "200003Table",
+          tableName: "剩余有效期天数",
+          columnWidth: 130,
+          columnProp: 'daysUntilExpired',
+          headerAlign: 'right',
+          align: "right",
+          columnLabel: '剩余有效期天数',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+        },
       ],
       columnList2:[
         {