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

提交代码

dev_xd
姜玉琦 2025-06-11 11:09:00 +08:00
parent 6b33efbbc6
commit f00b11679f
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsGroup/index.vue
View File

@ -122,18 +122,24 @@
<el-tag effect="plain">{{ form.projectName }}</el-tag>
</el-form-item>
<el-form-item label="所属单位" prop="subDeptId">
<el-select v-model="form.subDeptId" placeholder="请选择所属单位" style="width:100%">
<el-select v-model="form.subDeptId" placeholder="请选择所属单位" style="width:100%" @change="changeSubDept">
<el-option v-for="dept in subDeptOptions" :key="dept.id" :label="dept.subDeptName"
:value="dept.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工种类型" prop="craftType">
<el-form-item v-if="form.subDeptType && (form.subDeptType=='4' || form.subDeptType=='5')" label="工种类型" prop="craftType">
<el-select v-model="form.craftType" placeholder="请选择工种类型" style="width:100%">
<el-option v-for="dict in pro_craft_type" v-show="dict.value != '3'" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工种岗位" prop="craftPost" v-if="form.craftType">
<el-form-item v-if="form.subDeptType && (form.subDeptType!='4' && form.subDeptType!='5')" label="工种类型" prop="craftType">
<el-select v-model="form.craftType" placeholder="请选择工种类型" style="width:100%">
<el-option v-for="dict in pro_craft_type" v-show="dict.value == '3'" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工种岗位" prop="craftPost" v-if="form.subDeptType && (form.subDeptType=='4' || form.subDeptType=='5') && form.craftType">
<el-select v-model="form.craftPost" placeholder="请选择工种岗位" style="width:100%">
<el-option v-for="dict in pro_craft_post" v-show="dict.elTagClass == form.craftType" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
@ -414,10 +420,22 @@ function handleExport() {
}, `proProjectInfoSubdeptsGroup_${new Date().getTime()}.xlsx`)
}
/** 选择参建单位 */
function changeSubDept(){
form.value.subDeptType=null;
form.value.craftType=null;
form.value.craftPost=null;
subDeptOptions.value.forEach(item => {
if(item.id==form.value.subDeptId){
form.value.subDeptType=item.subDeptType;
}
})
}
/** 初始化 */
function initSubDeptOptions(value) {
findAllProjectInfoSubdepts({ 'projectId': value, 'activeTags':"finished" }).then(res => {
subDeptOptions.value = (res.data||[]).filter(d=>["4","5"].includes( d.subDeptType));
subDeptOptions.value = res.data;//(res.data||[]).filter(d=>["4","5"].includes( d.subDeptType));
})
}

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

@ -74,7 +74,10 @@
<el-table-column label="手机" align="center" prop="userPhone" />
<el-table-column label="身份证" align="center" prop="cardCode" />
<el-table-column label="性别" align="center" prop="userSex">
<template #default="scope">{{ scope.row.userSex == '男' ? '男' : '女' }}</template>
<template #default="scope">
<span v-if="!isNaN(scope.row.userSex)"><dict-tag :options="sys_user_sex" :value="scope.row.userSex" /></span>
<span v-if="isNaN(scope.row.userSex)">{{ scope.row.userSex == '女' ? '女' : '男' }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="民族" align="center" prop="info.nation" width="80" /> -->
<el-table-column label="所属单位" align="center" prop="subDeptName" />
@ -243,7 +246,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="性别">
<el-radio-group v-model="form.sex">
<el-radio-group v-model="form.userSex">
<el-radio v-for="(dict, idx) in sys_user_sex" :key="idx" :label="dict.label" :value="dict.value">
{{
dict.label }}
@ -476,9 +479,9 @@ function doImageUpload(type) {
form.value.nation = tmps[0] || form.value.nation || ''
}
}
let sex = d.data.sex || ''
if (sex) {
form.value.sex = sex ? (sex == '男' ? '0' : '1') : form.value.sex
let userSex = d.data.userSex || ''
if (userSex) {
form.value.userSex = userSex ? (userSex == '男' ? '0' : '1') : form.value.userSex
}
let birthDay = d.data.birthDay
if (birthDay && birthDay.length == 8) {
@ -571,7 +574,7 @@ function reset() {
craftPost: '', //工种编号
nation: '', //民族
age: 20, //年龄
sex: '0', //性别
userSex: '0', //性别
educationalType: '', //文件程度
birthDay: '', //出生日期
nativePlace: '', //籍贯
@ -728,7 +731,7 @@ function handleAdd() {
form.value.comId = userStore.currentComId
form.value.projectName = userStore.currentProName
form.value.nation = data.nationOpts[0]
form.value.sex = '0'
form.value.userSex = '0'
form.value.userPost = ''
loading.value = false
})
@ -749,7 +752,7 @@ function handleUpdate(row) {
obj.info = tryToJson(obj.userInfos || '{}')
obj.certificateType = obj.cardType
obj.certificateCode = obj.cardCode
obj.sex = obj.userSex
obj.userSex = obj.userSex
obj.nation = obj.info.nation
obj.birthDay = obj.info.birthDay
obj.nativePlace = obj.info.nativePlace
@ -895,7 +898,7 @@ function showEditUser(user) {
form.value.cardImgInv = user.cardImgInv
form.value.nation = info.nation
form.value.sex = user.sex
form.value.userSex = user.userSex
form.value.educationalType = info.educationalType
form.value.birthDay = info.birthDay
form.value.nativePlace = info.nativePlace
@ -941,7 +944,7 @@ function submitForm() {
userName: form.value.userName,
cardType: form.value.certificateType,
cardCode: form.value.certificateCode,
userSex: form.value.sex,
userSex: form.value.userSex,
userPicture: form.value.faceImage,
userPhone: form.value.userPhone,
degreeGrade: form.value.educationalType,