From 41ebf3fc0a3409dde68b415e04ea0926331a2040 Mon Sep 17 00:00:00 2001
From: "Mr.sun" <2290907227@qq.com>
Date: Tue, 9 Apr 2024 14:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=81=E5=AE=9A=E5=BA=93=E5=AD=98=E5=8A=A0?=
 =?UTF-8?q?=E7=AE=B1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apply/ProductBatchNumberLocked.vue        |  3 ++-
 .../inventoryLock/apply/ProductLock.vue       |  3 ++-
 .../inventoryLock/apply/config.js             | 21 +++++++++++++++++++
 .../apply/heLotNumberOfTheProductIsLocked.vue |  3 ++-
 .../libraryManage/lockOutStore/index.vue      |  4 ++--
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/views/libraryManage/inventoryLock/apply/ProductBatchNumberLocked.vue b/src/views/libraryManage/inventoryLock/apply/ProductBatchNumberLocked.vue
index 7f92e97..36a391c 100644
--- a/src/views/libraryManage/inventoryLock/apply/ProductBatchNumberLocked.vue
+++ b/src/views/libraryManage/inventoryLock/apply/ProductBatchNumberLocked.vue
@@ -249,7 +249,8 @@ export default {
               stockId: ele.stockId,
               reason: ele.reason,
               userName: this.enterForm.userId,
-              lockType: 'batchNo'
+              lockType: 'batchNo',
+              containerCode: ele.containerCode
             }
           })
           add(arr).then((res) => {
diff --git a/src/views/libraryManage/inventoryLock/apply/ProductLock.vue b/src/views/libraryManage/inventoryLock/apply/ProductLock.vue
index d49f75a..aaef86a 100644
--- a/src/views/libraryManage/inventoryLock/apply/ProductLock.vue
+++ b/src/views/libraryManage/inventoryLock/apply/ProductLock.vue
@@ -247,7 +247,8 @@ export default {
               stockId: ele.stockId,
               reason: ele.reason,
               userName: this.enterForm.userId,
-              lockType: 'batchNoLocation'
+              lockType: 'batchNoLocation',
+              containerCode: ele.containerCode
             }
           })
           add(arr).then((res) => {
diff --git a/src/views/libraryManage/inventoryLock/apply/config.js b/src/views/libraryManage/inventoryLock/apply/config.js
index d39603a..fb1a49c 100644
--- a/src/views/libraryManage/inventoryLock/apply/config.js
+++ b/src/views/libraryManage/inventoryLock/apply/config.js
@@ -32,6 +32,13 @@ export function tableConfig() {
         "min-width": 120,
         "show-overflow-tooltip": true,
       },
+      {
+        label: "箱号",
+        prop: "containCode",
+        istrue: true,
+        "min-width": 120,
+        "show-overflow-tooltip": true,
+      },
       {
         label: "单位",
         prop: "unit",
@@ -112,6 +119,13 @@ export function tableConfig() {
         "min-width": 120,
         "show-overflow-tooltip": true,
       },
+      {
+        label: "箱号",
+        prop: "containCode",
+        istrue: true,
+        "min-width": 120,
+        "show-overflow-tooltip": true,
+      },
       {
         label: "商品规格",
         prop: "specifications",
@@ -201,6 +215,13 @@ export function tableConfig() {
         "min-width": 120,
         "show-overflow-tooltip": true,
       },
+      {
+        label: "箱号",
+        prop: "containCode",
+        istrue: true,
+        "min-width": 120,
+        "show-overflow-tooltip": true,
+      },
       {
         label: "单位",
         prop: "unit",
diff --git a/src/views/libraryManage/inventoryLock/apply/heLotNumberOfTheProductIsLocked.vue b/src/views/libraryManage/inventoryLock/apply/heLotNumberOfTheProductIsLocked.vue
index f95158f..7ce3f7e 100644
--- a/src/views/libraryManage/inventoryLock/apply/heLotNumberOfTheProductIsLocked.vue
+++ b/src/views/libraryManage/inventoryLock/apply/heLotNumberOfTheProductIsLocked.vue
@@ -248,7 +248,8 @@ export default {
               stockId: ele.stockId,
               reason: ele.reason,
               userName: this.enterForm.userId,
-              lockType: 'goods'
+              lockType: 'goods',
+              containerCode: ele.containerCode
             }
           })
           add(arr).then((res) => {
diff --git a/src/views/libraryManage/lockOutStore/index.vue b/src/views/libraryManage/lockOutStore/index.vue
index d3b91cf..ca9302a 100644
--- a/src/views/libraryManage/lockOutStore/index.vue
+++ b/src/views/libraryManage/lockOutStore/index.vue
@@ -433,8 +433,8 @@ export default {
         id: tempRow.id,
         batch: tempRow.batch,
         ptPart: tempRow.ptPart,
-        lockNo: tempRow.lockNo,
-        containerCode: tempRow.tempRow
+        lockNo: tempRow.lockNo
+        // containerCode: tempRow.tempRow
       }
       this.form = data
       this.open = true