From 2bea732496b4f5051233ed94e206160992351596 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 15 一月 2025 11:02:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index 47eac93..8bb7e72 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
@@ -78,7 +78,7 @@
             </el-form-item>
             <el-form-item class="is-required">
               <span slot="label">妯″潡鍒悕锛�</span>
-              <el-input v-model="form.alias" :disabled="!editStatus && !addStatus"  placeholder="璇疯緭鍏ユā鍧楀埆鍚嶏紒"></el-input>
+              <el-input v-model="form.alias" :disabled="!editStatus && !addStatus"  placeholder="璇疯緭鍏ユā鍧楀埆鍚�"></el-input>
             </el-form-item>
            <el-form-item class="is-required">
               <span slot="label">搴忓彿锛�</span>
@@ -135,6 +135,10 @@
             <el-form-item label="鍒悕锛�" class="is-required">
               <el-input v-model="form.alias" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
             </el-form-item>
+            <el-form-item label="鍥炬爣锛�">
+              <input-icon v-model="form.source" placeholder="璇烽�夋嫨鍥炬爣">
+              </input-icon>
+            </el-form-item>
             <el-form-item label="缂栧彿锛�" class="is-required">
               <el-input-number v-model="form.sort" :disabled="form.category === 1" :max="63" :min="1"></el-input-number>
             </el-form-item>
@@ -158,7 +162,7 @@
       append-to-body="true"
       class="avue-dialog"
       title="鎿嶄綔鍒嗙被"
-      width="500px"
+      width="900px"
     >
       <avue-crud
         ref="methodsCrud"
@@ -212,13 +216,19 @@
         menu: false,
         height: 500,
         header: false,
-        column: [
-          {
-            label: '鎿嶄綔鍒嗙被',
-            prop: 'name',
-            sortable: true,
-          }
-        ]
+        column: [{
+          label: '鍚嶇О',
+          prop: 'name',
+          width:180,
+          sortable: true,
+        }, {
+          label: '鏍囪瘑',
+          prop: 'code',
+          width:180,
+        }, {
+          label: '鎻忚堪',
+          prop: 'remark'
+        }]
       },
       methodsLoading: false,
       methodsVisble: false,
@@ -235,8 +245,9 @@
         menu: false,
         addBtn: false,
         defaultExpandAll: false,
+        defaultExpandedKeys:['system'],
         props: {
-          label: 'name',
+          label: 'label',
           value: 'id',
           children: 'children',
         },
@@ -250,8 +261,7 @@
             resolve(res.data.data.map(item => {
               return {
                 ...item,
-                id: item.id,
-                name: item.name,
+                label: item.category!=1?item.name:item.alias,
                 leaf: !item.hasChildren,
                 icon: item.source || (node.level === 0?'el-icon-s-home':'el-icon-s-tools'),
                 iconType:item.source?'svg':'iconfont'
@@ -284,7 +294,6 @@
   methods: {
     // 鏍戣鐐瑰嚮
     nodeClick(row, node) {
-      console.log(row.childType);
       this.form = {...row};
       this.nodeRow = {...row};
       this.currentClickNode = node;
@@ -492,6 +501,7 @@
       const params = {
         id: this.form.id,
         isValid: this.form.isValid,
+        source:this.form.source,
         alias: this.form.alias
       }
       updateAlias(params).then(res => {
@@ -542,7 +552,9 @@
           let node = this.currentClickNode.parent;
           node.loaded = false;
           node.expand();
-          this.$refs.tree.setCurrentNode(this.currentClickNode);
+          this.$nextTick(()=>{
+            this.$refs.tree.setCurrentKey(this.currentClickNode.data.id);
+          });
         } else {
           this.refresh = Math.random(); // 鍒锋柊宸︿晶鏍�
         }

--
Gitblit v1.9.3