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

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

dev_xd
姜玉琦 2024-10-07 22:44:04 +08:00
parent 7352d2df76 4e2e4c831f
commit c7dd2063a6
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java
View File

@ -76,6 +76,16 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
@Excel(name = "班组")
private String subDeptGroupName;
public int getHasRegister() {
return hasRegister;
}
public void setHasRegister(int hasRegister) {
this.hasRegister = hasRegister;
}
private int hasRegister;
public String getAdmitGuid() {
return admitGuid;
}

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

@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="subStep" column="sub_step" />
<result property="illnessStatus" column="illness_status" />
<result property="supIllnessStatus" column="sup_illness_status" />
<result property="hasRegister" column="has_register"/>
<result property="isDel" column="is_del" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@ -62,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time,
psu.user_phone,psu.certificate_type,psu.certificate_code,psu.sub_dept_group,psu.sub_dept_group_name,psu.nation,psu.age,psu.sex,
psu.educational_type,psu.birth_day,psu.native_place,psu.address,psu.emergency_contact,psu.contact_phone,
psu.bank_name,psu.bank_card_no,psu.bank_office,psu.certificate_photo1,psu.certificate_photo2,psu.face_image,psu.admit_guid,
psu.bank_name,psu.bank_card_no,psu.bank_office,psu.certificate_photo1,psu.certificate_photo2,psu.face_image,psu.admit_guid,psu.has_register,
psu.remark
from pro_project_info_subdepts_users psu
left join pro_project_info pi on pi.id = psu.project_id
@ -81,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userName != null and userName != ''"> and psu.user_name like concat('%', #{userName}, '%')</if>
<if test="userPhone != null and userPhone != ''"> and psu.user_phone like concat('%', #{userPhone}, '%')</if>
<if test="craftType != null and craftType != ''"> and psu.craft_type = #{craftType}</if>
<if test="hasRegister != null and hasRegister != ''"> and psu.has_register = #{hasRegister}</if>
<if test="subDeptGroup != null and subDeptGroup != ''"> and psu.sub_dept_group = #{subDeptGroup}</if>
<if test="craftPost != null and craftPost != ''"> and psu.craft_post = #{craftPost}</if>
<if test="eduStatus != null and eduStatus != ''"> and psu.edu_status = #{eduStatus}</if>
@ -142,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="subStep != null">sub_step,</if>
<if test="illnessStatus != null">illness_status,</if>
<if test="supIllnessStatus != null">sup_illness_status,</if>
<if test="hasRegister != null">has_register,</if>
<if test="isDel != null">is_del,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@ -190,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="subStep != null">#{subStep},</if>
<if test="illnessStatus != null">#{illnessStatus},</if>
<if test="supIllnessStatus != null">#{supIllnessStatus},</if>
<if test="hasRegister != null">#{hasRegister},</if>
<if test="isDel != null">#{isDel},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@ -242,6 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="subStep != null">sub_step = #{subStep},</if>
<if test="illnessStatus != null">illness_status = #{illnessStatus},</if>
<if test="supIllnessStatus != null">sup_illness_status = #{supIllnessStatus},</if>
<if test="hasRegister != null">has_register = #{hasRegister},</if>
<if test="isDel != null">is_del = #{isDel},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>

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

@ -101,7 +101,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="所属单位" prop="subDeptId">
<el-select v-model="form.subDeptId" placeholder="请选择所属单位" @change="doSubDeptChange">
<el-select v-model="form.subDeptId" placeholder="请选择所属单位" @change="doSubDeptChange()">
<el-option v-for="(it, idx) in data.subdepts" :key="it.id" :label="it.subDeptName" :value="it.id" />
</el-select>
</el-form-item>
@ -356,7 +356,7 @@ function doSubDeptChange(type) {
}else{
if ( !form.value.subDeptId) {
data.deptGroups = [];
form.value.subDeptId = "";
form.value.subDeptGroup = "";
form.value.groupName = "";
form.value.craftPostName = "";
form.value.craftTypeName = "";
@ -372,7 +372,7 @@ function doSubDeptChange(type) {
data.deptGroups = d.rows || [];
if (data.deptGroups.length > 0) {
let dg = data.deptGroups[0];
form.value.subDeptId = dg.id;
form.value.subDeptGroup = dg.id;
form.value.groupName = dg.groupName;
form.value.craftTypeName = getCraftType(dg.craftType);
form.value.craftPostName = getCraftPost(dg.craftPost).label;
@ -389,6 +389,7 @@ function doDeptGroupChange() {
data.isManager = false
if (!form.value.subDeptGroup) {
form.value.groupName = "";
form.value.subDeptGroup ="";
form.value.craftPostName = "";
form.value.craftTypeName = "";
form.value.craftType = "";
@ -440,7 +441,7 @@ function loadSubDepts(cb) {
data.subdepts = d.rows || [];
if (data.subdepts.length > 0) {
let sd = data.subdepts[0];
form.value.subDeptId = sd.id;
form.value.subDeptId = ""+sd.id;
doSubDeptChange();
}
cb && cb();
@ -566,6 +567,11 @@ loadSubDepts();
.el-upload__tip {
display: none;
}
.el-upload-list--picture-card{
.el-upload-list__item{
width:240px;
}
}
}
.div-header {
@ -584,6 +590,11 @@ loadSubDepts();
.el-upload__tip {
display: none;
}
.el-upload-list--picture-card{
.el-upload-list__item{
width:240px;
}
}
}
.face-image {