guoyuji
2024-07-09 a5fb08bb8f1aef5251ca3865ff33a399082a365d
报工相关程序
4个文件已修改
14 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/stores/userInfo.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/stores/userInfo.js
@@ -7,6 +7,7 @@
            user:ref({
                userName:null,
                userId:null,
                address:null,
                permissions:[]
            }),
            responseCode:null,
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -707,7 +707,12 @@
request.post(`/reportingWork/selectProcess`).then((res) => {
  if (res.code == 200) {
    titleSelectJson.value.processType = res.data.process;
    titleSelectJson.value.processType = res.data.process
    if(user.user.address!==null || user.user.address!==''){
      titleUploadData.value.thisProcess = user.user.address
      titleUploadData.value.teamsGroupsName = user.user.userName
    }
  } else {
    ElMessage.warning(res.msg)
  }
@@ -1168,6 +1173,9 @@
    if(codeArr.length!==0){
      titleUploadData.value.processId = codeArr.join('')
    }
    if(user.user.address!==null || user.user.address!==''){
      getWork()
    }
    codeArr=[]
    lastTime = ''
north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java
@@ -11,5 +11,7 @@
    private String pass;
    private String token;
    private String userName;
    private  String address;
    private  String phone;
    private List<String> permissions;
}
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -120,6 +120,7 @@
            userDTO.setPass(null);
            userDTO.setId(user.getId());
            userDTO.setUserName(user.getUserName());
            userDTO.setAddress(user.getAddress());
            userDTO.setToken(StpUtil.getTokenValue());
            Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
            userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));