Merge branch 'master' of http://gitlab.bridata.com:8090/root/jt_front

src/views/projectManage/projectAllPage.vue

@@ -171,8 +171,16 @@ const confirmFieldsModal = () => {
                     : data.projectLzType === "9"
                       ? "已决策"
                       : "待立项";
+        }
       },
-      },
+      {
+        prop: "operations",
+        label: "操作",
+        width: 90,
+        slot: "operations",
+        fixed: "right",
+        align: "center",
+      }
     ]);
   filedsModalShow.value = false;
 };

src/views/systemManage/resourceManage.vue

@@ -88,6 +88,7 @@
           <el-input
             v-model="resourceFormData.key"
             placeholder="请输入唯一标识"
+            :disabled="!!resourceFormData.id"
           />
         </el-form-item>
         <el-form-item label="类型" prop="type">
@@ -174,7 +175,7 @@
           />
         </el-form-item>
         <el-form-item label="唯一标识" prop="key">
-          <el-input v-model="listFormData.key" placeholder="请输入唯一标识" />
+          <el-input v-model="listFormData.key" placeholder="请输入唯一标识" :disabled="!!resourceFormData.id" />
         </el-form-item>
       </el-form>
       <template #footer>

src/views/systemManage/roleManage.vue

@@ -59,7 +59,7 @@
             <el-input v-model="roleFormData.name" placeholder="请输入角色名称" />
         </el-form-item>
         <el-form-item label="角色标识" prop="key">
-            <el-input v-model="roleFormData.key" placeholder="请输入角色标识" />
+            <el-input v-model="roleFormData.key" placeholder="请输入角色标识" :disabled="!!roleFormData.id" />
         </el-form-item>
         <el-form-item label="菜单配置">
           <el-tree ref="treeRef"