From b0db27c4dd96ab98dc92af2d1d220b1358368c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Fri, 19 Jan 2024 17:44:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B3=95=E8=A7=84=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardComplianceProcess.vue | 8 ++++---- .../components/DepartLeaderIssueTable.vue | 6 +----- .../components/InitialAssignTable.vue | 2 +- .../components/InitialBasicServiceInfo.vue | 4 +--- .../components/ModuleOwnerIssueTable.vue | 6 +----- .../components/RegulatoryEngineerApproval.vue | 16 +++++++++++----- 6 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/views/workCenter/standardComplianceProcess/StandardComplianceProcess.vue b/src/views/workCenter/standardComplianceProcess/StandardComplianceProcess.vue index 9cd1022b..236581cb 100644 --- a/src/views/workCenter/standardComplianceProcess/StandardComplianceProcess.vue +++ b/src/views/workCenter/standardComplianceProcess/StandardComplianceProcess.vue @@ -424,7 +424,7 @@ export default { /** * 处理提交表单数据 */ - async dealSubmitFormData () { + async dealSubmitFormData (needValidateMainTable = true) { let basicProcessInfoDTO = {}, basicTaskInfoDTO = {}, flag = true this.processInfoForm.validateFields((errors, values) => { if (!errors) { @@ -453,11 +453,11 @@ export default { const needRemind = this.$refs.standardList ? processProjectStandard && processProjectStandard.id : true // 同步 if (this.$refs.termList) { - processProjectStandardTermList = this.$refs.termList.submit(true, needRemind) + processProjectStandardTermList = this.$refs.termList.submit(needValidateMainTable, needRemind) } // 异步 if (this.$refs.asyncTermList) { - processProjectStandardTermList = await this.$refs.asyncTermList.submit(true, needRemind) + processProjectStandardTermList = await this.$refs.asyncTermList.submit(needValidateMainTable, needRemind) } flag = !flag ? false : !!processProjectStandardTermList if (!flag) { @@ -556,7 +556,7 @@ export default { */ async handleReject () { this.validatorRules.handleText.rules[0].required = true - const formData = await this.dealSubmitFormData() + const formData = await this.dealSubmitFormData(false) if (!formData) { return } diff --git a/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue b/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue index 4d63696c..46aac88e 100644 --- a/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue +++ b/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue @@ -24,7 +24,7 @@ :name-str="record.moduleOwner_dictText" v-if="!record.notInvolved" :placeholder="$t('pleaseSelect') + $t('workCenter.standardCompliance.moduleOwner')" - @listChange="list => handleUserChange(list, index)" /> + @nameChange="nameStr => record.moduleOwner_dictText = nameStr" />
{{ global.emptyLine }}
@@ -187,10 +187,6 @@ export default { showContent (text) { this.$refs.clauseDetail.open(text) }, - handleUserChange (list, index) { - this.dataSource[index].moduleOwner = list.map(item => item.id).join(',') - this.dataSource[index].moduleOwner_dictText = list.map(item => item.realname + '(' + item.username + ')').join(',') - }, /** * 提交数据 * @param needValidator diff --git a/src/views/workCenter/standardComplianceProcess/components/InitialAssignTable.vue b/src/views/workCenter/standardComplianceProcess/components/InitialAssignTable.vue index 6af6d988..f3bf43a9 100644 --- a/src/views/workCenter/standardComplianceProcess/components/InitialAssignTable.vue +++ b/src/views/workCenter/standardComplianceProcess/components/InitialAssignTable.vue @@ -30,7 +30,7 @@ :name-str="record.responsibleUnitLeader_dictText" type="checkbox" :placeholder="$t('pleaseSelect') + $t('workCenter.standardCompliance.responsibleUnitContactPerson')" - @listChange="list => handleContactChange(list, index)" /> + @nameChange="nameStr => record.responsibleUnitLeader_dictText = nameStr" /> diff --git a/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue b/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue index 5afbdd19..5234ea04 100644 --- a/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue +++ b/src/views/workCenter/standardComplianceProcess/components/InitialBasicServiceInfo.vue @@ -153,9 +153,7 @@ export default { } this.$emit('standard:change', this.dataSource[0]) }, - handleSourceChange (value, record, index) { - record.decompositionOrderSource = value - this.$set(this.dataSource, index, record) + handleSourceChange (value, record) { const splitInfoId = record.decompositionOrderSourceVOList.find(tt => tt.value === value).sarFileSplitInfoId this.$emit('source:change', splitInfoId) }, diff --git a/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue b/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue index 738f5cc6..88f950de 100644 --- a/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue +++ b/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue @@ -25,7 +25,7 @@ v-if="!record.notInvolved" type="checkbox" :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.designEngineer')" - @listChange="list => handleUserChange(list, index)" /> + @nameChange="nameStr => record.designEngineer_dictText = nameStr" />
{{ global.emptyLine }}
@@ -181,10 +181,6 @@ export default { showContent (text) { this.$refs.clauseDetail.open(text) }, - handleUserChange (list, index) { - this.dataSource[index].designEngineer = list.map(item => item.id).join(',') - this.dataSource[index].designEngineer_dictText = list.map(item => item.realname + '(' + item.username + ')').join(',') - }, /** * 提交数据 * @param needValidator diff --git a/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue b/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue index 437e668b..116584d9 100644 --- a/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue +++ b/src/views/workCenter/standardComplianceProcess/components/RegulatoryEngineerApproval.vue @@ -27,7 +27,8 @@ v-model="record.designEngineer" :placeholder="$t('pleaseSelect') + $t('workCenter.standardConsultationProcess.designEngineer')" style="width: 100%" - type="radio" /> + type="radio" + @nameChange="nameStr => record.designEngineer_dictText = nameStr" />
{{ global.emptyLine }}
@@ -38,7 +39,8 @@ v-model="record.carbonCopyPersonnels" :placeholder="$t('pleaseSelect') + $t('workCenter.projectComplianceEvaluationProcess.ccPerson')" style="width: 100%" - type="checkbox" /> + type="checkbox" + @nameChange="nameStr => record.carbonCopyPersonnels_dictText = nameStr" /> @@ -55,12 +57,12 @@
- + {{ termNumber }}
- + {{ termName }}
@@ -210,7 +212,9 @@ export default { showQuickJumper: true, showSizeChanger: true, total: 0 - } + }, + termNumber: null, + termName: null } }, watch: { @@ -234,6 +238,8 @@ export default { * @param record */ loadSubTable (record) { + this.termNumber = record.termNumber + this.termName = record.termName this.subDataSource = [] this.subTableLoading = true queryStandardComplianceEvaluateDetail({ id: record.id }).then(res => {