Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

mg

2022-10-27 0a1d2fe85a280f5543b9b3241aaf8d8a39a32f8c

 src/views/systemSetting/baseSetting/user/components/updateUser/index.vue

@@ -83,6 +83,7 @@
        // 修改用户信息
        handleUser() {
            const { flag, user, tempName, selectOrg, tempRole, isArraySame } = this;
            let umsDepartManage={userId:user.id,departId:selectOrg.orgsid[0]}
            this.$refs.user.validate((valid) => {
                if (valid) {
                    user.isDy = `${user.isDy}`;
@@ -95,30 +96,8 @@
                        } else {
                            if (user.departName) {
                                this.$axios({
                                    method: 'post',
                                    url: `sccg/admin/update/${user.id}`,
                                    data: {
                                        "id": user.id,
                                        "username": user.username,
                                        "password": user.password,
                                        "icon": user.icon,
                                        "email": user.email,
                                        "nickName": user.nickName,
                                        "note": user.note,
                                        "createTime": user.createTime,
                                        "loginTime": user.loginTime,
                                        "status": user.status ? 1 : 0,
                                        "macAddress": user.macAddress,
                                        "ipAddress": user.ipAddress,
                                        "isDy": `${user.isDy}`,
                                        "sex": `${user.sex}`,
                                        "jobTitle": user.jobTitle,
                                        "departmentId": selectOrg.orgsid[0],
                                        "departName": user.departName,
                                        "userType": user.userType,
                                        "zj": user.zj,
                                        "mobile": user.mobile,
                                    }
                                    method: 'put',
                                    url: `/sccg/depart/user_update_depart?userId=`+user.id+'&departId='+selectOrg.orgsid[0]
                                })
                                    .then(res => {
                                        this.$message({