Merge branch 'master' of http://git.ius.plus/denny.zhao/VinnoManagementSystem

VinnoManagementSystem/src/views/adminManage/adminAuthority.vue

@@ -25,13 +25,13 @@
             @node-click="menuClick"
             @node-drop="nodeDrop"
           >
-            <template #default="{ node, data }">
+            <template #default="{ node }">
               <span class="custom-tree-node el-tree-node__label">
                 <span class="label">
                   {{ node.label }}
                 </span>
                 <span class="do">
-                  <el-icon @click.stop="add(node, data)"
+                  <el-icon @click.stop="add(node, true)"
                     ><el-icon-plus
                   /></el-icon>
                 </span>
@@ -118,11 +118,15 @@ export default {
       return targetText.indexOf(value) !== -1;
     },
     //增加
-    async add(node) {
+    async add(node, checkFather) {
+      var featherCode = node?.data?.Id;
+      if (checkFather && !featherCode) {
+        return;
+      }
       var newMenuData = {
         MenuId: common.guid(),
         Label: `未命名${newMenuIndex++}`,
-        FatherCode: node?.data?.Id,
+        FatherCode: featherCode,
       };
       this.$refs.menu.append(newMenuData, node);
       this.$refs.menu.setCurrentKey(newMenuData.MenuId);

VinnoManagementSystem/src/views/adminManage/saveAdmin.vue

@@ -27,6 +27,7 @@
           clearable
           :placeholder="$t('admin.password1')"
           style="width: 60%"
+          type="password"  show-password
         ></el-input>
       </el-form-item>
       <el-form-item v-if="mode == 'add'" :label="$t('admin.password2')">
@@ -35,6 +36,7 @@
           clearable
           :placeholder="$t('admin.password2')"
           style="width: 60%"
+          type="password" show-password
         ></el-input>
       </el-form-item>
       <el-form-item :label="$t('admin.fullName')">
@@ -137,7 +139,7 @@ export default {
             res = await this.$API.adminManage.modifyAdmin.post(this.form);
           }
           this.isSaveing = false;
-          if (res==true) {
+          if (res == true) {
             this.$emit("success");
             this.visible = false;
             this.$message.success(this.$t("response.operateSuccess"));
@@ -154,7 +156,7 @@ export default {
       var res = await this.$API.wing.post("FindAdminByCodeAsync", {
         AdminCode: data.AdminCode,
       });
-	  this.form.AdminCode = data.AdminCode;
+      this.form.AdminCode = data.AdminCode;
       this.form.AdminName = res.AdminName;
       this.form.AdminFullName = res.FullName;
       if (res.RoleCodes != null && res.RoleCodes.length > 0) {

VinnoManagementSystem/src/views/adminManage/saveAuthority.vue

@@ -104,6 +104,7 @@ export default {
     },
     //表单注入数据
     setData(data, authorityList) {
+      this.isEdit = false;
       if (data.Id) {
         this.isEdit = true;
         authorityList = authorityList.filter((x) => x.Key != data.Id);

VinnoManagementSystem/src/views/userManage/authority.vue

@@ -25,13 +25,13 @@
             @node-click="menuClick"
             @node-drop="nodeDrop"
           >
-            <template #default="{ node, data }">
+            <template #default="{ node }">
               <span class="custom-tree-node el-tree-node__label">
                 <span class="label">
                   {{ node.label }}
                 </span>
                 <span class="do">
-                  <el-icon @click.stop="add(node, data)"
+                  <el-icon @click.stop="add(node, true)"
                     ><el-icon-plus
                   /></el-icon>
                 </span>
@@ -118,11 +118,15 @@ export default {
       return targetText.indexOf(value) !== -1;
     },
     //增加
-    async add(node) {
+    async add(node, checkFather) {
+      var featherCode = node?.data?.Id;
+      if (checkFather && !featherCode) {
+        return;
+      }
       var newMenuData = {
         MenuId: common.guid(),
         Label: `未命名${newMenuIndex++}`,
-        FatherCode: node?.data?.Id,
+        FatherCode: featherCode,
       };
       this.$refs.menu.append(newMenuData, node);
       this.$refs.menu.setCurrentKey(newMenuData.MenuId);

VinnoManagementSystem/src/views/userManage/saveAuthority.vue

@@ -104,6 +104,7 @@ export default {
     },
     //表单注入数据
     setData(data, authorityList) {
+      this.isEdit = false;
       if (data.Id) {
         this.isEdit = true;
         authorityList = authorityList.filter((x) => x.Key != data.Id);