From 48750d465d5679efe9e847fdd298590b4daebe5a Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 13 Dec 2023 11:46:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=AE=BE=E7=BD=AE=E6=A0=87=E5=87=86=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=B8=BA1,2,3=E7=BA=A7=EF=BC=8C=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E9=83=A8=E9=97=A8=E5=B8=A6=E5=87=BA=E7=9A=84=E6=98=AF?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=A0=87=E5=87=86=E7=9A=84=E4=B8=BB=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E5=8D=95=E4=BD=8D=EF=BC=8C=E4=B8=BB=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BF=AE=E6=94=B9=E5=90=8E=E4=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=88=E6=9D=83=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/customField/AddForm.vue | 33 +++++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 0700e61b..39a92414 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -332,8 +332,10 @@ export default { } } else if (val === StandardGradeClassify.ONE_LEVEL.value) { // 选的是1级 - // 带出3级的部门：起草部门 - this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds + // // 带出3级的部门：起草部门 + // this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds + // 带出主起草单位 + this.formInline.auth_dept = this.formInline.main_drafting_unit // 设置可选择项 this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '1').deptIds.split(',') this.formInline = JSON.parse(JSON.stringify(this.formInline)) @@ -343,8 +345,10 @@ export default { } } else if (val === StandardGradeClassify.TWO_LEVEL.value) { // 选的是2级 - // 带出3级的部门：起草部门 - this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds + // // 带出3级的部门：起草部门 + // this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds + // 带出主起草单位 + this.formInline.auth_dept = this.formInline.main_drafting_unit // 设置可选择项 this.departSelectRange = this.standardGradeClassification.find(item => item.level + '' === '2').deptIds.split(',') this.formInline = JSON.parse(JSON.stringify(this.formInline)) @@ -353,8 +357,10 @@ export default { this.innerDisabledField = this.innerDisabledField.filter(item => item !== 'auth_dept') } } else if (val === StandardGradeClassify.THREE_LEVEL.value) { - // 选的是3级，授权部门带出不可编辑 - this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds + // // 选的是3级，授权部门带出不可编辑 + // this.formInline.auth_dept = this.standardGradeClassification.find(item => item.level + '' === '3').deptIds + // 选的是3级，带出主起草单位 + this.formInline.auth_dept = this.formInline.main_drafting_unit if (!this.innerDisabledField.includes('auth_dept')) { this.innerDisabledField.push('auth_dept') } @@ -389,6 +395,21 @@ export default { } } }, + // 主起草单位改变后，需要将选中的主起草单位增加到授权部门 + 'formInline.main_drafting_unit' (val) { + if (val) { + if (this.formInline.grade_classification === StandardGradeClassify.ONE_LEVEL.value || + this.formInline.grade_classification === StandardGradeClassify.TWO_LEVEL.value) { + // 标准等级分类是1级或者2级需要，把主起草单位追加到授权部门 + const authDeptArr = (this.formInline.auth_dept || '').split(',') + authDeptArr.push(val) + this.formInline.auth_dept = authDeptArr.join(',') + } else if (this.formInline.grade_classification === StandardGradeClassify.THREE_LEVEL.value) { + // 标准等级分类是3级，把授权部门替换成主起草单位 + this.formInline.auth_dept = val + } + } + }, // 企标是否试行改变，标准状态需要跟着变,试行周期必填校验也跟着变 'formInline.try_flag' (val) { if (val && this.flag === StandardSource.ENTERPRISE.value) { From b4fc8856f2b8ca0b26442a7c0e6c023640150283 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 13 Dec 2023 12:04:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=88=E6=9D=83=E9=83=A8=E9=97=A8=EF=BC=8C=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=AD=89=E7=BA=A7=E5=88=86=E7=B1=BB=E6=98=AF1,2?= =?UTF-8?q?=E7=BA=A7=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=8A=8A=E5=8E=9F=E6=9C=AC=E7=9A=84=E4=B8=BB?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E9=83=A8=E9=97=A8=E6=9B=BF=E6=8D=A2=E6=88=90?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E4=B8=BB=E8=B5=B7=E8=8D=89=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/customField/AddForm.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue index 39a92414..9ef90ed6 100644 --- a/src/components/customField/AddForm.vue +++ b/src/components/customField/AddForm.vue @@ -313,7 +313,8 @@ export default { standardGradeClassification: [], // 企标级别映射 innerDisabledField: [], // 内部不可编辑字段 departSelectRange: [], // 选择部门的选择范围，传了就只能从这些里面选，不传就都能选 - isEditSetData: false // 正在编辑回显数据 + isEditSetData: false, // 正在编辑回显数据 + oldMainDraftingUnit: '' // 上一次的主起草单位 } }, watch: { @@ -401,13 +402,15 @@ export default { if (this.formInline.grade_classification === StandardGradeClassify.ONE_LEVEL.value || this.formInline.grade_classification === StandardGradeClassify.TWO_LEVEL.value) { // 标准等级分类是1级或者2级需要，把主起草单位追加到授权部门 - const authDeptArr = (this.formInline.auth_dept || '').split(',') + let authDeptArr = (this.formInline.auth_dept || '').split(',') + authDeptArr = authDeptArr.filter(item => item !== this.oldMainDraftingUnit) authDeptArr.push(val) this.formInline.auth_dept = authDeptArr.join(',') } else if (this.formInline.grade_classification === StandardGradeClassify.THREE_LEVEL.value) { // 标准等级分类是3级，把授权部门替换成主起草单位 this.formInline.auth_dept = val } + this.oldMainDraftingUnit = val } }, // 企标是否试行改变，标准状态需要跟着变,试行周期必填校验也跟着变 From b471a3be3fcb16707ce68214778fe4e54ea6ece9 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 13 Dec 2023 13:46:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[update]=20=E5=8E=BB=E6=8E=89=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E7=9A=84=E8=AE=B0=E4=BD=8F=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E5=92=8C=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/Login.vue | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 290164f2..5c7a8522 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -37,7 +37,7 @@ - + @@ -58,22 +58,22 @@ - - - - - 自动登录 - - - - - - - 忘记密码 - - - - + + + + + + + + + + + + + + + + @@ -430,7 +430,7 @@ function isMobile () { .user-layout-login{ z-index: 99; width: 24%; - height: 59%; + height: 50%; padding: 3% 0 3% 0; min-width: 332px; min-height: 460px; From 4a285124d3f2d708dc51139f398293e72413b143 Mon Sep 17 00:00:00 2001 From: danshihao Date: Wed, 13 Dec 2023 14:41:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=AE=A3?= =?UTF-8?q?=E8=B4=AF=E6=B5=81=E7=A8=8B=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/BaseInfoForm.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/workCenter/standardPromotionProcess/modules/BaseInfoForm.vue b/src/views/workCenter/standardPromotionProcess/modules/BaseInfoForm.vue index 0149958f..3f96e267 100644 --- a/src/views/workCenter/standardPromotionProcess/modules/BaseInfoForm.vue +++ b/src/views/workCenter/standardPromotionProcess/modules/BaseInfoForm.vue @@ -138,7 +138,7 @@ @@ -297,11 +297,13 @@ export default { changeParticipatingUnits (val) { getLiaisonList({ deptIds: val }).then(res => { if (res.success) { - const data = res.result || '' + const data = res.result || [] + const ids = data.map(item => item.contactId).join(',') + const names = data.map(item => item.contactIdDictText).join(',') // 如果是清空，设置禁用，否则根据返回内容设置禁用 - this.disabledInitiator = val ? !!data : true - this.initiatorName = data - this.$set(this.formInline, 'initiator', data) + this.disabledInitiator = val ? !!ids : true + this.initiatorName = names + this.$set(this.formInline, 'initiator', ids) } }) }