From 3240e0d4c288e279d73d25e3e670b984e28e56f7 Mon Sep 17 00:00:00 2001 From: danshihao Date: Sun, 7 Jan 2024 16:48:24 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=A8=BD=E6=9F=A5=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseStandardInspectionPlanFlow.vue | 2 +- .../EnterpriseStandardInspectionProcess.vue | 2 +- ...nspectionProcessRectificationPlanModal.vue | 6 +- .../modules/InspectionProcessReportModal.vue | 4 +- ...erpriseStandardInspectionRectification.vue | 2 +- .../InspectionExtensionRequestProcess.vue | 4 +- .../modules/ExtensionRequestTable.vue | 76 +++++-------------- .../modules/ExtensionRequestTableModal.vue | 19 +---- .../modules/RequestExtensionModal.vue | 23 ++---- .../PermissionApplicationProcess.vue | 2 +- .../PostMeetingManageProcess.vue | 2 +- .../StandardPromotionProcess.vue | 2 +- 12 files changed, 44 insertions(+), 100 deletions(-) diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue index d89e322a..11f356ff 100644 --- a/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue +++ b/src/views/workCenter/enterpriseStandardInspectionPlan/EnterpriseStandardInspectionPlanFlow.vue @@ -445,7 +445,7 @@ export default { // draftData: }) // 1待办 2草稿 - res.saveSource = this.$route.query.draftId ? 2 : 1 + res.saveSource = (this.$route.query.draftId || !this.$route.query.projectId) ? 2 : 1 console.log(res) return saveInspectPlan(res) }).then(res => { diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue index 58a063e3..bb0eedde 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue @@ -426,7 +426,7 @@ export default { // draftData: }) // 1待办 2草稿 - res.saveSource = this.$route.query.draftId ? 2 : 1 + res.saveSource = (this.$route.query.draftId || !this.$route.query.projectId) ? 2 : 1 console.log(res) return saveInspectProcess(res) }).then(res => { diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue index 1f303509..7e523bd9 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue @@ -343,11 +343,11 @@ export default { // 初始化章节条款下拉 initSectionClauseList () { // 过滤已经被选择的下拉 - const contentlist = this.data.enterpriseStandardInspectContentList || [] + const contentList = this.data.enterpriseStandardInspectContentList || [] const planList = this.tempDataSource || [] - this.sectionClauseList = contentlist.filter(content => { + this.sectionClauseList = contentList.filter(content => { // 当前没有被选择过，或者编辑时选择的就是当前数据就显示在下拉 - return !planList.find(report => report.inspectContentId === content.id) || this.model.inspectContentId === content.id + return !planList.find(plan => plan.inspectContentId === content.id) || this.model.inspectContentId === content.id }) }, // 章节条款改变 diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue index 957fc3d4..c34c5b4e 100644 --- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue +++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue @@ -215,9 +215,9 @@ export default { // 初始化章节条款下拉 initSectionClauseList () { // 过滤已经被选择的下拉 - const contentlist = this.data.enterpriseStandardInspectContentList || [] + const contentList = this.data.enterpriseStandardInspectContentList || [] const reportList = this.tempDataSource || [] - this.sectionClauseList = contentlist.filter(content => { + this.sectionClauseList = contentList.filter(content => { // 当前没有被选择过，或者编辑时选择的就是当前数据就显示在下拉 return !reportList.find(report => report.inspectContentId === content.id) || this.model.inspectContentId === content.id }) diff --git a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue index 978ea753..6e405bfa 100644 --- a/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue +++ b/src/views/workCenter/enterpriseStandardInspectionRectification/EnterpriseStandardInspectionRectification.vue @@ -389,7 +389,7 @@ export default { // draftData: }) // 1待办 2草稿 - res.saveSource = this.$route.query.draftId ? 2 : 1 + res.saveSource = (this.$route.query.draftId || !this.$route.query.projectId) ? 2 : 1 console.log(res) return saveInspectRectify(res) }).then(res => { diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue index 214cd5f5..c0a9919b 100644 --- a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue +++ b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue @@ -301,7 +301,7 @@ export default { // 去除备注必填 this.validatorRules.remarks.rules[0].required = false // 必须有数据才能提交 - if (this.$refs.extensionRequestTable.dataSource.length === 0) { + if (isValidate && this.$refs.extensionRequestTable.dataSource.length === 0) { this.$message.warning(this.$t('addAtLeastOneRowOfData')) throw new Error('base') } @@ -384,7 +384,7 @@ export default { // draftData: }) // 1待办 2草稿 - res.saveSource = this.$route.query.draftId ? 2 : 1 + res.saveSource = (this.$route.query.draftId || !this.$route.query.projectId) ? 2 : 1 console.log(res) return saveInspectExtension(res) }).then(res => { diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue index d6289ac7..0372419f 100644 --- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue +++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue @@ -28,7 +28,7 @@ @@ -66,7 +66,6 @@ import ExtensionRequestTableModal import RequestExtensionModal from '@views/workCenter/inspectionExtensionRequestProcess/modules/RequestExtensionModal' import { InspectionExtensionRequestProcess } from '@/enums/commonEnums' import { editInspectExtensionTable } from '@api/workCenter' -import { getAction } from '@api/manage' export default { name: 'ExtensionRequestTable', components: { RequestExtensionModal, ExtensionRequestTableModal, JTable }, @@ -214,28 +213,23 @@ export default { }) } }, - watch: { - // 列表查询带上项目id - projectId: { - immediate: true, - handler (val) { - if (!val) { - return - } - this.filters.projectId = this.projectId - if (this.currentNode === InspectionExtensionRequestProcess.contactEvaluation.value) { - this.filters.nodeId = this.$route.query.nodeId - } - this.loadData() - } - } - }, mounted () { if (this.isInitiate) { this.getUserList() } }, methods: { + // 添加回调 + handleAddCallback (rows) { + this.dataSource.push(...rows) + }, + // 设置表格数据 + setData (list) { + this.dataSource = list.map(item => { + item.liaisons = item.liaisons || undefined + return item + }) + }, // 修改：稽查联络人 changeRowData (record, field) { editInspectExtensionTable({ @@ -250,8 +244,12 @@ export default { }) }, // 申请延期 - handleRequestExtension (record) { - this.$refs.requestExtensionModal.edit(record) + handleRequestExtension (record, index) { + this.$refs.requestExtensionModal.edit(record, index) + }, + // 申请延期回调 + requestExtensionCallback (row, index) { + this.dataSource.splice(index, 1, row) }, // 返回用户列表 getUserList () { @@ -288,40 +286,6 @@ export default { projectId: this.projectId }) }, - loadData (arg) { - if (!this.url.list) { - this.$message.warning('请设置url.list属性!') - return - } - // 加载数据 若传入参数1则加载第一页的内容 - if (arg === 1) { - this.ipagination.current = 1 - } - const params = this.getQueryParams()// 查询条件 - this.loading = true - getAction(this.url.list, params).then((res) => { - if (res.success) { - // update-begin---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------ - const data = res.result.records || res.result - this.dataSource = data.map(item => { - return { - ...item, - liaisons: item.liaisons || undefined - } - }) - if (res.result.total) { - this.ipagination.total = res.result.total - } else { - this.ipagination.total = 0 - } - // update-end---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------ - } else { - this.$message.warning(res.message) - } - }).finally(() => { - this.loading = false - }) - }, filterOption (input, option) { return ( option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue index 2bd17208..dbfde0ed 100644 --- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue +++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTableModal.vue @@ -57,7 +57,6 @@