Преглед на файлове

用户管理-合同段角色编辑、项目合同段编辑是否引用编号添加类型

duy преди 1 седмица
родител
ревизия
ace270b782
променени са 3 файла, в които са добавени 449 реда и са изтрити 405 реда
  1. 140 134
      src/api/manager/contractinfo.js
  2. 7 8
      src/views/manager/contractinfo/detail.vue
  3. 302 263
      src/views/system/user.vue

+ 140 - 134
src/api/manager/contractinfo.js

@@ -1,166 +1,172 @@
-import request from '@/router/axios';
+import request from "@/router/axios";
 
 export const submitContractInfo = (contractInfo) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/submit',
-        method: 'post',
-        data: contractInfo
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/submit",
+    method: "post",
+    data: contractInfo,
+  });
+};
 export const findContractByProjectId = (pid) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/get-contractInfo',
-        method: 'get',
-        params: {
-            pid
-        }
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/get-contractInfo",
+    method: "get",
+    params: {
+      pid,
+    },
+  });
+};
 
 export const getContractInfo2 = (params) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/detail2',
-        method: 'get',
-        params
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/detail2",
+    method: "get",
+    params,
+  });
+};
 
 export const getContractInfo = (id) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/detail',
-        method: 'get',
-        params: {
-            id
-        }
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/detail",
+    method: "get",
+    params: {
+      id,
+    },
+  });
+};
 export const delFileFromUrl = (url) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/delete-file',
-        method: 'get',
-        params: {
-            url
-        }
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/delete-file",
+    method: "get",
+    params: {
+      url,
+    },
+  });
+};
 
 export const saveUserInfoByProject = (list) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/save-userInfo-by-project',
-        method: 'post',
-        data: list
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/save-userInfo-by-project",
+    method: "post",
+    data: list,
+  });
+};
 
 export const findAllUserByCondition = (info, size, current) => {
-    return request({
-        url: `/api/blade-manager/contractInfo/get-all-user-by-condition?size=${size}&current=${current}`,
-        method: 'get',
-        params: {
-            ...info,
-        }
-    })
-}
+  return request({
+    url: `/api/blade-manager/contractInfo/get-all-user-by-condition?size=${size}&current=${current}`,
+    method: "get",
+    params: {
+      ...info,
+    },
+  });
+};
 export const findUserListByCondition = (info) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/get-user-list-by-condition',
-        method: 'get',
-        params: info
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/get-user-list-by-condition",
+    method: "get",
+    params: info,
+  });
+};
 
 export const findUserList = () => {
-    return request({
-        url: '/api/blade-manager/contractInfo/get-user-list',
-        method: 'get',
-        params: {
-
-        }
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/get-user-list",
+    method: "get",
+    params: {},
+  });
+};
 
 export const removeUsersByIds = (ids) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/remove-users-by-ids',
-        method: 'post',
-        params: {
-            ids
-        }
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/remove-users-by-ids",
+    method: "post",
+    params: {
+      ids,
+    },
+  });
+};
 
 export const removeContractInfo = (ids) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/remove',
-        method: 'post',
-        params: {
-            ids
-        }
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/remove",
+    method: "post",
+    params: {
+      ids,
+    },
+  });
+};
 
 export const findJobByRoleId = (id) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/get-jobs',
-        method: 'get',
-        params: {
-            id
-        }
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/get-jobs",
+    method: "get",
+    params: {
+      id,
+    },
+  });
+};
 
 export const resetPasswordByUserId = (userId) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/reset-password-by-userId',
-        method: 'post',
-        params: {
-            userId
-        }
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/reset-password-by-userId",
+    method: "post",
+    params: {
+      userId,
+    },
+  });
+};
 
 export const submitWbsTreeInContract = (obj) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/submit-wbsTree-contract',
-        method: 'post',
-        data: obj
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/submit-wbsTree-contract",
+    method: "post",
+    data: obj,
+  });
+};
 
 export const getContractInfoTree = (wbsId, projectId, contractId) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/tree',
-        method: 'get',
-        params: {
-            wbsId,
-            projectId,
-            contractId,
-        }
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/tree",
+    method: "get",
+    params: {
+      wbsId,
+      projectId,
+      contractId,
+    },
+  });
+};
 
 //新 通过角色方获取岗位
 export const findPostByType = (id) => {
-        return request({
-            url: '/api/blade-system/post/findPostByType',
-            method: 'get',
-            params: {
-                category: id
-            }
-        })
-    }
-    //
+  return request({
+    url: "/api/blade-system/post/findPostByType",
+    method: "get",
+    params: {
+      category: id,
+    },
+  });
+};
+//
 export const saveUserInfoByProjectTow = (list) => {
-    return request({
-        url: '/api/blade-manager/contractInfo/save-userInfo-by-project-tow',
-        method: 'post',
-        data: list
-    })
-}
+  return request({
+    url: "/api/blade-manager/contractInfo/save-userInfo-by-project-tow",
+    method: "post",
+    data: list,
+  });
+};
 export const searchRole = (list) => {
-    return request({
-        url: '/api/blade-system/search/role',
-        method: 'get',
-        data: list
-    })
-}
+  return request({
+    url: "/api/blade-system/search/role",
+    method: "get",
+    data: list,
+  });
+};
+
+export const updateBatchUserRole = (data) => {
+  return request({
+    url: "/api/blade-manager/contractInfo/update-batch-user-role",
+    method: "post",
+    data,
+  });
+};

+ 7 - 8
src/views/manager/contractinfo/detail.vue

@@ -144,6 +144,7 @@
                   <el-radio-group v-model="contractForm.isReferenceNumber">
                     <el-radio :label="0">否</el-radio>
                     <el-radio :label="1">是</el-radio>
+                    <el-radio :label="2">引用分项/子分项编码</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-form-item
@@ -1811,12 +1812,10 @@ export default {
 
 </style>
 
-<style  lang="scss">
-.maxinp{
-  .el-input__inner{
-    height: 80px;
+<style lang="scss">
+  .maxinp {
+    .el-input__inner {
+      height: 80px;
+    }
   }
-}
-</style>
-
-</style>
+</style>

Файловите разлики са ограничени, защото са твърде много
+ 302 - 263
src/views/system/user.vue


Някои файлове не бяха показани, защото твърде много файлове са промени