jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

在合并 "dev_xd" 和 "origin/dev_xd" 前自动存档

dev_xd
haha 2025-01-07 00:34:41 +08:00
parent 654d6bf001
commit 80e68aeae4
3 changed files with 63 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
View File

@ -70,13 +70,16 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="头像" align="center">
<template #default="scope">
<el-image :src="scope.row.user.userPicture" style="height:80px;" :preview-teleported="true"
:preview-src-list="[scope.row.user.userPicture]"></el-image>
<el-image :src="scope.row.userPicture" style="height:80px;" :preview-teleported="true"
:preview-src-list="[scope.row.userPicture]"></el-image>
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="手机" align="center" prop="userPhone" />
<el-table-column label="身份证" align="center" prop="cardCode" />
<el-table-column label="性别" align="center" prop="userSex" width="80" />
<el-table-column label="性别" align="center" prop="userSex">
<template #default="scope">{{ scope.row.userSex == '男' ? '男' : '女' }}</template>
</el-table-column>
<el-table-column label="民族" align="center" prop="info.nation" width="80" />
<el-table-column label="所属单位" align="center" prop="subDeptName" />
@ -492,7 +495,6 @@ function doSubDeptChange(type) {
data.deptGroups = d.rows || [];
if (data.deptGroups.length > 0) {
let dg = data.deptGroups[0];
form.value.groupName = dg.groupName;
form.value.craftTypeName = getCraftType(dg.craftType);
form.value.craftPostName = getCraftPost(dg.craftPost).label;
@ -526,7 +528,9 @@ function doDeptGroupChange() {
form.value.groupName = dg.groupName;
form.value.craftTypeName = getCraftType(dg.craftType);
form.value.craftPostName = getCraftPost(dg.craftPost);
if(data.mode != 'edit'){
form.value.craftPost = dg.craftPost
}
form.value.craftType = dg.craftType;
data.isManager = !dg.craftPost;
}
@ -628,7 +632,6 @@ function handleUpdate(row) {
obj.educationalType = obj.degreeGrade
form.value = obj;
form.value.userId = obj.userId;
form.value.projectId = row.projectId;
form.value.projectName = row.projectName;
//showEditUser(obj.user);
@ -639,7 +642,11 @@ function handleUpdate(row) {
//doDeptGroupChange();
setTimeout(() => {
doSubDeptChange();
setTimeout(() => {
form.value.craftPost = response.data.craftPost;
console.log("++++++>",form.value.craftPost)
}, 400)
}, 400);
});
});

4
yanzhu-ui-vue3/src/views/system/user/index.vue
View File

@ -307,7 +307,9 @@ const data = reactive({
avatar: [{ required: true, message: "入场近照不能为空", trigger: "change" }],
roleIds: [{ required: true, message: "用户角色不能为空", trigger: "change" }],
password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }],
phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
cardCode: [{ required: true, message: "用户名称不能为空", trigger: "blur" }],
avatar: [{ required: true, message: "入场近照不能为空", trigger: "change" }],
}
});

7
yanzhu-ui-vue3/vite.config.js
View File

@ -44,9 +44,12 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api/, '')
},
'/statics': {
target: `http://localhost:9300/statics/`,
//target: `http://localhost:9300`,
target: 'http://62.234.3.186',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/statics/, '')
pathRewrite: {
"^/statics": "/",
},
},
}