修改

public/config.js

@@ -108,7 +108,8 @@ var NEW_DATACONTENT_ID = [
   54021,
   54023,
   54024,
-  54025
+  54025,
+  54026
 ]
 
 var DATACONTENT_ID = {
@@ -186,7 +187,7 @@ var DATACONTENT_ID = {
   roleTableId: 59, //角色管理-首页-列表
   roleTableNId: 54002, //角色管理-首页-列表
   roleTableNewId: 91, //角色管理-根据id查权限
-  roleDetailsId: 62, //角色管理-根据id查详情
+  roleDetailsId: 54026, //角色管理-根据id查详情
   roleAuthId: 54003, //角色管理-根据id查权限
 
   /***-----基础数据------***/
@@ -438,8 +439,8 @@ var SERVICE_ID = {
 
   /***-----角色管理------***/
   roleMsgId: 14, //角色管理-增删改
-  roleMsgTreeId: 15, //角色管理-权限树-增删改
-  roleMsgAuthId: 20, //角色管理-权限树规则-增删改
+  roleMsgTreeId: 65060, //角色管理-权限树-增删改
+  roleMsgAuthId: 65061, //角色管理-权限树规则-增删改
 
   /***-----系统设置------***/
   sysProtoTabId: 1, //系统设置-协议管理-表格-增删改
@@ -462,4 +463,4 @@ var SERVICE_ID = {
   /***-----离港管理------***/
   departureScId: 8011, //发送报警预警日志信息
 }
-var NEW_SERVICE_ID = [55001, 65024];
+var NEW_SERVICE_ID = [55001, 65024, 65002, 65026, 65060, 65061];

src/api/webApi.ts

@@ -63,22 +63,36 @@ export function GeneralDataReception(params): Promise<CommonQueryResult> {
   if (NEW_SERVICE_ID.includes(serviceId)) {
     const newData = JSON.parse(dataContent)
     const { event } = newData
-    const eventType = event
+    const eventType = event ?? params.event
     let key: any = null
     if (newData?.event) {
       delete newData.event
     }
     if (eventType == 2) {
-      for (const item in newData) {
-        if (item.includes('id') || item.includes('Id') || item.includes('ID')) {
-          key = item
+      if (newData.hasOwnProperty('IDKey')) {
+        key = newData['IDKey']
+      } else {
+        for (const item in newData) {
+          if (
+            item.includes('id') ||
+            item.includes('Id') ||
+            item.includes('ID')
+          ) {
+            key = item
+          }
         }
       }
       return NewGeneralDataReception(
         dataToChange(serviceId, newData, eventType, key)
       )
+    } else {
+      if (newData?.IDKey) {
+        delete newData.IDKey
+      }
+      return NewGeneralDataReception(
+        dataToChange(serviceId, newData, eventType)
+      )
     }
-    return NewGeneralDataReception(dataToChange(serviceId, newData, eventType))
   }
   return request({
     url: '/openApi/generalDataReception',

src/views/userManagement/hooks/useTable.ts

@@ -4,6 +4,7 @@ import { GeneralDataReception, Query } from '@/api/webApi'
 import { IdType } from '../type'
 const tableHeader = ref<any>([])
 const tableData = ref<any>([])
+const msgId = ref<any>('')
 const getTable = async (id: IdType, dataContent) => {
   try {
     const { code, returnData, message } = await Query({
@@ -12,24 +13,29 @@ const getTable = async (id: IdType, dataContent) => {
       dataContent: [...dataContent],
     })
     if (code == 0 && returnData) {
-      const { columnSet, listValues } = returnData
+      const { columnSet, listValues, submitID } = returnData
+      console.log(submitID)
       tableHeader.value = columnSet
       tableData.value = listValues
+      msgId.value = submitID
       return {
         tableHeader,
         tableData,
+        msgId,
       }
     } else {
       ElMessage.error(message)
       return {
         tableHeader,
         tableData,
+        msgId,
       }
     }
   } catch (err: any) {
     return {
       tableHeader,
       tableData,
+      msgId,
     }
   }
 }

src/views/userManagement/role/auth.vue

@@ -90,6 +90,7 @@ const ruleForm = ref({
   role_comment: "",
   role_status: "",
 });
+const msgId = ref<any>("");
 const auth = ref("1");
 const form = ref({
   query_row_condition: "",
@@ -140,6 +141,7 @@ const roleDetails = async () => {
     });
     if (code == 0) {
       ruleForm.value = returnData.listValues[0];
+      msgId.value = returnData.submitID;
     } else {
       ElMessage.error(message);
     }
@@ -222,12 +224,12 @@ const roleAuths = async () => {
   } catch (error) {}
 };
 
-const handleNodeClick = data => {
-  const cloneData = _.cloneDeep(data)
+const handleNodeClick = (data) => {
+  const cloneData = _.cloneDeep(data);
   checkObj.value = cloneData;
-  checkData.value = _.unionBy([...checkData.value, cloneData], 'auth_id');
+  checkData.value = _.unionBy([...checkData.value, cloneData], "auth_id");
   const checkNode = boxData.value[boxData.value.length - 1].find(
-    item => item.auth_id == data.auth_id
+    (item) => item.auth_id == data.auth_id
   );
   if (checkNode) {
     form.value = { ...checkNode };
@@ -256,13 +258,13 @@ const currentChange = () => {
   const data1 = boxData.value[boxData.value.length - 1]; //最后一条数据
   const data2 = boxData.value[boxData.value.length - 2]; //倒数第二条数据
   if (data1.length > data2.length) {
-    checksBoxTs(data1, data2, "add");
+    checksBoxTs(data1, data2, "add", 1);
   } else {
-    checksBoxTs(data2, data1, "del");
+    checksBoxTs(data2, data1, "del", 3);
   }
 };
 
-const checksBoxTs = async (datas, arr, type) => {
+const checksBoxTs = async (datas, arr, type, eventType) => {
   const res = [...datas, ...arr].filter(
     (item) =>
       !(
@@ -285,21 +287,28 @@ const checksBoxTs = async (datas, arr, type) => {
       let authObj = cap.AuthList
         ? Object.assign(_.cloneDeep(obj), cap.AuthList)
         : Object.assign(_.cloneDeep(obj), cap);
+      if (authObj.hasOwnProperty("IDKey")) {
+        delete authObj.IDKey;
+      }
+      if (authObj.hasOwnProperty("auth_name")) {
+        delete authObj.auth_name;
+      }
       if (type == "add") {
-        obj.event = 1;
-        authObj.event = 1;
+        // obj.event = 1;
+        // authObj.event = 1;
         msg1.push(obj);
         msg2.push(authObj);
       } else {
-        obj.event = 3;
-        authObj.event = 3;
+        // obj.event = 3;
+        // authObj.event = 3;
         msg1.push(obj);
-        msg2.push(authObj);
+        msg2.push(obj);
       }
     }
     GeneralDataReception({
       serviceId: SERVICE_ID.roleMsgTreeId,
       dataContent: JSON.stringify(msg1),
+      event: eventType,
     }).then((result) => {
       if (result.code == 0) {
         if (type == "add") {
@@ -321,6 +330,7 @@ const checksBoxTs = async (datas, arr, type) => {
       GeneralDataReception({
         serviceId: SERVICE_ID.roleMsgAuthId,
         dataContent: JSON.stringify(msg2),
+        event: eventType,
       }).then((result) => {
         if (result.code == 0) {
           if (type == "add") {

src/views/userManagement/role/index.vue

@@ -18,7 +18,7 @@
     <Dialog :flag="editDialogVisible" :msgTitle="editDialogTitle" @submitForm="submitForm(ruleFormRef)" @resetForm="resetForm(ruleFormRef)" :show-flag="true">
       <el-form ref="ruleFormRef" :model="ruleForm" label-width="110px" class="demo-ruleForm">
         <el-form-item label="角色ID" :rules="[{required: true,message: '请输入角色ID',trigger: 'blur',}]" prop="role_id">
-          <el-input v-model="ruleForm.role_id" size="default" placeholder="请输入角色名称" />
+          <el-input :disabled="msgFlag" v-model="ruleForm.role_id" size="default" placeholder="请输入角色名称" />
         </el-form-item>
         <el-form-item label="角色名称" :rules="[{required: true,message: '请输入角色名称',trigger: 'blur',}]" prop="role_name">
           <el-input v-model="ruleForm.role_name" size="default" placeholder="请输入角色名称" />
@@ -75,6 +75,7 @@ const tableBtnGroup = <any>[
   },
 ];
 const flag = ref(false);
+const msgFlag = ref(false);
 const title = ref("");
 const dT = ref("add");
 const editDialogVisible = ref(false);
@@ -86,6 +87,7 @@ const ruleForm = ref<any>({
   role_status: "",
   repel: "",
 });
+const submitID = ref("");
 const searchInfo = ref("");
 const rowIndex = ref<any>({});
 onBeforeMount(() => {
@@ -99,6 +101,7 @@ const gueryRole = async () => {
   ]);
   tableHeader.value = res.tableHeader.value;
   tableData.value = res.tableData.value;
+  submitID.value = res.msgId.value;
 };
 
 const search = (val) => {
@@ -115,6 +118,7 @@ const btnClick = (index, row, param) => {
     flag.value = true;
     title.value = row.role_name;
   } else if (param == "edit") {
+    msgFlag.value = true;
     dT.value = "edit";
     editDialogVisible.value = true;
     editDialogTitle.value = "编辑角色";
@@ -133,6 +137,13 @@ const delRest = () => {
 };
 const remove = async () => {
   rowIndex.value.operator_id = sessionStorage.getItem("User_Id");
+  if (rowIndex.value.AuthCount != undefined) {
+    delete rowIndex.value.AuthCount;
+  }
+  //UserCount
+  if (rowIndex.value.UserCount != undefined) {
+    delete rowIndex.value.UserCount;
+  }
   saveRole(3, rowIndex.value);
   flag.value = false;
 };
@@ -140,13 +151,14 @@ const addApp = () => {
   editDialogVisible.value = true;
   editDialogTitle.value = "新增角色";
   dT.value = "add";
+  msgFlag.value = false;
   ruleForm.value = {};
 };
 // 新增/编辑角色
 const saveRole = async (event, data) => {
   try {
     const { code, message } = await table.dataChange(
-      SERVICE_ID.roleMsgId,
+      submitID.value,
       event,
       data
     );