1、2323

Former-commit-id: 66e381a2e8ef70b664fe41696c031eaba932591f

src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java

@@ -221,6 +221,7 @@ public class ResManagerImpl implements ResManager {
                 tree.setResValue(next.getResValue());
                 tree.setValid(next.getValid());
                 tree.setRowVersion(next.getRowVersion());
+                tree.setLabel(next.getResName());
 
                 if (next.getResCode() != null && next.getResCode().split("_").length == level) {
                     allMap.put(tree.getResCode(), tree);
@@ -234,7 +235,7 @@ public class ResManagerImpl implements ResManager {
                         if (Ptree != null) break;
                     }
                     if (Ptree != null) {
-                        Ptree.getChildren().add(tree);
+                        Ptree.addChild(tree);
                     } else {
                         data.add(tree);
                     }

src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java

@@ -48,6 +48,18 @@ public class  ResUpdateRequest extends BaseUpdateRequest {
     @Length(min = 0, max = 255, message = "[resValue]资源内容长度不合法(0-255)")
     private String resValue;
 
+    /**
+     * 上级代码
+     */
+    @Length(min = 0, max = 50, message = "[supCode]上级代码长度不合法(0-50)")
+    private String supCode;
+
+    /**
+     * 上级名称
+     */
+    @Length(min = 0, max = 50, message = "[supName]上级名称长度不合法(0-50)")
+    private String supName;
+
     /**
      * 是否有效
      */
@@ -94,6 +106,22 @@ public class  ResUpdateRequest extends BaseUpdateRequest {
         this.resValue = resValue;
     }
 
+    public String getSupCode() {
+        return this.supCode;
+    }
+
+    public void setSupCode(String supCode) {
+        this.supCode = supCode;
+    }
+
+    public String getSupName() {
+        return this.supName;
+    }
+
+    public void setSupName(String supName) {
+        this.supName = supName;
+    }
+
     public Boolean getValid() {
         return this.valid;
     }

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl

@@ -174,7 +174,6 @@
                 <el-tree
                         style="margin-top: 10px"
                         :data="treeData"
-                        show-checkbox
                         node-key="id"
                         ref="tree"
                         default-expand-all

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl

@@ -79,7 +79,7 @@
                             align="center"
                             prop="valid"
                             label="是否有效"
-                            width="60">
+                            width="80">
                         <template slot-scope="scope">
                             <el-tag size="mini" v-if="scope.row.valid">有效</el-tag>
                             <el-tag size="mini" type="danger" v-if="!scope.row.valid">无效</el-tag>
@@ -87,24 +87,25 @@
                     </el-table-column>
                     <el-table-column
                             align="center"
-                            prop="code"
+                            prop="resCode"
+                            width="100"
                             label="资源代码">
                     </el-table-column>
                     <el-table-column
                             align="center"
-                            prop="value"
+                            prop="resName"
-                            label="资源内容"
+                            label="资源名称">
-                            width="300">
                     </el-table-column>
                     <el-table-column
                             align="center"
-                            prop="comment"
+                            prop="resType"
-                            label="资源描述">
+                            label="资源类型">
                     </el-table-column>
                     <el-table-column
                             align="center"
-                            prop="resType"
+                            prop="resValue"
-                            label="资源类型">
+                            width="200"
+                            label="资源内容">
                     </el-table-column>
                     <el-table-column
                             align="center"
@@ -168,14 +169,13 @@
                 <el-tree
                         style="margin-top: 10px"
                         :data="treeData"
-                        show-checkbox
+                        node-key="resCode"
-                        node-key="id"
                         ref="tree"
                         default-expand-all
                         :filter-node-method="filterTree"
                         :expand-on-click-node="false">
                     <div class="tree" slot-scope="{ node, data }">
-                        <span>{{ data.comment }}<span style="color: #409EFF">[{{data.code}}]</span></span>
+                        <span>{{ data.resName }}<span style="color: #409EFF">[{{data.resCode}}]</span></span>
                         <span>
                              <el-button
                                      icon="el-icon-plus"
@@ -305,7 +305,7 @@
                 this.form.title = "资源新增";
                 this.form.dialog = true;
                 this.form.id = "";
-                this.form.resCode = pItem.code + "_";
+                this.form.resCode = pItem.resCode + "_";
                 this.form.resName = "";
                 this.form.resType = "";
                 this.form.resValue = "";