From ab808ef7bc17d5afb7a32d9e1b953114c8acd551 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 8 Apr 2024 15:38:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8C=BB=E4=BF=9D=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0catalogCode=E7=9B=B8=E5=85=B3=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/product.vue                       | 1 +
 src/views/basic/product/productEdit.vue                   | 2 ++
 src/views/supplier/company/basicCompanyProductsImport.vue | 3 +++
 src/views/supplier/company/basicCompanyproductEdit.vue    | 3 +++
 src/views/supplier/products/supAddDiProductSelectUdi.vue  | 4 ++++
 5 files changed, 13 insertions(+)

diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 50bde9d..abd1133 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -1841,6 +1841,7 @@ export default {
         packUnit: null,
         measname: null,
         nameCode: null,
+        catalogcode: "",
         catalogname1: "",
         catalogname2: "",
         catalogname3: "",
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index c15705b..7759f1d 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -809,12 +809,14 @@ export default {
       getYbHcflDetail(query).then((response) => {
         if (response.code == 20000) {
           this.ybHcflDetail = response.data
+          this.editQuery.catalogcode = this.ybHcflDetail.catalogcode
           this.editQuery.catalogname1 = this.ybHcflDetail.catalogname1
           this.editQuery.catalogname2 = this.ybHcflDetail.catalogname2
           this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
           this.editQuery.matrial = this.ybHcflDetail.matrial
           this.$forceUpdate();
         }else {
+          this.editQuery.catalogcode = ""
           this.editQuery.catalogname1 = ""
           this.editQuery.catalogname2 = ""
           this.editQuery.catalogname3 = ""
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index 49c9fce..a13ca14 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -777,6 +777,7 @@ export default {
         basicPrductRemak6: null,
         basicPrductRemak7: null,
         basicPrductRemak8: null,
+        catalogcode: null,
         catalogname1: null,
         catalogname2: null,
         catalogname3: null,
@@ -833,12 +834,14 @@ export default {
       getYbHcflDetail(query).then((response) => {
         if (response.code == 20000) {
           this.ybHcflDetail = response.data
+          this.repEditQuery.catalogcode = this.ybHcflDetail.catalogcode
           this.repEditQuery.catalogname1 = this.ybHcflDetail.catalogname1
           this.repEditQuery.catalogname2 = this.ybHcflDetail.catalogname2
           this.repEditQuery.catalogname3 = this.ybHcflDetail.catalogname3
           this.repEditQuery.matrial = this.ybHcflDetail.matrial
           this.$forceUpdate();
         }else {
+          this.repEditQuery.catalogcode = ""
           this.repEditQuery.catalogname1 = ""
           this.repEditQuery.catalogname2 = ""
           this.repEditQuery.catalogname3 = ""
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 9fb5fd9..7851584 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -408,12 +408,14 @@ export default {
       getYbHcflDetail(query).then((response) => {
         if (response.code == 20000) {
           this.ybHcflDetail = response.data
+          this.editQuery.catalogcode = this.ybHcflDetail.catalogcode
           this.editQuery.catalogname1 = this.ybHcflDetail.catalogname1
           this.editQuery.catalogname2 = this.ybHcflDetail.catalogname2
           this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
           this.editQuery.matrial = this.ybHcflDetail.matrial
           this.$forceUpdate();
         }else {
+          this.editQuery.catalogcode = ""
           this.editQuery.catalogname1 = ""
           this.editQuery.catalogname2 = ""
           this.editQuery.catalogname3 = ""
@@ -455,6 +457,7 @@ export default {
         basicPrductRemak6: this.editQuery.basicPrductRemak6,
         basicPrductRemak7: this.editQuery.basicPrductRemak7,
         basicPrductRemak8: this.editQuery.basicPrductRemak8,
+        catalogcode: this.editQuery.catalogcode,
         catalogname1: this.editQuery.catalogname1,
         catalogname2: this.editQuery.catalogname2,
         catalogname3: this.editQuery.catalogname3,
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index d9ea265..1194127 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -507,6 +507,7 @@ export default {
         uuids: null,
         devKeys: [],
         customerId: store.getters.customerId,
+        catalogcode: null,
         catalogname1: null,
         catalogname2: null,
         catalogname3: null,
@@ -530,12 +531,14 @@ export default {
       getYbHcflDetail(query).then((response) => {
         if (response.code == 20000) {
           this.ybHcflDetail = response.data
+          this.editQuery.catalogcode = this.ybHcflDetail.catalogcode
           this.editQuery.catalogname1 = this.ybHcflDetail.catalogname1
           this.editQuery.catalogname2 = this.ybHcflDetail.catalogname2
           this.editQuery.catalogname3 = this.ybHcflDetail.catalogname3
           this.editQuery.matrial = this.ybHcflDetail.matrial
           this.$forceUpdate();
         }else {
+          this.editQuery.catalogcode = ""
           this.editQuery.catalogname1 = ""
           this.editQuery.catalogname2 = ""
           this.editQuery.catalogname3 = ""
@@ -675,6 +678,7 @@ export default {
         uuids: null,
         devKeys: [],
         customerId: store.getters.customerId,
+        catalogcode: null,
         catalogname1: null,
         catalogname2: null,
         catalogname3: null,