From f777d43ccae2d350aa649685d981319660d84fa6 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 24 Jan 2024 13:43:25 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=92=8C=E4=BC=81=E6=A0=87=E6=9B=B4=E6=94=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=9A=84=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/lang/zh-cn.js | 1 + .../modules/ApproveBaseInfo.vue | 17 +++-- .../modules/BaseInfoForm.vue | 15 ++++ .../modules/MainDrafterInitBaseInfo.vue | 71 +++++++++++++++++-- .../modules/CommentObjectEnterBaseInfo.vue | 25 ++++--- .../modules/ConfirmWhetherCommentBaseInfo.vue | 17 +++-- .../modules/DepartLiaisonCollectBaseInfo.vue | 19 +++-- .../modules/DepartLiaisonIssueBaseInfo.vue | 17 +++-- .../DepartLiaisonLeaderApproveBaseInfo.vue | 21 ++++-- .../modules/MainDrafterCollectBaseInfo.vue | 22 ++++-- ...MainDrafterCollectUploadMinuteBaseInfo.vue | 26 ++++--- .../modules/MainDrafterPublishBaseInfo.vue | 21 ++++-- .../modules/MainDrafterSentBaseInfo.vue | 12 ++-- .../MainDrafterUploadMinuteBaseInfo.vue | 20 ++++-- .../modules/OtherDrafterProofreadBaseInfo.vue | 21 ++++-- .../OtherDrafterUploadStandardBaseInfo.vue | 28 +++++++- .../modules/ScorerMarkBaseInfo.vue | 17 +++-- .../modules/StandardizationAuditBaseInfo.vue | 17 +++-- 18 files changed, 309 insertions(+), 78 deletions(-) diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 671e70c9..342777ea 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -186,6 +186,7 @@ module.exports = { cannotAddAgain: '不能重复添加', pleaseSelectDate: '请选择日期', noFileAvailableForPreview: '暂无可预览的文件', + enterpriseStandard: '企业标准', // 树右键 treeRight: { addFolder: '新增文件夹', diff --git a/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue index 83c7954d..d618bdc4 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/ApproveBaseInfo.vue @@ -30,9 +30,8 @@
- -

企业标准

- {{ $t('workCenter.enStandardRevision.onLineEditing') }} +

{{ $t('enterpriseStandard') }}

+ {{ $t('workCenter.enStandardRevision.onLineEditing') }}
@@ -45,6 +44,9 @@ import BaseInfoForm from './BaseInfoForm' import JTable from '@/components/jero/JTable' import TextContentModal from '../../../businessSupport/askForAdvice/modules/TextContentModal' +import Vue from 'vue' +import { ACCESS_TOKEN } from '@/store/mutation-types' +import { kkFilePreview } from '@/utils/kkFilePreview' export default { name: 'ApproveBaseInfo', @@ -137,7 +139,8 @@ export default { } ], dataSource: [], - loading: false + loading: false, + onEditFile: '' } }, methods: { @@ -153,6 +156,7 @@ export default { ...item } }) + this.onEditFile = data.onEditFile // 给表单赋值 this.$nextTick(() => { this.$refs.baseInfoForm.initData(data) @@ -172,6 +176,11 @@ export default { // 修改前按钮点击 beforeUpdateClick (record) { this.$refs.textContentModal.open(record.beforeUpdate) + }, + // 在线编辑的查看 + onlineEditView () { + const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${this.onEditFile}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${this.onEditFile_dictText}` + kkFilePreview(fileFullUrl) } } } diff --git a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue index b2a45a52..e54f045c 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/BaseInfoForm.vue @@ -629,6 +629,7 @@ export default { console.log(value) this.loading = true this.isEditSetData = true + this.$emit('listChange', value) // 企标名称 this.formInline.standardName = value[0].standardName // 根据返回的id查询企标数据 @@ -717,6 +718,20 @@ export default { standard_name: this.formInline.standardName, // 标准名称 standard_english_name: this.formInline.standardEnglishName // 标准英文名称 } + }, + /** + * 校验部分字段 + * @param fields + */ + validateFormByFields (fields) { + const resultList = [] + this.$refs.ruleForm.validateField(fields, (error) => { + resultList.push(error) + }) + if (resultList.every(tt => !tt)) { + return true + } + return false } } } diff --git a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue index 240432c8..161aff36 100644 --- a/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardChange/modules/MainDrafterInitBaseInfo.vue @@ -1,6 +1,6 @@