diff --git a/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue b/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue index 5d02bca0..4e15d531 100644 --- a/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue +++ b/src/views/workCenter/standardComplianceProcess/components/DepartLeaderIssueTable.vue @@ -198,7 +198,7 @@ export default { } if (this.dataSource.length === 0 || this.dataSource.some(tt => !tt.moduleOwner && !tt.notInvolved)) { if (needRemind) { - this.$message.warning(this.$t('workCenter.projectComplianceEvaluationProcess.pleaseSelectModuleOwner')) + this.$message.warning(this.$t('workCenter.checkTableRequired')) } return false } diff --git a/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue b/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue index 777949e1..21d021df 100644 --- a/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue +++ b/src/views/workCenter/standardComplianceProcess/components/DesignEngineerWriteProject.vue @@ -20,7 +20,7 @@ - + @@ -96,13 +96,13 @@ export default { }, // 工作令编号 { - dataIndex: 'projectId_dictText', + dataIndex: 'workNumber', title: this.$t('projectLibrary.workOrderNumber'), width: 150 }, // 项目名称 { - dataIndex: 'projectName1', + dataIndex: 'projectName', title: this.$t('projectLibrary.projectName'), width: 150 }, @@ -142,11 +142,27 @@ export default { handleEdit (record) { this.$refs.modalForm.open(record) }, + modalFormOk (record) { + const index = this.dataSource.findIndex(tt => tt.id === record.id) + this.$set(this.dataSource, index, record) + }, handleTableChange (pagination) { this.ipagination = pagination }, showContent (text) { this.$refs.clauseDetail.open(text) + }, + submit (needValidator, needRemind) { + if (!needValidator) { + return this.dataSource + } + if (!this.dataSource.every(tt => tt.workNumber && tt.projectName)) { + if (needRemind) { + this.$message.warning(this.$t('workCenter.checkTableRequired')) + } + return false + } + return this.dataSource } } } diff --git a/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue b/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue index 281fda65..196c1a3a 100644 --- a/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue +++ b/src/views/workCenter/standardComplianceProcess/components/ModuleOwnerIssueTable.vue @@ -196,7 +196,7 @@ export default { } if (this.dataSource.length === 0 || this.dataSource.some(tt => !tt.designEngineer && !tt.notInvolved)) { if (needRemind) { - this.$message.warning(this.$t('workCenter.standardCompliance.pleaseSelectDesignEngineer')) + this.$message.warning(this.$t('workCenter.checkTableRequired')) } return false } diff --git a/src/views/workCenter/standardComplianceProcess/modules/EditProjectModal.vue b/src/views/workCenter/standardComplianceProcess/modules/EditProjectModal.vue index 4cae0861..c1b9ec18 100644 --- a/src/views/workCenter/standardComplianceProcess/modules/EditProjectModal.vue +++ b/src/views/workCenter/standardComplianceProcess/modules/EditProjectModal.vue @@ -14,14 +14,14 @@ + v-decorator="['workNumber', validatorRules.workNumber]" /> + v-decorator="['projectName', validatorRules.projectName]" /> @@ -45,12 +45,12 @@ export default { }, validatorRules: { // 工作令编号 - processName: { + workNumber: { rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('projectLibrary.workOrderNumber') }], validateTrigger: 'blur' }, // 项目名称 - handleText: { + projectName: { rules: [{ required: true, message: this.$t('pleaseEnter') + this.$t('projectLibrary.projectName') }], validateTrigger: 'blur' } @@ -66,13 +66,19 @@ export default { }) }, handleOk () { - + this.form.validateFields((errors, values) => { + if (!errors) { + this.$emit('ok', Object.assign(this.model, values)) + this.close() + } + }) }, handleCancel () { this.close() }, close () { this.visible = false + this.form.resetFields() } } }