From 2671f18703821b841132ddd87f1748195e51da88 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 12 Apr 2024 13:55:30 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=A4=96=E6=A0=87=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=88=E6=9D=83=E9=83=A8=E9=97=A8=E6=9F=A5?=
=?UTF-8?q?=E7=9C=8B=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../detail/EnterpriseStandardDetail.vue | 2 +-
.../commonPage/StandardDetailPage.vue | 31 ++++++++++++++-----
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
index c782c0c6..b4009aa3 100644
--- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
+++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue
@@ -59,7 +59,7 @@
+ type="primary" ghost @click="viewAll(formItem.dbFieldName)">
{{ $t('enterpriseStandardLibrary.standard.viewAll')}}
{{ detailData[formItem.dbFieldName + '_dictText'] }}
diff --git a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue
index 7d8fc989..c7553152 100644
--- a/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue
+++ b/src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue
@@ -36,12 +36,7 @@
-
- {{
- detailData[needDictFieldList.includes(formItem.fieldShowType) ? formItem.dbFieldName + '_dictText' : formItem.dbFieldName] || global.emptyLine
- }}
-
-
+
{{ global.emptyLine }}
+
+
+ {{ $t('enterpriseStandardLibrary.standard.viewAll')}}
+
+
+ {{
+ detailData[needDictFieldList.includes(formItem.fieldShowType) ? formItem.dbFieldName + '_dictText' : formItem.dbFieldName] || global.emptyLine
+ }}
+
@@ -124,6 +130,8 @@
+
+
@@ -150,6 +158,7 @@ import { previewPdf } from '../../../utils/previewPdf.js'
import { Base64 } from 'js-base64'
import { kkFilePreview } from '../../../utils/kkFilePreview'
import { previewFileCurrentWindowByFileId, queryStandardInfoByStandardNumber } from '../../../utils/util'
+import TextContentModal from '../../enterpriseStandardLibrary/standard/detail/module/TextContentModal'
// 国内标准权限
const DomesticStandardPermission = {
@@ -192,7 +201,7 @@ const FILE_TYPE_IMGS = ['jpg', 'jpeg', 'png', 'raw']
export default {
name: 'StandardDetailPage',
- components: { UpdateRecordModal, SubmitQuestionModal, UserSelectModal, StandardResolutionSheetModal },
+ components: { UpdateRecordModal, SubmitQuestionModal, UserSelectModal, StandardResolutionSheetModal, TextContentModal },
data () {
return {
loading: false,
@@ -207,7 +216,8 @@ export default {
image: false,
imageUrl: null,
// 标准字段,需要跳转标准详情
- standardFields: ['substitute_standard_number', 'replaced_by_standard_number', 'reference_standard', 'referenced_standard', 'adopt_the_international_standard_number', 'associated_foreign_standards']
+ standardFields: ['substitute_standard_number', 'replaced_by_standard_number', 'reference_standard', 'referenced_standard', 'adopt_the_international_standard_number', 'associated_foreign_standards'],
+ showViewAllField: ['auth_dept'] // 需要显示展示查看全部按钮的字段
}
},
computed: {
@@ -386,6 +396,11 @@ export default {
previewStandardResolutionSheet (id) {
this.$refs.standardResolutionSheetModal.open(id)
},
+ // 查看全部
+ viewAll (fieldName) {
+ const data = this.detailData[fieldName + '_dictText'] || this.detailData[fieldName]
+ this.$refs.textContentModal.open(data)
+ },
handlePreview (file) {
if (!file || !file.url) {
return