From e8589d9dc45a43a69af861002139670193d01b92 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 13 Jul 2023 16:26:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E5=A1=AB=E6=8A=A5=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=BA=95=E4=B8=8B=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=B5=84=E8=B4=A8=E8=AE=BE=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=A7=E5=9C=B0=E9=80=89=E9=A1=B9=E6=98=BE=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/productCategory.vue | 29 ++++++++++++++++++---
 src/views/purchase/cert/supCertSet.vue      |  9 ++++++-
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue
index 24b9bcc0..a633e0da 100644
--- a/src/views/basic/product/productCategory.vue
+++ b/src/views/basic/product/productCategory.vue
@@ -1330,7 +1330,22 @@
           </el-form>
         </el-card>
       </el-dialog>
-
+      <el-dialog
+        title="耗材字典-选择DI版本"
+        :visible.sync="selectVersionVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="85%"
+        v-if="selectVersionVisible"
+      >
+        <selectUdiVersion
+          :closeDialog="closeDialog"
+          :relId="relId"
+          :uuid="uuid"
+          :originUuid="originUuid"
+          @closeUdi="closeUdi"
+        ></selectUdiVersion>
+      </el-dialog>
 
     </el-card>
   </div>
@@ -1339,7 +1354,6 @@
 <script>
 
 import {filterByUuid} from "@/api/basic/product/udiInfo";
-
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 
@@ -1356,10 +1370,12 @@ import {
 } from "@/api/basic/basicProductType";
 import {thirdSysDetail} from "@/api/basic/product/udiRelevance";
 import {finProductSet} from "@/api/param/systemParamConfig";
+import selectUdiVersion from './UdiinfoSelectVersion'
 
 export default {
   data() {
     return {
+      selectVersionVisible: false,
       useNumEnable: true,
       checked: false,
       sysList: [],
@@ -1399,6 +1415,12 @@ export default {
   },
   filters: {},
   methods: {
+    selectVersion() {
+      this.selectVersionVisible = true;
+      this.uuid = this.editQuery.uuid;
+      this.originUuid = this.editQuery.originUuid;
+      this.relId = this.editQuery.id;
+    },
     onReset() {
       this.$router.push({
         path: "",
@@ -1453,6 +1475,7 @@ export default {
       this.isImport = false;
       this.thisData = row;
       this.editDialogVisible = true;
+      console.log("row.uuid="+this.uuid)
 
       this.pId = row.id;
       this.relevanceEdit = {
@@ -1724,7 +1747,7 @@ export default {
   mounted() {
   },
   components: {
-    Treeselect, selectProduct,
+    Treeselect, selectProduct,selectUdiVersion,
   },
   created() {
     this.getList();
diff --git a/src/views/purchase/cert/supCertSet.vue b/src/views/purchase/cert/supCertSet.vue
index 94f9434e..bfc7cb2e 100644
--- a/src/views/purchase/cert/supCertSet.vue
+++ b/src/views/purchase/cert/supCertSet.vue
@@ -309,7 +309,7 @@
 
                     <el-row>
                         <el-col :span="11">
-                            <el-form-item label="产地：" prop="require">
+                            <el-form-item label="产地：" prop="imports">
                                 <el-select v-model="currentProduct.imports" style="width: 90%">
                                     <el-option label="全部" value="1"></el-option>
                                     <el-option label="国外" value="2"></el-option>
@@ -653,6 +653,13 @@ export default {
         handleProductEdit(row) {
             this.formProductName = "update";
             this.currentProduct = row;
+            if (row.imports == '1') {
+              this.currentProduct.imports = '全部'
+            }else if (row.imports == '2'){
+              this.currentProduct.imports = '国外'
+            }else if (row.imports == '3'){
+              this.currentProduct.imports = '国内'
+            }
             this.addProductDialogVisible = true;
 
             this.classifyFirstSearch(this.currentProduct.flbm);