From c5717d6246b8d85b00b3f72adfa0af576a810988 Mon Sep 17 00:00:00 2001 From: zty <1048209592@qq.com> Date: Sat, 27 Jul 2024 12:42:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E7=AB=8B=E9=A1=B9=E5=AF=B9?= =?UTF-8?q?=E5=AD=A3=E5=BA=A6=E5=AE=A1=E6=A0=B8=E6=8C=87=E6=A0=87=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/AddProjectApply.vue | 49 ++++---- .../pages/projectManagement/ProjectDetail.vue | 119 +++++++++--------- 2 files changed, 78 insertions(+), 90 deletions(-) diff --git a/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue b/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue index 2d21c05..40da540 100644 --- a/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue +++ b/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue @@ -574,7 +574,6 @@ export default { span: 24, model: { quarter: '', - number: '', indexName: '', levelA: '', levelB: '', @@ -588,68 +587,64 @@ export default { type: 'custom-selector', title: '季度', model: 'quarter', - span: 5, + span: 12, externalValue: { multiple: false, options: this.formQuarterData } }, - { - type: 'custom-input-number', - title: '序号', - model: 'number', - span: 4, - externalValue: {} - }, + // { + // type: 'custom-input-number', + // title: '序号', + // model: 'number', + // span: 8, + // externalValue: {} + // }, { type: 'custom-input', title: '指标名称', model: 'indexName', - span: 7, + span: 12, externalValue: {} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'A档', model: 'levelA', - span: 4, externalValue: {} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'B档', model: 'levelB', - span: 4, externalValue: {} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'C档', model: 'levelC', - span: 4, externalValue: {} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'D档', model: 'levelD', - span: 4, externalValue: {} }, { type: 'custom-input', - title: '预算累计执行率', + title: '预算执行率', model: 'budgetRate', - span: 6, - externalValue: {} - }, - { - type: 'custom-input', - title: '成本累计控制率', - model: 'contRate', - span: 6, + span: 12, externalValue: {} }, + // { + // type: 'custom-input', + // title: '成本累计控制率', + // model: 'contRate', + // span: 6, + // externalValue: {} + // }, { type: 'delete', callback: (index) => { diff --git a/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue b/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue index c505ad2..64c7062 100644 --- a/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue +++ b/kehui-oa-front/src/pages/projectManagement/ProjectDetail.vue @@ -895,68 +895,64 @@ export default { type: 'custom-selector', title: '季度', model: 'quarter', - span: 5, + span: 12, externalValue: { multiple: false, options: this.formQuarterData } }, - { - type: 'custom-input-number', - title: '序号', - model: 'number', - span: 4, - externalValue: {} - }, + // { + // type: 'custom-input-number', + // title: '序号', + // model: 'number', + // span: 4, + // externalValue: {} + // }, { type: 'custom-input', title: '指标名称', model: 'indexName', - span: 7, + span: 12, externalValue: {} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'A档', model: 'levelA', - span: 4, externalValue: {} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'B档', model: 'levelB', - span: 4, externalValue: {} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'C档', model: 'levelC', - span: 4, externalValue: {} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'D档', model: 'levelD', - span: 4, externalValue: {} }, { type: 'custom-input', - title: '预算累计执行率', + title: '预算执行率', model: 'budgetRate', - span: 6, - externalValue: {} - }, - { - type: 'custom-input', - title: '成本累计控制率', - model: 'contRate', - span: 6, + span: 12, externalValue: {} }, + // { + // type: 'custom-input', + // title: '成本累计控制率', + // model: 'contRate', + // span: 6, + // externalValue: {} + // }, { type: 'delete', callback: (index) => { @@ -1419,7 +1415,7 @@ export default { span: 24, model: { quarter: project.membersList[i].quarter, - number: project.membersList[i].number, + // number: project.membersList[i].number, indexName: project.membersList[i].indexName, levelA: project.membersList[i].levelA, levelB: project.membersList[i].levelB, @@ -1433,72 +1429,69 @@ export default { type: 'custom-selector', title: '季度', model: 'quarter', - span: 5, + span: 12, externalValue: { multiple: false, - options: this.formQuarterData + options: this.formQuarterData, + disabled: !this.judgeFormEditable('apply') } }, - { - type: 'custom-input-number', - title: '序号', - model: 'number', - span: 4, - // rules: [ - // {type: 'number', message: '序号必须为数字值'} - // ], - externalValue: {} - }, + // { + // type: 'custom-input-number', + // title: '序号', + // model: 'number', + // span: 4, + // // rules: [ + // // {type: 'number', message: '序号必须为数字值'} + // // ], + // externalValue: {} + // }, { type: 'custom-input', title: '指标名称', model: 'indexName', - span: 7, - externalValue: {} + span: 12, + externalValue: {disabled: !this.judgeFormEditable('apply')} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'A档', model: 'levelA', - span: 4, - externalValue: {} + externalValue: {disabled: !this.judgeFormEditable('apply')} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'B档', model: 'levelB', - span: 4, - externalValue: {} + externalValue: {disabled: !this.judgeFormEditable('apply')} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'C档', model: 'levelC', - span: 4, - externalValue: {} + externalValue: {disabled: !this.judgeFormEditable('apply')} }, { - type: 'custom-input', + type: 'custom-textarea', title: 'D档', model: 'levelD', - span: 4, - externalValue: {} + externalValue: {disabled: !this.judgeFormEditable('apply')} }, { type: 'custom-input', - title: '预算累计执行率', + title: '预算执行率', model: 'budgetRate', - span: 6, - externalValue: {} - }, - { - type: 'custom-input', - title: '成本累计控制率', - model: 'contRate', - span: 6, - externalValue: {} + span: 12, + externalValue: {disabled: !this.judgeFormEditable('apply')} }, + // { + // type: 'custom-input', + // title: '成本累计控制率', + // model: 'contRate', + // span: 6, + // externalValue: {} + // }, { type: 'delete', callback: (index) => {