diff --git a/src/views/basicData/components/jobTransferAdd.vue b/src/views/basicData/components/jobTransferAdd.vue index d35d16ec..c420a0a2 100644 --- a/src/views/basicData/components/jobTransferAdd.vue +++ b/src/views/basicData/components/jobTransferAdd.vue @@ -3,7 +3,7 @@ - + @@ -272,12 +272,11 @@ export default { }, mounted() { this.openShow = this.showDialog; - console.log(this.title,this.rowData,'rowData'); + console.log(this.title, this.rowData, 'rowData'); if (this.title == '修改') { // 获取详情 - this.rowData.skill=this.rowData.skill+'' + this.rowData.skill = this.rowData.skill + ''; this.form = this.rowData; - } this.getBasicData(); }, @@ -297,7 +296,7 @@ export default { this.staffTypeData = res.data.data; }); }, - // + //姓名选择 handleUserChange(value, item) { console.log(value, item); if (item) { @@ -310,6 +309,12 @@ export default { this.form.account = item.account; } }, + // 岗位选择 + handleDeptChange(value, item) { + if (item) { + + } + }, closeDialog() { this.openShow = false; this.$emit('closeDialog'); @@ -317,12 +322,14 @@ export default { submit() { this.$refs.form.validate(async valid => { if (valid) { - this.form.inJobDate = this.form.inJobDate?this.form.inJobDate + ' 00:00:00':''; - this.form.endDate = this.form.endDate?this.form.endDate + ' 00:00:00':''; - this.form.dataBirth = this.form.dataBirth?this.form.dataBirth + ' 00:00:00':''; - this.form.contractDuration = this.form.contractDuration?this.form.contractDuration + ' 00:00:00':''; - this.form.joinJobDate = this.form.joinJobDate?this.form.joinJobDate + ' 00:00:00':''; - this.form.inJobDate = this.form.inJobDate?this.form.inJobDate + ' 00:00:00':''; + this.form.inJobDate = this.form.inJobDate ? this.form.inJobDate + ' 00:00:00' : ''; + this.form.endDate = this.form.endDate ? this.form.endDate + ' 00:00:00' : ''; + this.form.dataBirth = this.form.dataBirth ? this.form.dataBirth + ' 00:00:00' : ''; + this.form.contractDuration = this.form.contractDuration + ? this.form.contractDuration + ' 00:00:00' + : ''; + this.form.joinJobDate = this.form.joinJobDate ? this.form.joinJobDate + ' 00:00:00' : ''; + this.form.inJobDate = this.form.inJobDate ? this.form.inJobDate + ' 00:00:00' : ''; add(this.form).then(res => { this.closeDialog(true); diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue index 60f2d293..7e1e38ea 100644 --- a/src/views/basicData/jobTransferManagement.vue +++ b/src/views/basicData/jobTransferManagement.vue @@ -241,7 +241,6 @@ export default { }, option: { tip: false, - align: 'center', height: 'auto', calcHeight: 32, simplePage: false, @@ -270,6 +269,7 @@ export default { index: false, showOverflowTooltip: true, searchLabelPosition: 'left', + searchLabelWidth: 'auto', searchGutter: 24, searchSpan: 6, menuAlign: 'left', @@ -282,55 +282,53 @@ export default { align: 'center', column: [ { - label: '所属班组', + label: '部门', prop: 'deptName', span: 8, search: false, - width: 200, - hide: true, + width: 120, addDisabled: true, }, { - label: '工号', + label: '员工工号', prop: 'userCode', addDisabled: true, span: 8, search: false, - width: 200, + width: 120, searchLabelWidth: 50, }, { label: '姓名', prop: 'userName', span: 8, + search: false, + width: 120, + }, + { + label: '姓名', + prop: 'name', + span: 8, search: true, - width: 200, - - rules: [ - { - required: true, - message: '请输入姓名', - trigger: 'click', - }, - ], + hide: true, + width: 120, }, - // { - // label: '员工编号', - // prop: 'userCode', - // span: 8, - // labelWidth: 150, - // search: true, - // addDisplay: false, - // editDisplay: false, - // width: 200, - // }, + { + label: '岗位', + prop: 'stationName', + span: 8, + search: false, + width: 120, + addDisabled: true, + }, + { label: '所属岗位', prop: 'station', span: 8, labelWidth: 150, search: true, - width: 200, + width: 170, hide: true, filterable: true, type: 'select', @@ -340,13 +338,6 @@ export default { value: 'id', res: 'data.records', }, - rules: [ - { - required: true, - message: '请输入所属岗位', - trigger: 'click', - }, - ], }, { label: '入职时间', @@ -355,17 +346,10 @@ export default { labelWidth: 150, search: false, hide: true, - width: 200, + width: 170, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', - rules: [ - { - required: true, - message: '请输入入职时间', - trigger: 'click', - }, - ], }, { label: '性别', @@ -373,15 +357,15 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, }, { label: '技能等级', prop: 'skillName', span: 8, labelWidth: 150, - search: true, - width: 200, + search: false, + width: 120, }, { label: '用工类型', @@ -389,7 +373,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, }, { label: '民族', @@ -397,7 +381,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, }, { label: '年龄', @@ -405,7 +389,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, }, { label: '身份证号码', @@ -413,53 +397,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, - rules: [ - { - required: false, - message: '请输入身份证号码', - trigger: 'blur', - }, - // { - // pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, - // message: '请输入正确的身份证号码格式', - // trigger: 'blur', - // validator: (rule, value, callback) => { - // if (!value) { - // return callback(new Error('请输入身份证号码')); - // } - // // 15位身份证验证 - // if (value.length === 15) { - // const pattern = /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$/; - // if (!pattern.test(value)) { - // return callback(new Error('请输入有效的15位身份证号码')); - // } - // } - // // 18位身份证验证 - // else if (value.length === 18) { - // const pattern = - // /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/; - // if (!pattern.test(value)) { - // return callback(new Error('请输入有效的18位身份证号码')); - // } - // // 校验码验证 - // const weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]; - // const codes = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2']; - // let sum = 0; - // for (let i = 0; i < 17; i++) { - // sum += parseInt(value.charAt(i)) * weights[i]; - // } - // const lastCode = codes[sum % 11]; - // if (value.toUpperCase().charAt(17) !== lastCode) { - // return callback(new Error('身份证号码校验码不正确，请核对')); - // } - // } else { - // return callback(new Error('身份证号码长度不正确，应为15位或18位')); - // } - // callback(); - // }, - // }, - ], + width: 170, }, { label: '籍贯(市县区乡组)', @@ -468,7 +406,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 170, }, { label: '出生年月', @@ -476,7 +414,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -487,7 +425,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, }, { label: '婚姻状态', @@ -495,7 +433,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, }, { label: '毕业院校', @@ -503,7 +441,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 170, }, { label: '专业', @@ -511,7 +449,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 170, }, { label: '最高学历', @@ -519,7 +457,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, }, { label: '毕业时间', @@ -527,7 +465,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', @@ -539,14 +477,7 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, - rules: [ - { - pattern: /^1[3-9]\d{9}$/, - message: '请输入正确的11位手机号码', - trigger: 'blur', - }, - ], + width: 120, }, { label: '家庭住址', @@ -554,65 +485,67 @@ export default { span: 8, labelWidth: 150, search: false, - width: 200, + width: 170, }, { - label: '任职时间(年)', - prop: 'beInOfficeDuration', + label: '任现值时间', + prop: 'inJobDate', span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, addDisplay: false, editDisplay: false, + type: 'date', + format: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD', }, { - label: '社会工龄(年)', - prop: 'socialWorkingDuration', + label: '任职时间(年)', + prop: 'beInOfficeDuration', span: 8, labelWidth: 150, search: false, + width: 120, addDisplay: false, editDisplay: false, - width: 200, }, - { - label: '合同到期日期', - prop: 'contractDuration', + { + label: '参加工作时间', + prop: 'joinJobDate', span: 8, labelWidth: 150, search: false, - width: 200, - addDisplay: false, - editDisplay: false, + width: 120, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', }, { - label: '参加工作时间', - prop: 'joinJobDate', + label: '社会工龄(年)', + prop: 'socialWorkingDuration', span: 8, labelWidth: 150, search: false, - width: 200, - type: 'date', - format: 'YYYY-MM-DD', - valueFormat: 'YYYY-MM-DD', + addDisplay: false, + editDisplay: false, + width: 120, }, { - label: '入职时间', - prop: 'inJobDate', + label: '合同到期日期', + prop: 'contractDuration', span: 8, labelWidth: 150, search: false, - width: 200, + width: 120, addDisplay: false, editDisplay: false, type: 'date', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD', }, + + { label: '状态', prop: 'phStatus', @@ -624,7 +557,7 @@ export default { editDisplay: false, search: true, filterable: true, - width: 130, + width: 120, searchLabelWidth: 50, dicUrl: '/blade-system/dict/dictionary?code=personnel_position_status', props: { diff --git a/src/views/changeJobManagement/trainingPlan.vue b/src/views/changeJobManagement/trainingPlan.vue index 9cb50813..e5ddc50e 100644 --- a/src/views/changeJobManagement/trainingPlan.vue +++ b/src/views/changeJobManagement/trainingPlan.vue @@ -63,7 +63,7 @@ export default { delBtnIcon: ' ', addBtn: true, labelWidth: 120, - searchLabelWidth: 120, + searchLabelWidth: 'auto', menu: true, menuWidth: 100, dialogWidth: 600, diff --git a/src/views/changeJobManagement/trainingRecordManagement.vue b/src/views/changeJobManagement/trainingRecordManagement.vue index 6ff9a4a2..13ac089d 100644 --- a/src/views/changeJobManagement/trainingRecordManagement.vue +++ b/src/views/changeJobManagement/trainingRecordManagement.vue @@ -228,6 +228,7 @@ export default { viewBtnIcon: ' ', delBtnIcon: ' ', editBtnIcon: ' ', + searchLabelWidth: 'auto', column: [ { @@ -237,7 +238,6 @@ export default { labelWidth: 140, overflow: true, search: true, - searchLabelWidth: 50, }, { label: '工号', @@ -246,7 +246,6 @@ export default { labelWidth: 140, overflow: true, search: true, - searchLabelWidth: 50, }, { label: '用工类型', diff --git a/src/views/qualityTemplate/Template1.vue b/src/views/qualityTemplate/Template1.vue index 73e07f51..146ba4ec 100644 --- a/src/views/qualityTemplate/Template1.vue +++ b/src/views/qualityTemplate/Template1.vue @@ -1,43 +1,50 @@ diff --git a/src/views/zhgd-work/retrospectDefend/components/twoRetrospectDefend.vue b/src/views/zhgd-work/retrospectDefend/components/twoRetrospectDefend.vue index dd778118..57a1eb50 100644 --- a/src/views/zhgd-work/retrospectDefend/components/twoRetrospectDefend.vue +++ b/src/views/zhgd-work/retrospectDefend/components/twoRetrospectDefend.vue @@ -51,6 +51,7 @@ :is="getTemplateComponent(itemSlot.rfpsType)" :itemSlot="itemSlot" :indexSlot="indexSlot" + :itemType="'电子档案维护'" />