From 1187779bb54c8b22731c736eb26f3a285bf24dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Tue, 18 Jul 2023 09:14:23 +0800
Subject: [PATCH] =?UTF-8?q?=20=E7=94=9F=E6=88=90=E4=B8=8D=E4=BA=86?=
 =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E7=9A=84=E5=86=85=E9=83=A8=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=9A=E8=87=AA=E5=8A=A8=E5=8F=98=E6=88=90=E4=B8=80=E7=BA=A7?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E9=83=A8=E7=A0=81=EF=BC=88=E7=89=87=E4=BB=94?=
 =?UTF-8?q?=E7=99=80=E8=AF=8A=E6=96=AD=E5=92=8C=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=83=BD=E6=9C=89=E8=BF=99=E4=B8=AA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/inner/innerOrderEditDialog.vue    | 4 ++++
 src/views/inventory/inner/innerOrderSelectProduct.vue | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index 66309fc7..0d7636b7 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -49,6 +49,7 @@
           <el-table-column label="规格型号" prop="spec"  show-overflow-tooltip></el-table-column>
           <el-table-column label="计量单位" prop="measname"  show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业"  prop="manufactory" show-overflow-tooltip></el-table-column>
+          <el-table-column label="最小销售产品标识" prop="nameCode" width="140" v-if="showColumn"></el-table-column>
           <el-table-column label="单据数量">
             <template slot-scope="scope">
               <el-input size="small" v-model="scope.row.count"
@@ -160,6 +161,7 @@ export default {
   },
   data() {
     return {
+      showColumn: false,
       code: "",
       query: {
         orderIdFk: "",
@@ -174,6 +176,7 @@ export default {
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
+        packLevel:null,
       },
       formRules: {},
       codeArray: [],
@@ -437,6 +440,7 @@ export default {
         deptCode: null,
         locStorageCode: null,
         invWarehouseCode: null,
+        nameCode:null,
       };
       this.orderEditor = false;
     }
diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue
index ff4aaed3..4117d228 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -224,6 +224,8 @@ export default {
       certList: [],
       dialogFormVisible: false,
       multipleSelection: null,
+      nameCode:null,
+
     };
   },
   methods: {
@@ -339,6 +341,7 @@ export default {
       let tQuery = {
         productId: this.multipleSelection.rlId,
         productName: this.multipleSelection.cpmctymc,
+        nameCode: this.multipleSelection.nameCode,
         count: 1,
         orderIdFk: this.billNo,
         supId: this.multipleSelection.customerId,