From dc8046589a21ac567aece9aa703bab455d7dc379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= Date: Tue, 10 Oct 2023 17:25:51 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E5=85=A5=E5=BA=93/=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B-?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/less/common.less | 3 +- src/common/lang/workCenter/en.js | 10 ++ src/common/lang/workCenter/zh.js | 10 ++ src/components/FileEcho.vue | 4 +- src/components/jero/JUpload.vue | 2 +- src/components/page/GlobalLayout.vue | 8 ++ .../questionAnswerLibrary/page/AnswerPage.vue | 4 +- .../plan/detail/PlanDetail.vue | 4 +- .../detail/EnterpriseStandardDetail.vue | 11 ++- .../commonPage/StandardDetailPage.vue | 5 +- .../workCenter/processConfig/EditFlowNode.vue | 1 - .../StandardEntryOrChangeProcess.vue | 98 +++++++++++++++++-- 12 files changed, 139 insertions(+), 21 deletions(-) diff --git a/src/assets/less/common.less b/src/assets/less/common.less index a60555dd..d6574767 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -807,7 +807,7 @@ top: 2px; } -.process-part-title:first-child{ +.process-part-title:first-child { margin-top: 0; } @@ -820,6 +820,7 @@ font-size: 14px; } } + /* 按钮中发那个自定义图标的样式 end */ .detail-page-bottom-operate-box { diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js index b7304b50..62b61e6d 100644 --- a/src/common/lang/workCenter/en.js +++ b/src/common/lang/workCenter/en.js @@ -82,5 +82,15 @@ module.exports = { editFlowchart: '编辑流程图', editFlowNode: '编辑流程节点', deploy: '部署' + }, + processDetail: { + urgeHandle: '催办', + flowChart: '流程图', + taskNode: '任务节点', + taskHandler: '任务受理人', + completionTime: '完成时间', + timeConsuming: '耗时', + approvalOpinion: '审批意见', + opinionContent: '意见内容' } } diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js index f7cc5d4c..82350ec7 100644 --- a/src/common/lang/workCenter/zh.js +++ b/src/common/lang/workCenter/zh.js @@ -86,5 +86,15 @@ module.exports = { editFlowchart: '编辑流程图', editFlowNode: '编辑流程节点', deploy: '部署' + }, + processDetail: { + urgeHandle: '催办', + flowChart: '流程图', + taskNode: '任务节点', + taskHandler: '任务受理人', + completionTime: '完成时间', + timeConsuming: '耗时', + approvalOpinion: '审批意见', + opinionContent: '意见内容' } } diff --git a/src/components/FileEcho.vue b/src/components/FileEcho.vue index 3c4d496f..c6e00c02 100644 --- a/src/components/FileEcho.vue +++ b/src/components/FileEcho.vue @@ -29,6 +29,8 @@ import { downloadFile, getFileAccessHttpUrl } from '../api/manage.js' import { previewPdf } from '../utils/previewPdf.js' import { Base64 } from 'js-base64' +// 支持预览的文件后缀 +const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'docx', 'doc'] const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw'] const FILE_TYPE_PDF = 'pdf' @@ -80,7 +82,7 @@ export default { } // 截取文件后缀名 const fileSuffix = file.fileName ? file.fileName.split('.')[file.fileName.split('.').length - 1] : '' - const canPreview = FILE_TYPE_IMGS.some(tt => fileSuffix.toLowerCase() === tt) || fileSuffix.toLowerCase() === FILE_TYPE_PDF + const canPreview = CAN_PREVIEW_FILE_SUFFIX.some(tt => fileSuffix.toLowerCase() === tt) // 判断是否为可预览格式的文件 if (!canPreview) { this.$message.loading('该文件类型不支持预览，正在为您准备下载...').then(() => { diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue index 7524db62..0b0d76fb 100644 --- a/src/components/jero/JUpload.vue +++ b/src/components/jero/JUpload.vue @@ -67,7 +67,7 @@ const Base64 = require('js-base64').Base64 // 支持预览的文件类型 const CAN_PREVIEW_FILE_TYPE = ['pdf', 'image'] // 支持预览的文件后缀 -const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf'] +const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'docx', 'doc'] const uidGenerator = () => { return '-' + parseInt(Math.random() * 10000 + 1, 10) } diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue index 96d83987..e5d04c73 100644 --- a/src/components/page/GlobalLayout.vue +++ b/src/components/page/GlobalLayout.vue @@ -705,6 +705,14 @@ body { display: block; margin-bottom: 24px; white-space: nowrap; + + .ant-btn { + margin-left: 8px; + } + + .ant-btn:first-child { + margin-left: 0; + } } } diff --git a/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue index 2d468544..29e1c0d3 100644 --- a/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue +++ b/src/views/businessSupport/questionAnswerLibrary/page/AnswerPage.vue @@ -116,6 +116,8 @@ import { getQuizById, answerQuiz, setOrCancelTop, deleteAnswer } from '@/api/bus import { getFileInfo } from '@/api/api' import { previewPdf } from '@/utils/previewPdf' +// 支持预览的文件后缀 +const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'docx', 'doc'] const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw'] const FILE_TYPE_PDF = 'pdf' const Base64 = require('js-base64').Base64 @@ -189,7 +191,7 @@ export default { } // 截取文件后缀名 const fileSuffix = file.fileName ? file.fileName.split('.')[file.fileName.split('.').length - 1] : '' - const canPreview = FILE_TYPE_IMGS.some(tt => fileSuffix.toLowerCase() === tt) || fileSuffix.toLowerCase() === FILE_TYPE_PDF + const canPreview = CAN_PREVIEW_FILE_SUFFIX.some(tt => fileSuffix.toLowerCase() === tt) // 判断是否为可预览格式的文件 if (!canPreview) { this.$message.loading('该文件类型不支持预览，正在为您准备下载...').then(() => { diff --git a/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue b/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue index 2fd6347c..84926cbd 100644 --- a/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue +++ b/src/views/enterpriseStandardLibrary/plan/detail/PlanDetail.vue @@ -160,6 +160,8 @@ import { previewPdf } from '@/utils/previewPdf' import { getFileAccessHttpUrl } from '@/api/manage' import { getFileInfo } from '../../../../api/api' +// 支持预览的文件后缀 +const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'raw', 'pdf', 'docx', 'doc'] const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw'] const FILE_TYPE_PDF = 'pdf' const Base64 = require('js-base64').Base64 @@ -212,7 +214,7 @@ export default { } // 截取文件后缀名 const fileSuffix = file.fileName ? file.fileName.split('.')[file.fileName.split('.').length - 1] : '' - const canPreview = FILE_TYPE_IMGS.some(tt => fileSuffix.toLowerCase() === tt) || fileSuffix.toLowerCase() === FILE_TYPE_PDF + const canPreview = CAN_PREVIEW_FILE_SUFFIX.some(tt => fileSuffix.toLowerCase() === tt) // 判断是否为可预览格式的文件 if (!canPreview) { this.$message.loading('该文件类型不支持预览，正在为您准备下载...').then(() => { diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue index 352e2af8..a429203c 100644 --- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue +++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue @@ -57,7 +57,9 @@
{{ formItem.dbFieldTxt }} - {{ $t('enterpriseStandardLibrary.standard.standardResolutionSheet') }} + {{ $t('enterpriseStandardLibrary.standard.standardResolutionSheet') + }} +