From 1301c462e3479817f84800ce4b989098df1767f1 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 28 Oct 2024 10:13:39 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=8D=AF=E5=93=81=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/relCode/operateRelCode.vue      | 6 +++---
 src/views/collect/relCode/operateRelCodeSpell.vue | 6 +++---
 src/views/collect/relCode/relCode.vue             | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/collect/relCode/operateRelCode.vue b/src/views/collect/relCode/operateRelCode.vue
index 299d3299..26616994 100644
--- a/src/views/collect/relCode/operateRelCode.vue
+++ b/src/views/collect/relCode/operateRelCode.vue
@@ -16,7 +16,7 @@
             </div>
             <div style="margin-left: auto;">
               <el-button size="mini" type="primary" @click.native="giveUp()" :loading="submitLoading"
-                         style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailList.length == 0"
+                         style="margin-right: 8px;border-radius: 5%;" :disabled="parentCode || this.detailList.length == 0"
               >清空
               </el-button>
               <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
@@ -352,7 +352,7 @@
       },
       popCloseDialog() {
         this.popDialogVisible = false;
-        this.$refs.inputRef.focus();
+
 
         if( this.bhxjsl === this.syxjsl){
           this.$confirm("该层级已录入完成, 是否关闭?", "提示", {
@@ -367,7 +367,7 @@
             .catch(() => {
             });
         }
-
+        this.$refs.inputRef.focus();
       },
       //添加条码
       addCode() {
diff --git a/src/views/collect/relCode/operateRelCodeSpell.vue b/src/views/collect/relCode/operateRelCodeSpell.vue
index a211986f..0e19f709 100644
--- a/src/views/collect/relCode/operateRelCodeSpell.vue
+++ b/src/views/collect/relCode/operateRelCodeSpell.vue
@@ -20,7 +20,7 @@
                 >拼箱
                 </el-button>
                 <el-button size="mini" type="primary" @click.native="giveUp()" :loading="submitLoading"
-                           style="margin-right: 8px;border-radius: 5%;" :disabled="this.detailList.length == 0"
+                           style="margin-right: 8px;border-radius: 5%;" :disabled="parentCode || this.detailList.length == 0"
                 >清空
                 </el-button>
                 <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
@@ -364,7 +364,7 @@
       },
       popCloseDialog() {
         this.popDialogVisible = false;
-        this.$refs.inputRef.focus();
+
 
         if( this.bhxjsl === this.syxjsl){
           this.$confirm("该层级已录入完成, 是否关闭?", "提示", {
@@ -379,7 +379,7 @@
             .catch(() => {
             });
         }
-
+        this.$refs.inputRef.focus();
       },
       //添加条码
       addCode() {
diff --git a/src/views/collect/relCode/relCode.vue b/src/views/collect/relCode/relCode.vue
index e7a45c58..918563bc 100644
--- a/src/views/collect/relCode/relCode.vue
+++ b/src/views/collect/relCode/relCode.vue
@@ -83,6 +83,7 @@
                 style="width: 100%"   row-key="id" >
         <el-table-column label="序号" type="index" width="60"></el-table-column>
         <el-table-column label="产品编码" prop="productCode"></el-table-column>
+        <el-table-column label="包装规格" prop="packUnit"></el-table-column>
         <el-table-column label="装箱类型" prop="packageSpec"></el-table-column>
         <el-table-column label="批次号" prop="batchNo"></el-table-column>
         <el-table-column label="生产日期" prop="madeDate"></el-table-column>