From 3699296e63774c1c1b3f97f750d7e1c8046e03d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 23 Mar 2025 00:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProProjectInfoSubdeptsUsersMapper.java | 8 + .../ProProjectInfoSubdeptsUsersMapper.xml | 8 +- ...ProProjectInfoSubdeptsGroupController.java | 1 - ...ProProjectInfoSubdeptsUsersController.java | 3 +- ...roProjectInfoSubdeptsUsersServiceImpl.java | 4 + .../system/controller/SysUserController.java | 11 +- .../service/impl/SysUserServiceImpl.java | 17 +- yanzhu-ui-app/miniprogram/api/login.js | 17 + yanzhu-ui-app/miniprogram/api/publics.js | 8 + yanzhu-ui-app/miniprogram/app.json | 1 + .../components/select-roles/index.js | 117 ++++ .../components/select-roles/index.json | 4 + .../components/select-roles/index.wxml | 36 ++ .../components/select-roles/index.wxss | 116 ++++ .../project_flowable/editTask/index.wxml | 2 +- .../project_flowable/initTask/index.wxml | 2 +- .../pages/project_magusers/add/index.js | 524 +++++++++++++++++- .../pages/project_magusers/add/index.json | 7 +- .../pages/project_magusers/add/index.wxml | 124 ++++- .../pages/project_magusers/add/index.wxss | 12 +- .../pages/project_magusers/info/index.js | 259 ++++++++- .../pages/project_magusers/info/index.json | 5 +- .../pages/project_magusers/info/index.wxml | 246 +++++++- .../pages/project_magusers/info/index.wxss | 12 +- .../pages/project_magusers/list/index.js | 2 +- .../pages/project_magusers/list/index.wxml | 2 +- .../project_problemmodify/add/index.wxml | 2 +- .../project_problemmodify/draft/index.wxml | 2 +- .../project_problemmodify/modify/index.wxml | 2 +- .../miniprogram/pages/project_qr/index.wxml | 14 +- .../pages/project_subdepts/add/index.wxml | 6 +- .../pages/project_subusers/add/index.wxml | 4 +- 32 files changed, 1529 insertions(+), 49 deletions(-) create mode 100644 yanzhu-ui-app/miniprogram/components/select-roles/index.js create mode 100644 yanzhu-ui-app/miniprogram/components/select-roles/index.json create mode 100644 yanzhu-ui-app/miniprogram/components/select-roles/index.wxml create mode 100644 yanzhu-ui-app/miniprogram/components/select-roles/index.wxss diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java index 3cf11c73..82344a30 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoSubdeptsUsersMapper.java @@ -147,6 +147,14 @@ public interface ProProjectInfoSubdeptsUsersMapper */ public int updateUserPhone(@Param("oldUserPhone")String oldUserPhone, @Param("newUserPhone")String newUserPhone); + /** + * 修改用户电话 + * @param oldUserPhone + * @param newUserPhone + * @return + */ + public int updateUserNames(@Param("oldUserPhone")String oldUserPhone, @Param("newUserPhone")String newUserPhone); + /** * 修改用户电话 * @param oldUserPhone diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index 2fdb83a1..f757be14 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -97,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and psu.approve_status = ]]> 100 and psu.is_del = #{isDel} and psu.user_post != '66' + and psu.user_post = '66' and psu.sub_dept_type in ('1','4','5') and psu.user_post not in ('4','5') and date(psu.use_date) between #{params.beginTime} and #{params.endTime} and psu.is_del != 2 @@ -148,7 +149,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where psu.project_id = #{proId} and psu.user_id = #{userId} - insert into pro_project_info_subdepts_users @@ -395,7 +395,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update sys_user set user_name = #{newUserPhone}, phonenumber = #{newUserPhone} where phonenumber = #{oldUserPhone} + update sys_user set phonenumber = #{newUserPhone} where phonenumber = #{oldUserPhone} + + + + update sys_user set user_name = #{newUserPhone} where user_name = #{oldUserPhone} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java index 3391da28..59747244 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsGroupController.java @@ -8,7 +8,6 @@ import com.yanzhu.common.core.web.page.TableDataInfo; import com.yanzhu.common.log.annotation.Log; import com.yanzhu.common.log.enums.BusinessType; import com.yanzhu.common.security.annotation.RequiresPermissions; -import com.yanzhu.manage.domain.ProProjectInfoSubdepts; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsGroup; import com.yanzhu.manage.service.IProProjectInfoSubdeptsGroupService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java index 0c31b324..2d520602 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java @@ -271,9 +271,8 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController * @param id * @param status * @return - * @RequiresPermissions("manage:proProjectInfoSubdeptsUsers:edit") */ - @PostMapping("/editUseStatus/{id}") + @GetMapping("/editUseStatus/{id}") public AjaxResult editUseStatus(@PathVariable("id") Long id, String status){ try { return AjaxResult.success(proProjectInfoSubdeptsUsersService.editUseStatus(id,status)); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index a73ac802..db0eedd8 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -735,6 +735,10 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsGroupMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); proProjectInfoSubdeptsUsersMapper.updatePhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); proProjectInfoSubdeptsUsersMapper.updateUserPhone(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); + Map visMap = proProjectInfoSubdeptsUsersMapper.findUserPhone(entity.getUserPhone()); + if(Objects.nonNull(visMap) && Convert.toInt(visMap.get("total"),0)>0){ + proProjectInfoSubdeptsUsersMapper.updateUserNames(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone()); + } } /**updateUserPhone diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java index ff52bd40..624e7b72 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java @@ -325,6 +325,14 @@ public class SysUserController extends BaseController { return ajax; } + /** + * 根据用户编号获取详细信息 + */ + @GetMapping("/getUserRoles/{userId}") + public AjaxResult getUserRoles(@PathVariable(value = "userId") Long userId) { + return success(userService.selectUserById(userId)); + } + /** * 新增用户 */ @@ -348,12 +356,9 @@ public class SysUserController extends BaseController { /** * 新增用户 */ - @RequiresPermissions("system:user:add") @Log(title = "用户管理", businessType = BusinessType.INSERT) @PostMapping("/addUser") public AjaxResult addUser(@Validated @RequestBody SysUser user) { - user.setCreateBy(SecurityUtils.getUsername()); - user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); return toAjax(userService.insertUserWx(user)); } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java index 16483b06..0d10fecd 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java @@ -429,6 +429,9 @@ public class SysUserServiceImpl implements ISysUserService int rows=0; SysUser sysUser = userMapper.selectByPhone(user.getPhonenumber()); if(Objects.nonNull(sysUser)){ + if(Objects.equals(sysUser.getUserType(),UserTypeEnums.QTRY.getCode())){ + throw new ServiceException("手机号已被注册，请更换手机号"); + } // 此电话号码已注册 user.setUserId(sysUser.getUserId()); user.setIsActive(0l); @@ -449,6 +452,7 @@ public class SysUserServiceImpl implements ISysUserService sysUser.setNickName(user.getNickName()); sysUser.setUpdateBy(user.getUpdateBy()); sysUser.setUpdateTime(user.getUpdateTime()); + sysUser.setPassword(null); rows=userMapper.updateUser(sysUser); userExtService.updateBySysUser(sysUser); }else{ @@ -456,11 +460,12 @@ public class SysUserServiceImpl implements ISysUserService if(StringUtils.isEmpty(user.getUserName())){ user.setUserName(userNameAndCout(user.getNickName())); } - user.setCreateBy(user.getUpdateBy()); + user.setCreateBy(SecurityUtils.getUsername()); user.setCreateTime(user.getUpdateTime()); if(StringUtils.isEmpty(user.getUserType())) { user.setUserType(UserTypeEnums.XMRY.getCode()); } + user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); rows=userMapper.insertUser(user); user.setIsActive(1l); userMapper.insertUserCom(user); @@ -473,15 +478,7 @@ public class SysUserServiceImpl implements ISysUserService userRole.setUserId(user.getUserId()); userRole.setDeptId(user.getDeptId()); userRoleMapper.deleteUserRoleByUserRole(userRole); - List roleList = roleMapper.findDeptRoleListByDeptIdAndKey(user.getDeptId(),UserTypeEnums.JSDWRY.getKeys()+"_"+user.getDeptId()); - if(roleList.size()>0){ - // 使用 Stream 来提取 roleId 并转换成一个数组 - Long[] roleIds = roleList.stream() - .map(SysRole::getRoleId) - .toArray(Long[]::new); - user.setRoleIds(roleIds); - insertUserRole(user); - } + insertUserRole(user); try { SysDept sysDept = deptMapper.selectDeptById(user.getDeptId()); Map data = packageSubDeptUsers(user, sysDept); diff --git a/yanzhu-ui-app/miniprogram/api/login.js b/yanzhu-ui-app/miniprogram/api/login.js index 39ab28dc..68e52d90 100644 --- a/yanzhu-ui-app/miniprogram/api/login.js +++ b/yanzhu-ui-app/miniprogram/api/login.js @@ -86,3 +86,20 @@ export function findUserInfoByCache(){ }) } +//查询用户角色 +export function getUserRoles(userId){ + return request({ + 'url': '/system/user/getUserRoles/'+userId, + 'method': 'get' + }) +} + +//保存总包人员信息 +export function addUser(data){ + return request({ + 'url': '/system/user/addUser', + 'method': 'post', + data:data + }) +} + diff --git a/yanzhu-ui-app/miniprogram/api/publics.js b/yanzhu-ui-app/miniprogram/api/publics.js index 2bcaad4e..3dbf0b65 100644 --- a/yanzhu-ui-app/miniprogram/api/publics.js +++ b/yanzhu-ui-app/miniprogram/api/publics.js @@ -16,6 +16,14 @@ export function getUserInfo() { }) } +// 获取项目角色 +export function findProRoles(proId) { + return request({ + url: '/system/role/deptRole/'+proId, + method: 'get' + }) +} + // 查询用户菜单信息 export function findUserMenuList(proId,menuType) { return request({ diff --git a/yanzhu-ui-app/miniprogram/app.json b/yanzhu-ui-app/miniprogram/app.json index 94f6bdaa..579f941e 100644 --- a/yanzhu-ui-app/miniprogram/app.json +++ b/yanzhu-ui-app/miniprogram/app.json @@ -78,6 +78,7 @@ "jyq-result": "pages/components/jyq-result/index", "safety-number": "./components/number/index", "select-person": "./components/select-person/index", + "select-roles": "./components/select-roles/index", "select-group-person": "./components/select-group-person/index", "select-group-position": "./components/select-group-position/index", "van-dropdown-menu": "@vant/weapp/dropdown-menu/index", diff --git a/yanzhu-ui-app/miniprogram/components/select-roles/index.js b/yanzhu-ui-app/miniprogram/components/select-roles/index.js new file mode 100644 index 00000000..63d527f8 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/components/select-roles/index.js @@ -0,0 +1,117 @@ +// newComponents/select-group-person/index.js +Component({ + /** + * 组件的属性列表 + */ + properties: { + title:{ + type:String + }, + index:{ + type:String + }, + choose:{ + type:String + }, + multiple:{ + type:Boolean, + value:true + }, + rectifierData:{ + type:Array, + value:[] + } + }, + observers: { + + }, + lifetimes: { + created: function(){ + //在组件实例刚刚被创建时执行，注意此时不能调用 setData + }, + attached: function () { + //在组件实例进入页面节点树时执行 + }, + ready: function () { + // 在组件在视图层布局完成后执行 + }, + detached: function () { + // 在组件实例被从页面节点树移除时执行 + }, + }, + + /** + * 组件的初始数据 + */ + data: { + show:false, + gridData:[], + selectedIndex:[] + }, + + /** + * 组件的方法列表 + */ + methods: { + onAddResponsible(){ + this.setData({ + show:true + }) + }, + onClose(){ + this.setData({ + show:false + }) + }, + onSelected(e){ + var _data = this.data.rectifierData; + let index = e.currentTarget.dataset.index; + let roledata = _data[index]; + let of = this.data.selectedIndex.indexOf(index); + if(of>-1){ + this.data.selectedIndex.splice(of, 1); + roledata.state = false; + }else{ + this.data.selectedIndex.push(index); + roledata.state = true; + } + if(!this.data.multiple && this.data.selectedIndex.length>0){ + if(this.data.selectedIndex.length>1){ + this.data.selectedIndex.forEach((item) =>{ + _data[item].state = false; + }); + roledata.state = true; + this.data.selectedIndex=[]; + this.data.selectedIndex.push(index); + } + let _gridData=[{'roleId':roledata.roleId,'roleName':roledata.roleName}]; + this.triggerEvent('selected',_gridData) + this.setData({ + show:false, + rectifierData:_data, + choose:_gridData[0].roleName, + }) + }else{ + this.setData({ + rectifierData : _data + }) + } + }, + onConfirm(){ + var _data = this.data.rectifierData; + let _gridData=[]; + let chooses=""; + if(this.data.selectedIndex.length>0){ + this.data.selectedIndex.forEach((item) =>{ + _gridData.push({'roleId':_data[item].roleId,'roleName':_data[item].roleName}); + chooses+="，"+_data[item].roleName; + }); + } + this.triggerEvent('selected',_gridData) + this.setData({ + show:false, + choose:chooses.substring(1) + }) + } + } +}) diff --git a/yanzhu-ui-app/miniprogram/components/select-roles/index.json b/yanzhu-ui-app/miniprogram/components/select-roles/index.json new file mode 100644 index 00000000..7e37c035 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/components/select-roles/index.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/components/select-roles/index.wxml b/yanzhu-ui-app/miniprogram/components/select-roles/index.wxml new file mode 100644 index 00000000..659e3422 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/components/select-roles/index.wxml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + {{title}} + + + + + + + + + + + + + {{item.roleName}} [{{item.roleKey}}] + + + + + 取消 + 确认 + + + \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/components/select-roles/index.wxss b/yanzhu-ui-app/miniprogram/components/select-roles/index.wxss new file mode 100644 index 00000000..5266111f --- /dev/null +++ b/yanzhu-ui-app/miniprogram/components/select-roles/index.wxss @@ -0,0 +1,116 @@ +/* newComponents/select-person/index.wxss */ +page{ + height:100% +} +.rectifier_add_to{ + width: 100rpx; + height: 100rpx; + margin: auto; + background: #252d41; + text-align: center; + line-height: 110rpx; + font-size: 50rpx; + color: #57668f; + font-weight: bold; + border-radius: 5rpx; +} +.rectifier_max{ + width: 100%; + background: #232a44; + border-radius: 15rpx; + position: relative; + height: 100%; +} +.rectifier_title{ + position: relative; + background: #27304f; + border-radius: 15rpx; + text-align: center; + padding:20rpx 15rpx; +} +.rectifier_close{ + position: absolute; + width: 50rpx; + height: 50rpx; + right: 20rpx; + top: 12rpx; + line-height: 60rpx; + text-align: center; +} +.rectifier_list{ + padding:20rpx 40rpx; +} +.rectifier_list_height{ + height: 990rpx; + overflow: auto; +} +.rectifier_list_for{ + display: flex; + align-items: center; + padding: 16rpx 15rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.rectifier_list_radio{ + width: 70rpx; +} +.rectifier_list_radio_circle{ + width: 30rpx; + height: 30rpx; + border-radius: 50%; + border: 1px solid #6576a2; +} +.rectifier_list_radio_circle.active{ + background: #8262f3; + border: 1px solid #8262f3; +} +.rectifier_list_name{ + padding-left: 10rpx; + color: #8499d0; +} +.rectifier_list_name.active{ + color: #ffffff; +} +.rectifier_btn{ + display: flex; + align-items: center; + background: #27304f; + border-radius: 0 0 15rpx 15rpx; +} +.rectifier_btn view{ + width: 50%; + text-align: center; + height: 80rpx; + line-height: 80rpx; + color:#6874a4; +} +.rectifier_btn view:last-child{ + border-left: 1px solid #6874a4; + color: #ffffff; +} +.rectifier_list-group_for{ + height: 65rpx; + background-color: #9898987d; + line-height: 65rpx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + border-radius: 5px; + font-weight: 500; +} +.rectifier_list-group_for:not(:first-child){ + margin-top: 15px; +} + +.inspect_input_fill_in { + height: 90rpx; + background: #212737; + border-radius: 10rpx; + padding: 0 30rpx; +} + +.modify_eharts_title_1 { + padding-left: 45rpx; + background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/40rpx; +} diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml index 3d11923e..2832f43d 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml @@ -91,7 +91,7 @@ 申请图片 [其它格式文件请截图上传、电脑端上传] - + diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/initTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/initTask/index.wxml index 1a163098..acbcec88 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/initTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/initTask/index.wxml @@ -39,7 +39,7 @@ 申请图片 [其它格式文件请截图上传或电脑端上传] - + diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.js b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.js index 64c6e9e3..8e0f05bb 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.js @@ -1,18 +1,538 @@ -// pages/project_magusers/add/index.js +import config from '../../../config' +import { + getToken, + getUserInfo +} from '../../../utils/auth' +import { + findProRoles, + findDictCache, + findCardOcrFront +} from '../../../api/publics' +import { + addUser, + getUserRoles +} from '../../../api/login' +import { + findProSubUsersInfoById +} from '../../../api/project' +const app = getApp() Page({ /** * 页面的初始数据 */ data: { - + limit: 1, + maxDate: new Date(2088, 1, 1).getTime(), + form: {}, + active: 0, + flowNodes: [{ + text: '信息登记' + }, { + text: '信息审核' + }, { + text: '人员入场' + }], + deptsList: [], + postsList: [], + allPostList:[], + proRoleList: [], + loadShow: false, + imgBase: config.baseImgUrl, }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + if (!getToken()) { + wx.redirectTo({ + url: '../../../login/login', + }) + } + if (options && options.id) { + //查询数据回填... + this.initData(options.id); + } + const proUserInfo = getUserInfo(); + this.setData({ + "form.comId": proUserInfo.projectUserInfo.comId, + "form.deptId": app.globalData.useProjectId, + "form.projectId": app.globalData.useProjectId, + "form.projectName": app.globalData.useProjectName + }); + this.getDictCache(); + this.getAllProDeptRoles(); + }, + /** + * 获取单位 + */ + getAllProDeptRoles() { + findProRoles(app.globalData.useProjectId).then(res => { + let list = []; + res.data.forEach(item => { + list.push({ + "roleId": item.roleId, + "roleName": item.roleName, + "roleKey": item.roleKey, + "state": false + }); + }); + this.setData({ + proRoleList: list + }); + }); + }, + + /** + * 获取字典缓存数据 + */ + getDictCache() { + // 初始化岗位 + findDictCache("user_work_type").then(res => { + if (res.code == 200) { + let depts = []; + res.data.forEach(item => { + if(item.remark){ + const exists = depts.some(ops => ops.id === item.remark); + if (!exists) { + depts.push({ + 'id': item.remark, + 'text': item.remark, + 'post': [] + }); + } + } + }); + depts.forEach(des => { + res.data.forEach(item => { + if (des.id == item.remark) { + des.post.push({ + 'id': item.dictValue, + 'text': item.dictLabel + }); + } + }); + }) + this.setData({ + deptsList: depts, + allPostList: res.data + }); + } + }) + }, + + /** + * 初始化数据 + * @param {*} id + */ + initData(id) { + findProSubUsersInfoById(id).then(userRes => { + if (userRes.code == 200 && userRes.data != null) { + userRes.data.deptId = userRes.data.projectId; + userRes.data.nickName = userRes.data.userName; + userRes.data.phonenumber = userRes.data.userPhone; + if (userRes.data.userInfos) { + let userInfosJSON = JSON.parse(userRes.data.userInfos); + userRes.data.nativePlace = userInfosJSON.nativePlace; + userRes.data.nation = userInfosJSON.nation; + userRes.data.address = userInfosJSON.address; + userRes.data.cardImgPos = userInfosJSON.cardImgPos; + userRes.data.cardImgInv = userInfosJSON.cardImgInv; + } + if (userRes.data.cardImgPos) { + userRes.data.cardImgPos = (this.data.imgBase + userRes.data.cardImgPos).split(','); + } + if (userRes.data.cardImgInv) { + userRes.data.cardImgInv = (this.data.imgBase + userRes.data.cardImgInv).split(','); + } + if (userRes.data.userPicture) { + userRes.data.avatar = (this.data.imgBase + userRes.data.userPicture).split(','); + } + this.setData({ + active: 100, + form: userRes.data + }); + this.initUserRole(userRes.data.userId); + } + }); + }, + + /** + * 初始化用户角色 + * @param {*} userId + */ + initUserRole(userId){ + getUserRoles(userId).then(res => { + if(res.code==200){ + let _roleIds = []; + let _roleNames = ""; + res.data.roles.forEach(item =>{ + _roleIds.push(item.roleId); + _roleNames += "，" + item.roleName; + }); + this.setData({ + "form.deptId":res.data.deptId, + "form.roleIds": _roleIds, + "form.roleNames":_roleNames.substring(1) + }) + } + }) + }, + + //选择角色 + onAddRoles(e) { + if (e.detail.length > 0) { + let _roleIds = ""; + let _roleNames = ""; + e.detail.forEach(item => { + _roleIds += "," + item.roleId; + _roleNames += "，" + item.roleName; + }); + this.setData({ + "form.roleIds": _roleIds.substring(1).split(','), + "form.roleNames":_roleNames + }) + console.log("dddddddd",this.data.form); + } else { + this.setData({ + "form.roleIds": [] + }) + } + }, + + //取消页面 + cancelSaveView() { + this.returnToPage() + }, + + /** + * 委托代理提交参建单位信息 + */ + submitSubUsers() { + let { + form + } = this.data; + //数据效验 + if (!form.comId || !form.deptId || !form.projectId) { + app.toast("数据异常，请刷新页面重试!") + return false; + } + if (!form.cardImgPos || form.cardImgPos.length == 0) { + app.toast("请上传身份证正面照！"); + return false; + } + if (!form.cardImgInv || form.cardImgInv.length == 0) { + app.toast("请上传身份证反面照！"); + return false; + } + if (!form.avatar || form.avatar.length == 0) { + app.toast("请上传进场半身近照！"); + return false; + } + if (!form.nickName) { + app.toast("请填写人员姓名！"); + return false; + } + if (!form.cardCode) { + app.toast("请填写身份证号！"); + return false; + } else { + const cardCodePattern = /^[1-9]\d{5}(18|19|20|21|22)?\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|[Xx])$/; + if (!cardCodePattern.test(form.cardCode)) { + app.toast("身份证号码不正确！"); + return false; + } + } + if (!form.phonenumber) { + app.toast("请填写联系电话！"); + return false; + } else { + const phonePattern = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/; + if (!phonePattern.test(form.phonenumber)) { + app.toast("人员联系电话不正确！"); + return false; + } + } + if(!form.id){ + if (!form.password) { + app.toast("请输入登录密码！"); + return false; + }else if(form.password.length<6){ + app.toast("登录密码最少6位字符！"); + return false; + } + if (!form.depts) { + app.toast("请选择岗位部门！"); + return false; + } + } + if (!form.workType) { + app.toast("请选择岗位级别！"); + return false; + } + if (!form.roleIds || form.roleIds.length==0) { + app.toast("请选择用户角色！"); + return false; + } + let that = this; + //弹出确认 + wx.showModal({ + title: '提示', + content: '是否确认保存总包人员信息？', + success: function (sm) { + if (sm.confirm) { + that.submitSubUserForm(); + } + } + }) + }, + + /** + * 委托代理提交参建单位表单 + */ + submitSubUserForm() { + let _form = { + ...this.data.form + }; + this.setData({ + loadShow: true + }) + let uploadFiles = []; + if (_form.cardImgPos && _form.cardImgPos.length > 0) { + uploadFiles.push({ + type: 'cardImgPos', + path: _form.cardImgPos[0] + }); + } + if (_form.cardImgInv && _form.cardImgInv.length > 0) { + uploadFiles.push({ + type: 'cardImgInv', + path: _form.cardImgInv[0] + }); + } + if (_form.avatar && _form.avatar.length > 0) { + uploadFiles.push({ + type: 'userPicture', + path: _form.avatar[0] + }); + } + let that = this; + let uploads = []; + uploadFiles.forEach(async (item, idx) => { + let obj; + if (item.path.indexOf(this.data.imgBase) > -1) { + obj = { + data: { + data: { + url: item.path.replace(this.data.imgBase, "") + } + } + } + } else { + //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片 + obj = await that.syncUploadImage(item.path); + } + if (item.type == "cardImgPos") { + _form.cardImgPos = obj.data.data.url; + } + if (item.type == "cardImgInv") { + _form.cardImgInv = obj.data.data.url; + } + if (item.type == "userPicture") { + _form.avatar = obj.data.data.url; + } + uploads.push(obj.data.data.url); + //验证图片上传完毕 + if (uploads.length == uploadFiles.length) { + let userInfos = {}; + userInfos.nation = _form.nation; + userInfos.nativePlace = _form.nativePlace; + userInfos.address = _form.address; + userInfos.cardImgPos = _form.cardImgPos; + userInfos.cardImgInv = _form.cardImgInv; + _form.userInfos = JSON.stringify(userInfos); + addUser(_form).then(res => { + this.setData({ + loadShow: false + }); + if (res.code == 200) { + app.toast("保存数据成功!") + setTimeout(() => { + wx.redirectTo({ + url: `../list/index`, + }) + }, 200) + } + }); + } + }); + }, + + /** + * 个人身份证正面照 + * @param {*} options + */ + fileUploadCardImgPos(options) { + let file = options.detail; + this.setData({ + "form.cardImgPos": file + }); + file.forEach(async (item, idx) => { + let obj = await this.syncUploadImage(item); + findCardOcrFront(obj.data.data.url).then(res => { + if (res.code == 200) { + if (res.data.nation.indexOf("族") < 0) { + res.data.nation = res.data.nation + "族"; + } + this.setData({ + "form.nickName": res.data.name, + "form.cardCode": res.data.cardId, + "form.nation": res.data.nation, + "form.nativePlace": res.data.native, + "form.address": res.data.address + }) + if (!res.data.name || !res.data.cardId) { + this.setData({ + "form.cardImgPos": [] + }); + app.toast("身份证正面照识别失败！请重新上传"); + } + } + }); + }) + }, + + /** + * 个人身份证反面照 + * @param {*} options + */ + fileUploadCardImgInv(options) { + let file = options.detail; + this.setData({ + "form.cardImgInv": file + }); + }, + + /** + * 个人半身近照 + * @param {*} options + */ + fileUploadUserPicture(options) { + let file = options.detail; + this.setData({ + "form.avatar": file + }); + }, + + /** + * 输入个人姓名 + * @param {*} e + */ + inputUserName(e) { + this.setData({ + "form.nickName": e.detail.value + }) + }, + + /** + * 输入个人身份证号 + * @param {*} e + */ + inputUserCode(e) { + this.setData({ + "form.cardCode": e.detail.value + }) + }, + + /** + * 输入联系电话 + * @param {*} e + */ + inputUserPhone(e) { + this.setData({ + "form.phonenumber": e.detail.value + }) + }, + + /** + * 登陆密码 + * @param {*} e + */ + inputPassword(e) { + this.setData({ + "form.password": e.detail.value + }) + }, + + /** + * 选择部门 + * @param {*} e + */ + onDepts(e) { + let _list = this.data.deptsList; + _list.forEach(item => { + if (item.id == e.detail.id) { + this.setData({ + "form.depts": e.detail.id, + "form.workType": null, + postsList: item.post + }) + } + }); + }, + + /** + * 选择岗位 + * @param {*} e + */ + onPosts(e) { + this.setData({ + "form.workType": e.detail.id + }) + }, + + /** + * 这里考虑上传图片异步问题，封装为同步 + */ + syncUploadImage(file) { + let _baseUrl = config.baseUrl; + return new Promise((resolve, reject) => { + wx.uploadFile({ + url: _baseUrl + "/file/upload", // 上传的服务器接口地址 + filePath: file, + header: { + "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8", + 'Authorization': 'Bearer ' + getToken() + }, + name: "file", //上传的所需字段，后端提供 + formData: {}, + success: (res) => { + // 上传完成操作 + const data = JSON.parse(res.data) + resolve({ + data: data + }) + }, + fail: (err) => { + //上传失败：修改pedding为reject + console.log("访问接口失败", err); + wx.showToast({ + title: "网络出错,上传失败", + icon: 'none', + duration: 1000 + }); + reject(err) + } + }); + }) + }, + + returnToPage: function () { + wx.redirectTo({ + url: `../list/index` + }) }, /** diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.json b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.json index 3928faa4..6d420795 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.json +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.json @@ -1,3 +1,8 @@ { - "usingComponents": {} + "usingComponents": { + "van-steps": "@vant/weapp/steps/index", + "van-notice-bar": "@vant/weapp/notice-bar/index", + "van-overlay": "@vant/weapp/overlay/index" + }, + "navigationStyle": "custom" } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxml index ce357575..8138d2e4 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxml @@ -1,2 +1,122 @@ - -pages/project_magusers/add/index.wxml \ No newline at end of file + + + + + + + + + + {{form.id?'修改':'新增'}}总包人员 + + + + + + + + + {{form.projectName}} + + + + + 身份证正面 + + + + + + + 身份证反面 + + + + + + + 半身清晰照 + + + + + + + + + 人员姓名 + [不可输入，证件自动识别] + + + + + + + 身份证号 + [不可输入，证件自动识别] + + + + + + + 手机号码 + [不可修改] + + + + + + + + + + 使用手机号码登录系统。 + + + 登陆密码 + + + + + + 岗位部门 + + + + + + 岗位级别 + + + + + + 部门岗位 + + + + + + 用户角色 + + + + + + + {{form.id?'修改':'新增'}}人员信息不进入审核流程、{{form.id?'修改':'新增'}}后立即生效。 + + + + 取消 + 提交保存 + + + + + + + 数据处理中！请稍后... + + \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxss b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxss index 3c7918b7..9febfc43 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxss +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxss @@ -1 +1,11 @@ -/* pages/project_magusers/add/index.wxss */ \ No newline at end of file +.van-steps { + background-color: transparent !important; + } + + .van-step--horizontal .van-step__circle-container { + background-color: transparent !important; + } + + .van-steps--horizontal { + padding: 10px 20px !important; + } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.js b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.js index 89c50b14..a1569b16 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.js @@ -1,18 +1,273 @@ -// pages/project_magusers/info/index.js +import config from '../../../config' +import { + getToken +} from '../../../utils/auth' +import { + editSubUsersPhone, + editSubUsersUseStatus, + findProSubUsersInfoById +} from '../../../api/project' +const app = getApp() Page({ /** * 页面的初始数据 */ data: { - + active: 100, + flowNodes: [{ + text: '信息登记' + }, { + text: '信息审核' + }, { + text: '人员入场' + }], + form: {}, + newUserPhone:"", + isChange: false, + imgBaseUrl: config.baseImgUrl }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + if (!getToken()) { + wx.redirectTo({ + url: '../../../login/login', + }) + } + if (options && options.id) { + //查询数据回填... + this.initData(options.id); + } + }, + /** + * 初始化数据 + * @param {*} id + */ + initData(id) { + findProSubUsersInfoById(id).then(userRes => { + if (userRes.code == 200 && userRes.data != null) { + if (userRes.data.userInfos) { + let userInfosJSON = JSON.parse(userRes.data.userInfos); + userRes.data.nativePlace = userInfosJSON.nativePlace; + userRes.data.nation = userInfosJSON.nation; + userRes.data.address = userInfosJSON.address; + userRes.data.emergencyContact = userInfosJSON.emergencyContact; + userRes.data.contactPhone = userInfosJSON.contactPhone; + userRes.data.bankName = userInfosJSON.bankName; + userRes.data.bankOffice = userInfosJSON.bankOffice; + userRes.data.bankCardNo = userInfosJSON.bankCardNo; + userRes.data.cardImgPos = userInfosJSON.cardImgPos; + userRes.data.cardImgInv = userInfosJSON.cardImgInv; + } + if (userRes.data.cardImgPos) { + userRes.data.cardImgPos = (this.data.imgBaseUrl + userRes.data.cardImgPos).split(','); + } + if (userRes.data.cardImgInv) { + userRes.data.cardImgInv = (this.data.imgBaseUrl + userRes.data.cardImgInv).split(','); + } + if (userRes.data.userPicture) { + userRes.data.userPicture = (this.data.imgBaseUrl + userRes.data.userPicture).split(','); + } + if (userRes.data.subDeptPowerPath) { + userRes.data.subDeptPowerPath = (this.data.imgBaseUrl + userRes.data.subDeptPowerPath).split(','); + } + this.setData({ + active: 100, + form: userRes.data + }); + } + }); + }, + + /** + * 返回上页 + */ + returnToPage: function () { + wx.redirectTo({ + url: `../list/index` + }) + }, + + /** + * 展示图片 + * @param {*} e + */ + showImg: function (e) { + let paths = e.target.dataset.set; + let path = []; + paths.split(',').forEach(url => { + path.push(url); + }); + wx.previewImage({ + urls: path, + current: path[0] + }) + }, + + /** + * 下载并打开文档 + * @param {*} e + */ + downFile: function (e) { + let path = this.data.form.eduFilePath; + wx.downloadFile({ + // 示例 url，并非真实存在 + url: config.baseUrl + '/file/download?fileName=' + path, + header: { + 'Authorization': 'Bearer ' + getToken() + }, + success: function (res) { + const filePath = res.tempFilePath + let fpt = path.split("."); + wx.openDocument({ + filePath: filePath, + fileType: fpt[fpt.length - 1], + success: function (res) { + console.log('打开文档成功') + }, + fail: function (res) { + console.log(res) + } + }) + } + }) + }, + + /** + * 单位入场 + */ + submitSubDeptsIn(){ + let that = this; + //弹出确认 + wx.showModal({ + title: '提示', + content: '是否确认班组人员入场？', + success: function (sm) { + if (sm.confirm) { + that.submitSubDeptsUseStatus(0); + } + } + }) + }, + + /** + * 单位离场 + */ + submitSubDeptsOut(){ + let that = this; + //弹出确认 + wx.showModal({ + title: '提示', + content: '是否确认班组人员离场？', + success: function (sm) { + if (sm.confirm) { + that.submitSubDeptsUseStatus(1); + } + } + }) + }, + + /** + * 表单提交 + */ + submitSubDeptsUseStatus(status){ + editSubUsersUseStatus(this.data.form.id,status).then(res =>{ + if(res.code==200){ + app.toast("操作成功!") + setTimeout(() => { + wx.redirectTo({ + url: `../list/index`, + }) + }, 200) + } + }); + }, + + /** + * 输入联系电话 + * @param {*} e + */ + inputUserPhone(e) { + this.setData({ + newUserPhone: e.detail.value + }) + }, + + /** + * 变更手机号 + */ + changeUserPhone() { + this.setData({ + isChange: !this.data.isChange + }); + setTimeout(() => { + wx.pageScrollTo({ + scrollTop: 99999, // 滚动到内容区域的高度，即最底部 + duration: 100 // 滚动的动画持续时间 + }); + }, 500) + }, + + /** + * + */ + submitChangePhone(){ + let { + form, + newUserPhone + } = this.data; + if(!newUserPhone){ + app.toast("请输入新手机号码!") + return false; + }else{ + const phonePattern = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/; + if (!phonePattern.test(newUserPhone)) { + app.toast("手机号码不正确！"); + return false; + } + } + let that = this; + //弹出确认 + wx.showModal({ + title: '提示', + content: '是否确认变更人员手机号？', + success: function (sm) { + if (sm.confirm) { + that.submitChangePhoneForm(); + } + } + }) + }, + + /** + * 确定 + * 变更手机号 + */ + submitChangePhoneForm(){ + let _form = { + ...this.data.form + }; + let { + newUserPhone + } = this.data; + _form.userPhone = newUserPhone; + _form.cardImgPos = ""; + _form.cardImgInv = ""; + _form.userPicture = ""; + _form.subDeptPowerPath = ""; + editSubUsersPhone(_form).then(res =>{ + if(res.code==200){ + app.toast("变更成功!") + this.setData({ + isChange: !this.data.isChange + }) + this.onLoad({id: _form.id}); + } + }); }, /** diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.json b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.json index 3928faa4..c6d742f6 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.json +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.json @@ -1,3 +1,6 @@ { - "usingComponents": {} + "usingComponents": { + "van-steps": "@vant/weapp/steps/index" + }, + "navigationStyle": "custom" } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxml index 16b82b9b..6364b7b2 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxml @@ -1,2 +1,244 @@ - -pages/project_magusers/info/index.wxml \ No newline at end of file + + + + + + + 返回 + + + + 班组人员详情 + + + + + + + + + {{form.projectName}} + + + + + 单位类型 + {{form.subDeptTypeName}} + + + + + 单位名称 + {{form.subDeptName}} + + + + + 所属班组 + {{form.subDeptGroupName}} + + + + + 工种类型 + {{form.craftTypeName}} + + + + + 工种岗位 + + {{form.craftPostName}} + [班组长] + + + + + + 身份证件 + + + + + + + + + + + + + 半身近照 + + + + + + + + + + + + 单位委托书 + + + + + + + + + + + + + 人员姓名 + + {{form.userName}} + + + + + + 身份证号码 + + {{form.cardCode}} + + + + + 所属民族 + {{form.nation}} + + + + + 籍贯地址 + {{form.nativePlace}} + + + + + 详细地址 + {{form.address}} + + + + + 联系电话 + {{form.userPhone}} + + + + + 紧急联系人 + {{form.emergencyContact}} + + + + + 紧急联系电话 + {{form.contactPhone}} + + + + + 开户行名称 + {{form.bankName}} + + + + + 开户行网点 + {{form.bankOffice}} + + + + + 工资银行卡号 + {{form.bankCardNo}} + + + + 高血压、心脏病等基础身体健康问题 + + + 无 + 有 + + + + 严重呼吸系统疾病、严重心脑血管疾病、肝肾疾病、恶性肿瘤以及药物无法有效控制的高血压和糖尿病等基础性病症状征兆 + + + 无 + 有 + + + + + 安全承诺书 + + + 点击下载安全承诺书 + + + + + + + 入场状态 + + 已入场 + 已离场 + + + + + + 审批状态 + + 待提交 + 审核中 + 审核驳回 + 审核通过 + 系统免审 + + + + + + 数据来源 + {{form.createBy}} + + + + + 创建时间 + {{form.createTime}} + + + + + + + 变更手机号码 + + + + 新手机号码 + + + + + + + + 返回取消 + 变更电话 + 提交保存 + 人员离场 + 人员入场 + + \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxss b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxss index 902e5e7a..5f49f05d 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxss +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxss @@ -1 +1,11 @@ -/* pages/project_magusers/info/index.wxss */ \ No newline at end of file +.van-steps { + background-color: transparent !important; +} + +.van-step--horizontal .van-step__circle-container { + background-color: transparent !important; +} + +.van-steps--horizontal { + padding: 10px 20px !important; +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.js b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.js index c71405c4..fc66a673 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.js @@ -115,7 +115,7 @@ Page({ * 统计数据列表 */ getListCount() { - let params = "pageNum=" + this.data.pageNum + "&pageSize=" + this.data.pageSize + "&projectId=" + app.globalData.useProjectId + "&activeTags=finished&searchValue=subUsers"; + let params = "pageNum=" + this.data.pageNum + "&pageSize=" + this.data.pageSize + "&projectId=" + app.globalData.useProjectId + "&activeTags=finished&searchValue=magUsers"; subusersCount(params).then(res => { if (res.code == 200) { let _yrc = 0, diff --git a/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxml index 280e61d3..9304b3cd 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxml @@ -7,7 +7,7 @@ - 班组人员管理 + 总包人员管理 diff --git a/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.wxml index ebf20829..69cded75 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.wxml @@ -20,7 +20,7 @@ 隐患图片 - + diff --git a/yanzhu-ui-app/miniprogram/pages/project_problemmodify/draft/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_problemmodify/draft/index.wxml index 39df8035..f3aa47de 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_problemmodify/draft/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_problemmodify/draft/index.wxml @@ -39,7 +39,7 @@ 隐患图片 - + diff --git a/yanzhu-ui-app/miniprogram/pages/project_problemmodify/modify/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_problemmodify/modify/index.wxml index dbc5da2a..ab4a9bee 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_problemmodify/modify/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_problemmodify/modify/index.wxml @@ -128,7 +128,7 @@ 整改后图片 - + diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml index ee8b2642..758a4e75 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml @@ -50,7 +50,7 @@ 营业执照副本 [有效期内的清晰扫描照片] - + @@ -134,7 +134,7 @@ 代理人半身照 [进场扫脸，请上传清晰照片] - + @@ -142,7 +142,7 @@ 代理人委托书 [需加盖劳务单位的公章委托书照片] - + @@ -266,7 +266,7 @@ 个人半身近照 [进场扫脸，请上传清晰照片] - + @@ -274,7 +274,7 @@ 劳务单位委托书 [需加盖劳务单位的公章委托书照片] - + @@ -431,7 +431,7 @@ 劳务单位委托书 [需加盖劳务单位的公章委托书照片] - + @@ -585,7 +585,7 @@ 个人半身近照 [进场扫脸，请上传清晰照片] - + diff --git a/yanzhu-ui-app/miniprogram/pages/project_subdepts/add/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_subdepts/add/index.wxml index 86720c16..b4bee075 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_subdepts/add/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_subdepts/add/index.wxml @@ -48,7 +48,7 @@ 营业执照副本 [有效期内的清晰扫描照片] - + @@ -132,7 +132,7 @@ 代理人半身照 [进场扫脸，请上传清晰照片] - + @@ -140,7 +140,7 @@ 代理人委托书 [需加盖劳务单位的公章委托书照片] - + diff --git a/yanzhu-ui-app/miniprogram/pages/project_subusers/add/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_subusers/add/index.wxml index 4c9cb25a..57a2c569 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_subusers/add/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_subusers/add/index.wxml @@ -112,7 +112,7 @@ 半身近照 [进场扫脸，请上传清晰照片] - + @@ -120,7 +120,7 @@ 劳务单位委托书 [需加盖劳务单位的公章委托书照片] - +