Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

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

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml

@@ -97,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test='activeTags == "finished"'> and psu.approve_status <![CDATA[ >= ]]> 100 </if>
             <if test="isDel != null "> and psu.is_del = #{isDel}</if>
             <if test='searchValue == "subUsers"'> and psu.user_post != '66' </if>
+            <if test='searchValue == "magUsers"'> and psu.user_post = '66' </if>
             <if test='searchValue == "sedUsers"'> and psu.sub_dept_type in ('1','4','5') and psu.user_post not in ('4','5') </if>
             <if test="params.beginTime != null and params.beginTime != '' and params.endTime != null and params.endTime != ''"> and date(psu.use_date) between #{params.beginTime} and #{params.endTime}</if>
             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}
     </select>
 
-
     <insert id="insertProProjectInfoSubdeptsUsers" parameterType="ProProjectInfoSubdeptsUsers" useGeneratedKeys="true" keyProperty="id">
         insert into pro_project_info_subdepts_users
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -395,7 +395,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <update id="updateUserPhone">
-        update sys_user set user_name = #{newUserPhone}, phonenumber = #{newUserPhone} where phonenumber = #{oldUserPhone}
+        update sys_user set phonenumber = #{newUserPhone} where phonenumber = #{oldUserPhone}
+    </update>
+
+    <update id="updateUserNames">
+        update sys_user set user_name = #{newUserPhone} where user_name = #{oldUserPhone}
     </update>
 
     <update id="updatePhone">

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;

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));

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<String, Object> visMap = proProjectInfoSubdeptsUsersMapper.findUserPhone(entity.getUserPhone());
+        if(Objects.nonNull(visMap) && Convert.toInt(visMap.get("total"),0)>0){
+            proProjectInfoSubdeptsUsersMapper.updateUserNames(entity.getUserPhone(),proProjectInfoSubdeptsUsers.getUserPhone());
+        }
     }
 
     /**updateUserPhone

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));
     }
 

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<SysRole> 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);
-        }
         try {
             SysDept sysDept = deptMapper.selectDeptById(user.getDeptId());
             Map<String, Object> data = packageSubDeptUsers(user, sysDept);

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
+	})
+}
+

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({

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",

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)
+            })
+        }
+    }
+})

yanzhu-ui-app/miniprogram/components/select-roles/index.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

yanzhu-ui-app/miniprogram/components/select-roles/index.wxml

@@ -0,0 +1,36 @@
+<!--newComponents/select-group-person/index.wxml-->
+<view class="nspect_info_rectifier">
+    <van-row>
+        <van-col span="24" style="text-align: left;">
+            <input placeholder="{{title}}" data-index="{{index}}" placeholder-style="color:#6777aa;" class="inspect_input_fill_in" bindtap="onAddResponsible" disabled="true" value="{{choose}}"/>
+        </van-col>
+    </van-row>
+</view>
+
+
+<van-popup show="{{ show }}" bind:close="onClose" position="bottom">
+    <view class="rectifier_max">
+        <view class="rectifier_title">
+            <view class="rectifier_text">{{title}}</view>
+            <view class="rectifier_close" bindtap="onClose">
+                <van-icon name="cross" />
+            </view>
+        </view>
+        <view class="rectifier_list">
+            <view class="rectifier_list_height">
+                <view class="rectifier_list_for" wx:for="{{rectifierData}}" wx:key="index" data-index="{{index}}" bindtap="onSelected">
+                    <view class="rectifier_list_radio">
+                        <view class="rectifier_list_radio_circle {{item.state?'active':''}}">
+                            <van-icon name="success" wx:if="{{item.state}}" />
+                        </view>
+                    </view>
+                    <view class="rectifier_list_name {{item.state?'active':''}}">{{item.roleName}}<text style="font-size: small;color: coral;"> [{{item.roleKey}}]</text></view>
+                </view>
+            </view>
+        </view>
+        <view class="rectifier_btn">
+            <view bindtap="onClose">取消</view>
+            <view bindtap="onConfirm">确认</view>
+        </view>
+    </view>
+</van-popup>

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;
+}

yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml

@@ -91,7 +91,7 @@
             <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">申请图片
                 <text style="font-size: small;">[其它格式文件请截图上传、电脑端上传]</text>
             </view>
-            <view class="inspect_info_content">
+            <view class="inspect_info_content" style="margin-left: 10px;">
                 <file-uploader bindimages="imgUpload" limit="{{limit}}" fileUrlArray="{{minImageList}}"></file-uploader>
             </view>
         </view>

yanzhu-ui-app/miniprogram/pages/project_flowable/initTask/index.wxml

@@ -39,7 +39,7 @@
             <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">申请图片
                 <text style="font-size: small; color: #ff711e;">[其它格式文件请截图上传或电脑端上传]</text>
             </view>
-            <view class="inspect_info_content">
+            <view class="inspect_info_content" style="margin-left: 10px;">
                 <file-uploader bindimages="fileUpload" limit="{{limit}}"></file-uploader>
             </view>
         </view>

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`
+        })
     },
 
     /**

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"
 }

yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxml

@@ -1,2 +1,122 @@
-<!--pages/project_magusers/add/index.wxml-->
-<text>pages/project_magusers/add/index.wxml</text>
+<view class="header_title">
+    <view class="header_title_row">
+        <van-row>
+            <van-col span="4">
+                <view class="header_img" bindtap="returnToPage">
+                    <image src="/images/left.png"></image>
+                </view>
+            </van-col>
+            <van-col span="15">
+                <view class="header_name">{{form.id?'修改':'新增'}}总包人员</view>
+            </van-col>
+        </van-row>
+    </view>
+</view>
+<view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
+    <view class="inspect_info">
+        <view class="module_title_2 module_title_padding">
+            <view>{{form.projectName}}</view>
+        </view>
+		<view class="inspect_info_list">
+            <van-row>
+                <van-col span="8">
+                    <view class="markers inspect_info_title">身份证正面
+                    </view>
+                    <view class="inspect_info_content" style="margin-left: 10px;">
+                        <file-uploader bindimages="fileUploadCardImgPos" iconClass="in-zcard-click" limit="{{limit}}" fileUrlArray="{{form.cardImgPos}}"></file-uploader>
+                    </view>
+                </van-col>
+                <van-col span="8">
+                    <view class="markers inspect_info_title">身份证反面
+                    </view>
+                    <view class="inspect_info_content" style="margin-left: 10px;">
+                        <file-uploader bindimages="fileUploadCardImgInv" iconClass="in-fcard-click" limit="{{limit}}" fileUrlArray="{{form.cardImgInv}}"></file-uploader>
+                    </view>
+                </van-col>
+				<van-col span="8">
+                    <view class="markers inspect_info_title">半身清晰照
+                    </view>
+                    <view class="inspect_info_content" style="margin-left: 10px;">
+                        <file-uploader bindimages="fileUploadUserPicture" limit="{{limit}}" fileUrlArray="{{form.avatar}}"></file-uploader>
+                    </view>
+                </van-col>
+            </van-row>
+        </view>
+		<view class="inspect_info_list">
+            <view class="markers inspect_info_title">人员姓名
+                <text style="font-size: small; color: #ff711e;">[不可输入，证件自动识别]</text>
+            </view>
+            <view class="inspect_info_content">
+                <input placeholder="请填写姓名" placeholder-style="color:#6777aa;" bindinput="inputUserName" class="inspect_input_fill_in" disabled maxlength="30" model:value="{{form.nickName}}" />
+            </view>
+        </view>
+        <view class="inspect_info_list">
+            <view class="markers inspect_info_title">身份证号
+                <text style="font-size: small; color: #ff711e;">[不可输入，证件自动识别]</text>
+            </view>
+            <view class="inspect_info_content">
+                <input placeholder="请填写身份证号" placeholder-style="color:#6777aa;" bindinput="inputUserCode" class="inspect_input_fill_in" disabled maxlength="30" model:value="{{form.cardCode}}" />
+            </view>
+        </view>
+        <view class="inspect_info_list">
+            <view class="markers inspect_info_title">手机号码
+                <text wx:if="{{form.id}}" style="font-size: small; color: #ff711e;">[不可修改]</text>
+            </view>
+            <view class="inspect_info_content" wx:if="{{form.id}}">
+                <input placeholder-style="color:#6777aa;" model:value="{{form.phonenumber}}" class="inspect_input_fill_out" disabled />
+            </view>
+            <view class="inspect_info_content" wx:if="{{!form.id}}">
+                <input placeholder="请填写手机号码" placeholder-style="color:#6777aa;" bindinput="inputUserPhone" model:value="{{form.phonenumber}}" class="inspect_input_fill_in" maxlength="11"/>
+            </view>
+        </view>
+		<view class="safety_inspect_title module_title_flex">
+			<text class="color_delete">使用手机号码登录系统。</text>
+		</view>
+		<view class="inspect_info_list" wx:if="{{!form.id}}">
+            <view class="markers inspect_info_title">登陆密码</view>
+            <view class="inspect_info_content">
+                <input placeholder="请填写登陆密码" type="password" placeholder-style="color:#6777aa;" bindinput="inputPassword" class="inspect_input_fill_in" maxlength="30" model:value="{{form.password}}" />
+            </view>
+        </view>
+        <view class="inspect_info_list" wx:if="{{!form.id}}">
+            <view class="markers inspect_info_title">岗位部门</view>
+            <view class="inspect_info_content">
+                <voucher-select columns="{{deptsList}}" placeholder="请选择岗位部门" bindchange="onDepts" ></voucher-select>
+            </view>
+        </view>
+		<view class="inspect_info_list" wx:if="{{!form.id}}">
+            <view class="markers inspect_info_title">岗位级别</view>
+            <view class="inspect_info_content">
+                <voucher-select columns="{{postsList}}" placeholder="请选择岗位部门" bindchange="onPosts" selectValue="{{form._userPost}}"></voucher-select>
+            </view>
+        </view>
+		<view class="inspect_info_list" wx:if="{{form.id}}">
+            <view class="markers inspect_info_title">部门岗位</view>
+            <view class="inspect_info_content">
+                <input wx:for="{{allPostList}}" wx:key="index" wx:if="{{item.dictValue==form.workType}}" placeholder-style="color:#6777aa;" model:value="{{item.remark+item.dictLabel}}" class="inspect_input_fill_out" disabled />
+            </view>
+        </view>
+		<view class="inspect_info_list">
+            <view class="markers inspect_info_title">用户角色</view>
+            <view class="inspect_info_content">
+                <select-roles rectifierData="{{proRoleList}}" multiple="{{true}}" bindselected="onAddRoles" title="请选择用户角色" choose="{{form.roleNames}}"></select-roles>
+            </view>
+        </view>
+		
+        <view class="safety_inspect_title module_title_flex">
+            <text class="color_orange">{{form.id?'修改':'新增'}}人员信息不进入审核流程、{{form.id?'修改':'新增'}}后立即生效。</text>
+        </view>
+    </view>
+    <view class="problem_submit_to">
+        <view class="problem_submit_to_btn" bindtap="cancelSaveView">取消</view>
+        <view class="problem_submit_to_btn problem_submit_to_save" bindtap="submitSubUsers">提交保存</view>
+    </view>
+</view>
+
+<van-overlay show="{{loadShow}}">
+    <view class="gif">
+        <image src="/images/loding.gif"></image>
+        <view>数据处理中！请稍后...</view>
+    </view>
+</van-overlay>

yanzhu-ui-app/miniprogram/pages/project_magusers/add/index.wxss

@@ -1 +1,11 @@
-/* pages/project_magusers/add/index.wxss */
+.van-steps {
+	background-color: transparent !important;
+  }
+  
+  .van-step--horizontal .van-step__circle-container {
+	background-color: transparent !important;
+  }
+  
+  .van-steps--horizontal {
+	padding: 10px 20px !important;
+  }

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});
+            }
+        });
     },
 
     /**

yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.json

@@ -1,3 +1,6 @@
 {
-    "usingComponents": {}
+    "usingComponents": {
+        "van-steps": "@vant/weapp/steps/index"
+    },
+    "navigationStyle": "custom"
 }

yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxml

@@ -1,2 +1,244 @@
-<!--pages/project_magusers/info/index.wxml-->
-<text>pages/project_magusers/info/index.wxml</text>
+<view class="header_title">
+    <view class="header_title_row">
+        <van-row>
+            <van-col span="4">
+                <view class="header_img" bindtap="returnToPage">
+                    <image src="/images/left.png"></image>
+                    <text class="header_fh">返回</text>
+                </view>
+            </van-col>
+            <van-col span="16">
+                <view class="header_name">班组人员详情</view>
+            </van-col>
+        </van-row>
+    </view>
+</view>
+<view class="max_content">
+    <van-steps steps="{{ flowNodes }}" active="{{ active }}" />
+    <view class="inspect_overview inspect_overview_max">
+        <view class="module_title module_title_padding">
+            <view>{{form.projectName}}</view>
+        </view>
+        <view class="inspect_info">
+            <view class="inspect_overview_list">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">单位类型</text></van-col>
+                    <van-col span="16" class="color_blue">{{form.subDeptTypeName}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">单位名称</text></van-col>
+                    <van-col span="16">{{form.subDeptName}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.subDeptGroupName}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">所属班组</text></van-col>
+                    <van-col span="16">{{form.subDeptGroupName}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.craftTypeName}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">工种类型</text></van-col>
+                    <van-col span="16">{{form.craftTypeName}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.craftPostName}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">工种岗位</text></van-col>
+                    <van-col span="16">
+                    {{form.craftPostName}}
+                    <text wx:if="{{form.userPost=='3'}}" style="font-size: small; color: #ff6d6d;">[班组长]</text>
+                    </van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.cardImgPos && form.cardImgInv}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">身份证件</text></van-col>
+                    <van-col span="16">
+                        <view class="problem_list_info_con in-img-max">
+                            <view class="in-img-div" wx:key="index">
+                                <image bindtap='showImg' data-set="{{form.cardImgPos}}" src="{{form.cardImgPos+'.min.jpg'}}"></image>
+                                <image bindtap='showImg' data-set="{{form.cardImgInv}}" src="{{form.cardImgInv+'.min.jpg'}}"></image>
+                            </view>
+                        </view>
+                    </van-col>
+                </van-row>
+            </view>
+			<view class="inspect_overview_list" wx:if="{{form.userPicture}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">半身近照</text></van-col>
+                    <van-col span="16">
+                        <view class="problem_list_info_con in-img-max">
+                            <view class="in-img-div" wx:key="index">
+                                <image bindtap='showImg' data-set="{{form.userPicture}}" src="{{form.userPicture+'.min.jpg'}}"></image>
+                            </view>
+                        </view>
+                    </van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.subDeptPowerPath}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">单位委托书</text></van-col>
+                    <van-col span="16">
+                        <view class="problem_list_info_con in-img-max">
+                            <view class="in-img-div" wx:key="index">
+                                <image bindtap='showImg' data-set="{{form.subDeptPowerPath}}" src="{{form.subDeptPowerPath+'.min.jpg'}}"></image>
+                            </view>
+                        </view>
+                    </van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.userName}}">
+                <van-row>
+                    <van-col span="8">
+                        <text class="color_purple">人员姓名</text>
+                    </van-col>
+                    <van-col span="16">{{form.userName}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.cardCode}}">
+                <van-row>
+                    <van-col span="8">
+                        <text class="color_purple">身份证号码</text>
+                    </van-col>
+                    <van-col span="16">{{form.cardCode}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.nation}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">所属民族</text></van-col>
+                    <van-col span="16">{{form.nation}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.nativePlace}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">籍贯地址</text></van-col>
+                    <van-col span="16">{{form.nativePlace}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.address}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">详细地址</text></van-col>
+                    <van-col span="16">{{form.address}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.userPhone}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">联系电话</text></van-col>
+                    <van-col span="16"><text class="color_blue txtb">{{form.userPhone}}</text></van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.emergencyContact}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">紧急联系人</text></van-col>
+                    <van-col span="16">{{form.emergencyContact}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.contactPhone}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">紧急联系电话</text></van-col>
+                    <van-col span="16">{{form.contactPhone}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.bankName}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">开户行名称</text></van-col>
+                    <van-col span="16">{{form.bankName}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.bankOffice}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">开户行网点</text></van-col>
+                    <van-col span="16">{{form.bankOffice}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.bankCardNo}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">工资银行卡号</text></van-col>
+                    <van-col span="16">{{form.bankCardNo}}</van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.illnessStatus!=null}}">
+                <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">高血压、心脏病等基础身体健康问题
+                </view>
+                <view class="inspect_info_content">
+                    <text wx:if="{{form.illnessStatus=='0'}}" class="code_label_2 code_label_green" style="padding: 5rpx 50rpx;font-size: 25rpx;">无</text>
+                    <text wx:if="{{form.illnessStatus!='0'}}" class="code_label_2 code_label_red" style="padding: 5rpx 50rpx;font-size: 25rpx;">有</text>
+                </view>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.supIllnessStatus!=null}}">
+                <view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">严重呼吸系统疾病、严重心脑血管疾病、肝肾疾病、恶性肿瘤以及药物无法有效控制的高血压和糖尿病等基础性病症状征兆
+                </view>
+                <view class="inspect_info_content">
+                    <text wx:if="{{form.supIllnessStatus=='0'}}" class="code_label_2 code_label_green" style="padding: 5rpx 50rpx;font-size: 25rpx;">无</text>
+                    <text wx:if="{{form.supIllnessStatus!='0'}}" class="code_label_2 code_label_red" style="padding: 5rpx 50rpx;font-size: 25rpx;">有</text>
+                </view>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.eduFilePath}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">安全承诺书</text></van-col>
+                    <van-col span="16" class="color_blue">
+                        <view class="files">
+                        <text data-set="{{form.eduFilePath}}" style="word-wrap: break-word;" bindtap='downFile'>点击下载安全承诺书</text>
+                    </view>
+                    </van-col>
+                </van-row>
+            </view>
+            <view class="inspect_overview_list" wx:if="{{form.useStatus}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">入场状态</text></van-col>
+                    <van-col span="16">
+					<text wx:if="{{form.useStatus=='0'}}" class="color_blue txtb">已入场</text>
+					<text wx:if="{{form.useStatus=='1'}}" class="color_delete txtb">已离场</text>
+					</van-col>
+                </van-row>
+            </view>
+			<view class="inspect_overview_list" wx:if="{{form.approveStatus}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">审批状态</text></van-col>
+                    <van-col span="16">
+						<text wx:if="{{form.approveStatus==0}}" class="code_label_2 code_label_yellow" style="padding: 5rpx 50rpx;font-size: 15px;font-weight: 600;">待提交</text>
+						<text wx:if="{{form.approveStatus==10}}" class="code_label_2 code_label_blue" style="padding: 5rpx 50rpx;font-size: 15px;font-weight: 600;">审核中</text>
+						<text wx:if="{{form.approveStatus==11}}" class="code_label_2 code_label_red" style="padding: 5rpx 50rpx;font-size: 15px;font-weight: 600;">审核驳回</text>
+						<text wx:if="{{form.approveStatus==100}}" class="code_label_2 code_label_green" style="padding: 5rpx 50rpx;font-size: 15px;font-weight: 600;">审核通过</text>
+						<text wx:if="{{form.approveStatus==101}}" class="code_label_2 code_label_green" style="padding: 5rpx 50rpx;font-size: 15px;font-weight: 600;">系统免审</text>
+					</van-col>
+                </van-row>
+            </view>
+			<view class="inspect_overview_list" wx:if="{{form.createBy}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">数据来源</text></van-col>
+                    <van-col span="16">{{form.createBy}}</van-col>
+                </van-row>
+            </view>
+			<view class="inspect_overview_list" wx:if="{{form.createTime}}">
+                <van-row>
+                    <van-col span="8"><text class="color_purple">创建时间</text></van-col>
+                    <van-col span="16">{{form.createTime}}</van-col>
+                </van-row>
+            </view>
+        </view>
+    </view>
+    <view class="inspect_overview" wx:if="{{isChange}}">
+        <view class="module_title module_title_padding">
+            <view>变更手机号码</view>
+        </view>
+        <view class="inspect_overview_list_max">
+            <view class="inspect_info_list">
+                <view class="markers inspect_info_title">新手机号码</view>
+                <view class="inspect_info_content">
+                    <input placeholder="请填写新手机号码" placeholder-style="color:#6777aa;" bindinput="inputUserPhone" model:value="{{newUserPhone}}" class="inspect_input_fill_in" maxlength="11"/>
+                </view>
+            </view>
+        </view>
+    </view>
+    <view class="problem_submit_to">
+        <view class="problem_submit_to_btn" bindtap="returnToPage">返回取消</view>
+        <view wx:if="{{!isChange}}" class="problem_submit_to_btn problem_submit_to_view_eq" bindtap="changeUserPhone">变更电话</view>
+        <view wx:if="{{isChange}}" class="problem_submit_to_btn problem_submit_to_view_save" bindtap="submitChangePhone">提交保存</view>
+        <view wx:if="{{form.useStatus=='0'}}" class="problem_submit_to_btn problem_submit_to_delete" bindtap="submitSubDeptsOut">人员离场</view>
+        <view wx:if="{{form.useStatus=='1'}}" class="problem_submit_to_btn problem_submit_to_warning" bindtap="submitSubDeptsIn">人员入场</view>
+    </view>
+</view>

yanzhu-ui-app/miniprogram/pages/project_magusers/info/index.wxss

@@ -1 +1,11 @@
-/* pages/project_magusers/info/index.wxss */
+.van-steps {
+	background-color: transparent !important;
+}
+
+.van-step--horizontal .van-step__circle-container {
+	background-color: transparent !important;
+}
+
+.van-steps--horizontal {
+	padding: 10px 20px !important;
+}

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,

yanzhu-ui-app/miniprogram/pages/project_magusers/list/index.wxml

@@ -7,7 +7,7 @@
 				</view>
 			</van-col>
 			<van-col span="15">
-				<view class="header_name">班组人员管理</view>
+				<view class="header_name">总包人员管理</view>
 			</van-col>
 		</van-row>
 	</view>

yanzhu-ui-app/miniprogram/pages/project_problemmodify/add/index.wxml

@@ -20,7 +20,7 @@
         </view>
         <view class="inspect_info_list">
             <view class="markers inspect_info_title">隐患图片</view>
-            <view class="inspect_info_content">
+            <view class="inspect_info_content" style="margin-left: 10px;">
                 <file-uploader bindimages="onImagesArr"></file-uploader>
             </view>
         </view>

yanzhu-ui-app/miniprogram/pages/project_problemmodify/draft/index.wxml

@@ -39,7 +39,7 @@
         </view>
         <view class="inspect_info_list">
             <view class="markers inspect_info_title">隐患图片</view>
-            <view class="problem_list_info_con">
+            <view class="problem_list_info_con" style="margin-left: 10px;">
                 <file-uploader  bindimages="onImagesArr" data-index="{{index}}" fileUrlArray="{{item.image_upload}}"></file-uploader>
             </view>
         </view>

yanzhu-ui-app/miniprogram/pages/project_problemmodify/modify/index.wxml

@@ -128,7 +128,7 @@
 			</view>
 			<view class="inspect_info_list">
 				<view class="markers inspect_info_title">整改后图片</view>
-				<view class="problem_list_info_con">
+				<view class="problem_list_info_con" style="margin-left: 10px;">
 					<file-uploader bindimages="onImagesArr"></file-uploader>
 				</view>
 			</view>

yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml

@@ -50,7 +50,7 @@
                     <view class="markers inspect_info_title">营业执照副本
                         <text style="font-size: small; color: #ff711e;">[有效期内的清晰扫描照片]</text>
                     </view>
-                    <view class="inspect_info_content">
+                    <view class="inspect_info_content" style="margin-left: 10px;">
                         <file-uploader bindimages="fileUpload0" limit="{{limit}}" fileUrlArray="{{form.businessLicensePath}}"></file-uploader>
                     </view>
                 </view>
@@ -134,7 +134,7 @@
                     <view class="markers inspect_info_title">代理人半身照
                         <text style="font-size: small; color: #ff711e;">[进场扫脸，请上传清晰照片]</text>
                     </view>
-                    <view class="inspect_info_content">
+                    <view class="inspect_info_content" style="margin-left: 10px;">
                         <file-uploader bindimages="fileUpload5" limit="{{limit}}" fileUrlArray="{{form.leaderUserPicture}}"></file-uploader>
                     </view>
                 </view>
@@ -142,7 +142,7 @@
                     <view class="markers inspect_info_title">代理人委托书
                         <text style="font-size: small; color: #ff711e;">[需加盖劳务单位的公章委托书照片]</text>
                     </view>
-                    <view class="inspect_info_content">
+                    <view class="inspect_info_content" style="margin-left: 10px;">
                         <file-uploader bindimages="fileUpload6" limit="{{limit}}" fileUrlArray="{{form.subDeptLeaderPowerPath}}"></file-uploader>
                     </view>
                 </view>
@@ -266,7 +266,7 @@
                     <view class="markers inspect_info_title">个人半身近照
                         <text style="font-size: small; color: #ff711e;">[进场扫脸，请上传清晰照片]</text>
                     </view>
-                    <view class="inspect_info_content">
+                    <view class="inspect_info_content" style="margin-left: 10px;">
                         <file-uploader bindimages="fileUploadUserPicture" limit="{{limit}}" fileUrlArray="{{form.userPicture}}"></file-uploader>
                     </view>
                 </view>
@@ -274,7 +274,7 @@
                     <view class="markers inspect_info_title">劳务单位委托书
                         <text style="font-size: small; color: #ff711e;">[需加盖劳务单位的公章委托书照片]</text>
                     </view>
-                    <view class="inspect_info_content">
+                    <view class="inspect_info_content" style="margin-left: 10px;">
                         <file-uploader bindimages="fileUploadDeptPower" limit="{{limit}}" fileUrlArray="{{form.subDeptPowerPath}}"></file-uploader>
                     </view>
                 </view>
@@ -431,7 +431,7 @@
                     <view class="markers inspect_info_title">劳务单位委托书
                         <text style="font-size: small; color: #ff711e;">[需加盖劳务单位的公章委托书照片]</text>
                     </view>
-                    <view class="inspect_info_content">
+                    <view class="inspect_info_content" style="margin-left: 10px;">
                         <file-uploader bindimages="fileUploadDeptPower" limit="{{limit}}" fileUrlArray="{{form.subDeptPowerPath}}"></file-uploader>
                     </view>
                 </view>
@@ -585,7 +585,7 @@
                     <view class="markers inspect_info_title">个人半身近照
                         <text style="font-size: small; color: #ff711e;">[进场扫脸，请上传清晰照片]</text>
                     </view>
-                    <view class="inspect_info_content">
+                    <view class="inspect_info_content" style="margin-left: 10px;">
                         <file-uploader bindimages="fileUploadUserPicture" limit="{{limit}}" fileUrlArray="{{form.userPicture}}"></file-uploader>
                     </view>
                 </view>

yanzhu-ui-app/miniprogram/pages/project_subdepts/add/index.wxml

@@ -48,7 +48,7 @@
             <view class="markers inspect_info_title">营业执照副本
                 <text style="font-size: small; color: #ff711e;">[有效期内的清晰扫描照片]</text>
             </view>
-            <view class="inspect_info_content">
+            <view class="inspect_info_content" style="margin-left: 10px;">
                 <file-uploader bindimages="fileUpload0" limit="{{limit}}" fileUrlArray="{{form.businessLicensePath}}"></file-uploader>
             </view>
         </view>
@@ -132,7 +132,7 @@
             <view class="markers inspect_info_title">代理人半身照
                 <text style="font-size: small; color: #ff711e;">[进场扫脸，请上传清晰照片]</text>
             </view>
-            <view class="inspect_info_content">
+            <view class="inspect_info_content" style="margin-left: 10px;">
                 <file-uploader bindimages="fileUpload5" limit="{{limit}}" fileUrlArray="{{form.leaderUserPicture}}"></file-uploader>
             </view>
         </view>
@@ -140,7 +140,7 @@
             <view class="markers inspect_info_title">代理人委托书
                 <text style="font-size: small; color: #ff711e;">[需加盖劳务单位的公章委托书照片]</text>
             </view>
-            <view class="inspect_info_content">
+            <view class="inspect_info_content" style="margin-left: 10px;">
                 <file-uploader bindimages="fileUpload6" limit="{{limit}}" fileUrlArray="{{form.subDeptLeaderPowerPath}}"></file-uploader>
             </view>
         </view>

yanzhu-ui-app/miniprogram/pages/project_subusers/add/index.wxml

@@ -112,7 +112,7 @@
             <view class="markers inspect_info_title">半身近照
                 <text style="font-size: small; color: #ff711e;">[进场扫脸，请上传清晰照片]</text>
             </view>
-            <view class="inspect_info_content">
+            <view class="inspect_info_content" style="margin-left: 10px;">
                 <file-uploader bindimages="fileUploadUserPicture" limit="{{limit}}" fileUrlArray="{{form.userPicture}}"></file-uploader>
             </view>
         </view>
@@ -120,7 +120,7 @@
             <view class="markers inspect_info_title">劳务单位委托书
                 <text style="font-size: small; color: #ff711e;">[需加盖劳务单位的公章委托书照片]</text>
             </view>
-            <view class="inspect_info_content">
+            <view class="inspect_info_content" style="margin-left: 10px;">
                 <file-uploader bindimages="fileUploadDeptPower" limit="{{limit}}" fileUrlArray="{{form.subDeptPowerPath}}"></file-uploader>
             </view>
         </view>