From 388daad59d20da84118067593fc88a89e3f8c9d8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 07 七月 2023 17:59:50 +0800
Subject: [PATCH] 主题库7-7完善发现bug

---
 Source/UBCS-WEB/src/views/modeling/original.vue |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/modeling/original.vue b/Source/UBCS-WEB/src/views/modeling/original.vue
index 805e99f..73f81c0 100644
--- a/Source/UBCS-WEB/src/views/modeling/original.vue
+++ b/Source/UBCS-WEB/src/views/modeling/original.vue
@@ -17,7 +17,7 @@
             </el-button>
             <el-button size="small" plain type="primary" icon="el-icon-zoom-in" @click="applyRangeOpen">鏌ョ湅浣跨敤鑼冨洿
             </el-button>
-            <el-input placeholder="鎸夊睘鎬ц嫳鏂囧悕绉版煡璇�" v-model="searchId" clearable prefix-icon="el-icon-search" class="attrSearch"
+            <el-input placeholder="鎸夊睘鎬х紪鍙锋煡璇�" v-model="searchId" clearable prefix-icon="el-icon-search" class="attrSearch"
               size="small" @change="doSearch" type="text"></el-input>
             <el-button size="small" plain type="primary" icon="el-icon-search" @click="doSearch">&nbsp;鎼滅储</el-button>
           </template>
@@ -122,14 +122,14 @@
                 <template slot="label">
                   鏋氫妇绫诲瀷
                 </template>
-                {{ itemForm.itemData.dictCode }}
+                {{ itemForm.itemData.dictValue }}
               </el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
         </el-tabs>
       </basic-container>
     </el-aside>
-    <originalAdd ref="originalAdd" @refreshTable="refreshChange"></originalAdd>
+    <originalAdd ref="originalAdd" @refreshTable="refreshChange" :attribute="editAttribute"></originalAdd>
   </el-container>
 </template>
 
@@ -141,6 +141,7 @@
   update, getPage, getApplyRange
 } from "@/api/omd/OmdAttribute";
 import Versionpackage from "./Versionpackage.vue";
+import {getDictionary} from "@/api/omd/enum";
 
 export default {
   name: "original",
@@ -157,7 +158,7 @@
       attribute: {
         nullable: true
       },
-      editAttibute: {},
+      editAttribute: {},
       applyRangeData: [],
       option: {
         height: "550px",
@@ -250,6 +251,8 @@
       itemForm: {
         itemData: {},
         activeName: "referTab",
+        enumInitFlag:false,
+        referInitFlag: false,
         form: {}
       },
       searchId: '',
@@ -268,18 +271,22 @@
     updateSave(row,index) {
       this.selectRow = index;
       var json = JSON.stringify(row);
-      this.editAttibute = JSON.parse(json);
-      this.editAttibute.nullable = row.nullable == 'true' ? true : false;
-      this.$refs.originalAdd.attribute = this.editAttibute;
+      this.editAttribute = JSON.parse(json);
+      this.editAttribute.nullable = row.nullable == 'true' ? true : false;
+      this.$refs.originalAdd.attribute = this.editAttribute;
       this.$refs.originalAdd.showSubmitDialog = true;
-      this.refreshChange()
+      this.checkUsingReferDict(row);
+      this.$refs.originalAdd.activeName = this.itemForm.activeName;
+      this.$refs.originalAdd.enumInitFlag = this.itemForm.enumInitFlag;
+      this.$refs.originalAdd.referInitFlag = this.itemForm.referInitFlag;
+      // this.refreshChange()
     },
     deleteSave(row,index) {
       console.log(row);
       remove(row.oid).then(res => {
         this.$message.success("鍒犻櫎鎴愬姛");
+        this.refreshChange();
       });
-      this.refreshChange();
     },
     onLoad(page, params = {}) {
       this.loading = true;
@@ -296,6 +303,27 @@
       this.itemForm.itemData = row;
       this.selectRow = row.$index;
       this.attribute = row;
+      this.checkUsingReferDict(row);
+    },
+    checkUsingReferDict(row){
+      if (row.referToId !== null && row.referToId !== ""){
+        this.itemForm.activeName = 'referTab';
+        this.itemForm.referInitFlag = true;
+        this.itemForm.enumInitFlag = false;
+      }else if (row.usingDict === 'true'){
+        this.itemForm.activeName = 'enumTab';
+        this.itemForm.referInitFlag = false;
+        this.itemForm.enumInitFlag = true;
+        getDictionary({code: row.dictCode}).then(res => {
+          this.editAttribute.dictValue = res.data.data[0].label;
+          this.itemForm.itemData.dictValue = this.editAttribute.dictValue;
+          this.$refs.originalAdd.dictEnums = res.data.data;
+        })
+      }else {
+        this.itemForm.activeName = 'referTab';
+        this.itemForm.referInitFlag = true;
+        this.itemForm.enumInitFlag = false;
+      }
     },
     selectBtmType() {
       this.referType.display = true;

--
Gitblit v1.9.3