From 3e5f23e945c3b1c49cc4c1f307db9343b564e90e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Wed, 19 Jul 2023 16:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=AF=B9=E5=BA=94=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue
index 3b01296..78a0117 100644
--- a/src/views/inventory/inner/innerOrderEditDialog.vue
+++ b/src/views/inventory/inner/innerOrderEditDialog.vue
@@ -49,7 +49,8 @@
                     <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="单据数量">
+                  <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"
                                       placeholder="请输入数量" style="width: 80%"
@@ -160,6 +161,7 @@ export default {
     },
     data() {
         return {
+            showColumn: false,
             code: "",
             query: {
                 orderIdFk: "",
@@ -174,6 +176,8 @@ export default {
                 deptCode: null,
                 locStorageCode: null,
                 invWarehouseCode: null,
+                packLevel:null,
+                // nameCode:null,
             },
             formRules: {},
             codeArray: [],
@@ -438,6 +442,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 b57b77b..88a4579 100644
--- a/src/views/inventory/inner/innerOrderSelectProduct.vue
+++ b/src/views/inventory/inner/innerOrderSelectProduct.vue
@@ -224,6 +224,7 @@ export default {
       orderEditor: false,
       orderId: "",
       currentCert: null,
+      nameCode:null,
       certList: [],
       dialogFormVisible: false,
       multipleSelection: null,
@@ -342,6 +343,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,