diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue index fa5d660a..c7a4cd18 100644 --- a/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue +++ b/src/views/workCenter/annualRevisionPlanActivelyReport/RevisionPlanActivelyReportFlow.vue @@ -648,7 +648,7 @@ export default { this.switchValue = 'base' } this.$nextTick(() => { - this.approvalInfoForm.validateFields((err, values) => { + this.approvalInfoForm.validateFields({ force: true }, (err, values) => { if (!err) { this.loading = true const param = {} diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue index b70ed02b..39e47be4 100644 --- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue +++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue @@ -542,7 +542,7 @@ export default { this.switchValue = 'base' } this.$nextTick(() => { - this.approvalInfoForm.validateFields((err, values) => { + this.approvalInfoForm.validateFields({ force: true }, (err, values) => { if (!err) { this.loading = true const param = {} diff --git a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue index 5eb7fd2a..fd83c6d9 100644 --- a/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue +++ b/src/views/workCenter/enterpriseStandardAnnul/EnterpriseStandardAnnulFlow.vue @@ -467,7 +467,7 @@ export default { this.switchValue = 'base' } this.$nextTick(() => { - this.approvalInfoForm.validateFields((err, values) => { + this.approvalInfoForm.validateFields({ force: true }, (err, values) => { if (!err) { this.loading = true const param = {} diff --git a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue index d92f0106..e44a90c5 100644 --- a/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardChange/EnterpriseStandardChangeFlow.vue @@ -398,6 +398,7 @@ export default { param.data = Object.assign({}, data.formInline) param.data.list = data.dataSource param.data.onEditFile = data.onEditFile + param.data.replaceFileId = data.replaceFileId let func if (this.$route.query.taskId) { // 有taskId说明是驳回的提交 @@ -481,7 +482,7 @@ export default { this.switchValue = 'base' } this.$nextTick(() => { - this.approvalInfoForm.validateFields((err, values) => { + this.approvalInfoForm.validateFields({ force: true }, (err, values) => { if (!err) { this.loading = true const param = {} diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index 9fcce248..b3b7c412 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -492,23 +492,24 @@ export default { await getEnterpriseStandardInfoById({ id: standardId, type: '2' }).then(res => { if (res.success) { // 过程稿件id 发布稿>修改单>报批稿>送审稿>征求意见稿>草稿 - const fieldArr = ['publish_of_original', 'modification_list', 'draft_for_review', 'draft_for_comment', 'draft'] - const needSuffixArr = ['doc', 'docx'] - let fileId = '' - for (const item of fieldArr) { - if (!fileId) { - const fileNameArr = res.result[item + '_dictText'].split(',') - for (let i = 0; i < fileNameArr.length; i++) { - // 截取文件后缀名 - const fileSuffix = (fileNameArr[i] ? fileNameArr[i].split('.')[fileNameArr[i].split('.').length - 1] : '').toLowerCase() - if (needSuffixArr.includes(fileSuffix)) { - // 说明是支持在线编辑的文件格式 - console.log('支持在线编辑的文件', res.result[item].split(',')[i], res.result[item + '_dictText'].split(',')[i]) - fileId = res.result[item].split(',')[i] - } - } - } - } + // const fieldArr = ['publish_of_original', 'modification_list', 'draft_for_review', 'draft_for_comment', 'draft'] + // const needSuffixArr = ['doc', 'docx'] + // let fileId = '' + // for (const item of fieldArr) { + // if (!fileId) { + // const fileNameArr = res.result[item + '_dictText'].split(',') + // for (let i = 0; i < fileNameArr.length; i++) { + // // 截取文件后缀名 + // const fileSuffix = (fileNameArr[i] ? fileNameArr[i].split('.')[fileNameArr[i].split('.').length - 1] : '').toLowerCase() + // if (needSuffixArr.includes(fileSuffix)) { + // // 说明是支持在线编辑的文件格式 + // console.log('支持在线编辑的文件', res.result[item].split(',')[i], res.result[item + '_dictText'].split(',')[i]) + // fileId = res.result[item].split(',')[i] + // } + // } + // } + // } + const fileId = res.result.publish_of_original_standardSplit this.standardCanOnlineEditFile = fileId } }) @@ -529,6 +530,7 @@ export default { } data.dataSource = this.dataSource data.onEditFile = this.onEditFile + data.replaceFileId = this.standardCanOnlineEditFile return data }, // 外层获取数据要过校验,返回false表示没有通过校验 @@ -542,6 +544,7 @@ export default { data.formInline = { ...formInline, ...this.formInline } data.dataSource = this.dataSource data.onEditFile = this.onEditFile + data.replaceFileId = this.standardCanOnlineEditFile } else { this.$message.warning(this.$t('addAtLeastOneRowOfData')) data = false diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue index a37b7b04..8c8f8cc6 100644 --- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue +++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue @@ -1070,7 +1070,7 @@ export default { this.switchValue = 'base' } this.$nextTick(() => { - this.approvalInfoForm.validateFields((err, values) => { + this.approvalInfoForm.validateFields({ force: true }, (err, values) => { if (!err) { this.loading = true const param = {} diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue index 95f471e7..7ab16825 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue @@ -548,7 +548,7 @@ export default { this.switchValue = 'base' } this.$nextTick(() => { - this.approvalInfoForm.validateFields((err, values) => { + this.approvalInfoForm.validateFields({ force: true }, (err, values) => { if (!err) { this.loading = true const param = {} diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue index 3be06001..bd56f103 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevisionFlow.vue @@ -686,7 +686,7 @@ export default { this.switchValue = 'base' } this.$nextTick(() => { - this.approvalInfoForm.validateFields((err, values) => { + this.approvalInfoForm.validateFields({ force: true }, (err, values) => { if (!err) { this.loading = true const param = {} diff --git a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue index 63c6abd0..7572c8d7 100644 --- a/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue +++ b/src/views/workCenter/enterpriseStandardSealSave/EnterpriseStandardSealSaveFlow.vue @@ -469,7 +469,7 @@ export default { this.switchValue = 'base' } this.$nextTick(() => { - this.approvalInfoForm.validateFields((err, values) => { + this.approvalInfoForm.validateFields({ force: true }, (err, values) => { if (!err) { this.loading = true const param = {} diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue index f5f42cd9..1379c925 100644 --- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue +++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue @@ -467,7 +467,7 @@ export default { this.switchValue = 'base' } this.$nextTick(() => { - this.approvalInfoForm.validateFields((err, values) => { + this.approvalInfoForm.validateFields({ force: true }, (err, values) => { if (!err) { this.loading = true const param = {} diff --git a/src/views/workCenter/processCenter/table/DraftList.vue b/src/views/workCenter/processCenter/table/DraftList.vue index 5c7b6c16..fb3acde8 100644 --- a/src/views/workCenter/processCenter/table/DraftList.vue +++ b/src/views/workCenter/processCenter/table/DraftList.vue @@ -109,6 +109,29 @@ export default { } } }, + created () { + // const messageHeader = { + // Requests: { + // partCategoryNum: '123', + // partCategoryName: '123', + // standardNumber: 'GB/T 20234.5-2023', + // standardName: 'FCC测试-电动汽车传导充电用连接装置 第2部分:交流充电接口' + // } + // } + const messageHeader = { + Rows: [ + { id: 1, standardNumber: 'GB 11563.0-', queryLabels: '条文号' }, + { id: 2, standardNumber: 'GB/T 20234.3-', queryLabels: '条文标题' }, + { id: 3, standardNumber: 'Q/ZZ 11357-', queryLabels: '条文解读' }, + { id: 4, standardNumber: 'Q/ZZ 12554-', queryLabels: '适用零部件' } + ] + } + // const param = { + // standardNumber: 'GB/T 20234.5-2023', + // standardName: 'FCC测试-电动汽车传导充电用连接装置 第2部分:交流充电接口' + // } + console.log(JSON.stringify(messageHeader)) + }, methods: { loadData (arg) { if (!this.url.list) {