From 0479902b6cc9d23e561a3d6f6dad067dd8edd216 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 25 七月 2023 16:47:21 +0800
Subject: [PATCH] 主题库分类添加修改bug

---
 Source/UBCS-WEB/src/components/Tree/classifyTrees.vue |   34 +++++++++++++++++++---------------
 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue |    2 +-
 Source/UBCS-WEB/vue.config.js                         |    4 ++--
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 2262b41..87b0057 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -445,7 +445,7 @@
           if (this.selectRow.length === 1 && item.lcstatus === "Disabled" && showMessage) {
             this.$message.warning('閫夋嫨鐨勬暟鎹腑鐘舵�佹棤闇�鍐嶆墽琛屽綋鍓嶆搷浣�');
             showMessage = false;
-          }  else if (this.selectRow.length >1 && !hasEditing && showMessage) {
+          }  else if (this.selectRow.length >1 && !hasEditing  && showMessage) {
             this.$message.warning('鎮ㄩ�夋嫨鐨勬暟鎹叏閮ㄤ负銆愬彂甯冪姸鎬併�戞墠鍙互鍙戣捣娴佺▼');
             showMessage = false;
           } else if (this.selectRow.length >= 1 && hasEditing && showMessage) {
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index c40093b..50f38a3 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -33,14 +33,14 @@
             <el-form-item :label="this.TreeFlag ? '鍒嗙被鍚嶇О锛�' :'涓婚搴撳悕绉帮細'" label-width="110px" style="display: inline-block" prop="name">
               <el-input v-model="TreeAddform.name" autocomplete="off" style="width: 170px"></el-input>
             </el-form-item>
+            <el-form-item label="瀛樺偍鐨勪笟鍔$被鍨嬶細" label-width="150px" v-if="TreeFlagCode==false" prop="btmTypeName">
+              <el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px" @focus="btmFoucus"></el-input>
+            </el-form-item>
             <el-form-item label="鎻忚堪锛�" label-width="150px">
               <el-input v-model="TreeAddform.description" autocomplete="off" style="width: 585px"></el-input>
             </el-form-item>
             <el-form-item label="缂栫爜瑙勫垯锛�" label-width="150px">
               <el-input v-model="TreeAddform.codeRuleOidName" autocomplete="off" style="width: 585px" @focus="CodeFoucus"></el-input>
-            </el-form-item>
-            <el-form-item label="涓氬姟绫诲瀷锛�" label-width="150px" v-if="TreeFlagCode==false">
-              <el-input v-model="TreeAddform.btmTypeName" autocomplete="off" style="width: 585px" @focus="btmFoucus"></el-input>
             </el-form-item>
             <el-form-item label="鍏抽敭灞炴�ф煡璇㈣鍒欙細" label-width="150px">
                 <el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" @focus="Keyfouce"
@@ -352,7 +352,7 @@
       masterSelectList:[],
       masterName:"",
       masterOid:"",
-      //鍏抽敭灞炴��
+      //鍏抽敭灞炴�tmTypeId
       KeydialogVisible:false,
       KeyName:"",
       KeyOid:"",
@@ -404,14 +404,6 @@
       ],
       SelectValue:"",
       SelectFInd:"",
-      rules: {
-        id: [
-          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
-        ],
-        name:[
-          { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
-        ]
-      },
       addFlag:false,
       // 琛ㄦ牸褰撳墠琛宨d
       crudOid:"",
@@ -478,6 +470,17 @@
         codeRuleOidName: "",
         //瀛樺偍鐨勪笟鍔$被鍨�
         btmTypeName: ""
+      },
+      rules: {
+        id: [
+          { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
+        ],
+        name:[
+          { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
+        ],
+        btmTypeName:[
+          { required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷', trigger: 'blur' },
+        ]
       },
       //avue-tree鏁版嵁锛屾殏鏃舵病鏈変綔鐢紝閲岄潰鍔熻兘鐢╡lement鍐欎簡锛屽彧鐢╝vue鐨勪竴涓爲缁勪欢涓嶇敤鍐呯疆琛ㄥ崟浜嗐��
       TreeAvueform: {},
@@ -788,8 +791,8 @@
           'conditionMap[id]':this.SelectFInd
         }
         this.KeydefaultRend(masterParameter);
-        this.SelectValue=""
-        this.SelectFInd=""
+        this.SelectValue="";
+        this.SelectFInd="";
       }else if(this.SelectValue == 'name'){
         const masterParameter={
           'conditionMap[name]':this.SelectFInd
@@ -909,7 +912,7 @@
     btmSelect(row){
       this.btmSelectList=row;
       this.btmName=row[0].name;
-      this.btmOid=row[0].oid;
+      this.btmOid=row[0].id;
     },
     //涓氬姟绫诲瀷鎺ュ彛
     btmdefaultRend(masterParameter){
@@ -1225,6 +1228,7 @@
         });
       } else {
         this.$set(row, "codeclassifyoid", this.nodeClickList.oid)
+        console.log(this.nodeClickList)
         addSave(row).then(() => {
           this.$message({
             type: "success",
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ad43a75..0991057 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,10 @@
     proxy: {
       '/api': {
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
-        target: 'http://localhost:37000',
+        // target: 'http://localhost:37000',
         // target: 'http://192.168.1.51:37000',
         // target: 'http://192.168.1.46:37000',
-        // target: 'http://dev.vci-tech.com:37000',
+        target: 'http://dev.vci-tech.com:37000',
         // target: 'http://192.168.1.51:37000/',
         // target: 'http://192.168.1.104:37000',
         // target: 'http://192.168.1.63:37000',

--
Gitblit v1.9.3