From eb50263a255111f14c58ddcbab8c9035473e7ae8 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 29 Aug 2024 16:02:36 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=85=A8=E6=96=87=E6=A3=80=E7=B4=A2?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC=E6=8B=86=E5=88=86=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/lang/dashboard/zh.js | 3 +-
src/views/dashboard/search/GeneralSearch.vue | 48 +++++++++++++++++--
.../documentSplit/StandardSplitSheet.vue | 9 +++-
3 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/src/common/lang/dashboard/zh.js b/src/common/lang/dashboard/zh.js
index 336d98da..fe2dacb7 100644
--- a/src/common/lang/dashboard/zh.js
+++ b/src/common/lang/dashboard/zh.js
@@ -18,7 +18,8 @@ module.exports = {
standardGradeClassification: '标准等级分类',
all: '全部',
releaseDate: '发布日期',
- standardStatusSet: '标准状态设置'
+ standardStatusSet: '标准状态设置',
+ standardResolutionSheet: '标准分解单'
},
// 高级搜索
advancedSearch: {
diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue
index f0712c92..b550e559 100644
--- a/src/views/dashboard/search/GeneralSearch.vue
+++ b/src/views/dashboard/search/GeneralSearch.vue
@@ -88,7 +88,11 @@
{{ StandardStatus.ABOLISH.text }}
- {{ $t('dashboard.generalSearch.releaseDate') }} {{ item.releaseDate || global.emptyLine }}
+
+
+ {{ $t('dashboard.generalSearch.standardResolutionSheet') }}
+ {{ $t('dashboard.generalSearch.releaseDate') }} {{ item.releaseDate || global.emptyLine }}
+
@@ -134,7 +138,7 @@ import {
} from '@/api/dashboard'
import { isHasPermission } from '@/utils/hasPermission'
import { mapGetters } from 'vuex'
-import { StandardStatus, EnterpriseStandardStatus } from '@/enums/commonEnums'
+import { StandardStatus, EnterpriseStandardStatus, SplitStandardSource } from '@/enums/commonEnums'
import {
getDomesticStandardFormModal,
getDomesticStandardDetail,
@@ -709,6 +713,41 @@ export default {
} else {
this.onSearch(1)
}
+ },
+ // 验证企标权限
+ checkEnterpriseStandardAuth (record, callback) {
+ // 不是企标直接执行回调
+ if (record.resourceType !== SplitStandardSource.ENTERPRISE.value) {
+ callback && callback()
+ return
+ }
+ // 企标需要校验权限
+ this.loading = true
+ // 判断是否有权限,没有权限不能进查看
+ isCanLookDetail({ id: record.id }).then(res => {
+ if (res.success) {
+ if (res.result) {
+ callback && callback()
+ } else {
+ this.$message.warn(this.$t('docTool.split.noPermission'))
+ }
+ } else {
+ this.$message.warn(res.message)
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+ async toSplitDetail (record) {
+ this.checkEnterpriseStandardAuth(record, () => {
+ this.$openPageNewSheet({
+ path: '/docTool/StandardSplitSheet',
+ query: {
+ id: record.splitId,
+ searchValue: this.searchValue
+ }
+ })
+ })
}
}
}
@@ -890,7 +929,7 @@ export default {
padding: 0 8px;
}
.result-date {
- min-width: 200px !important;
+ min-width: 300px !important;
font-size: 16px;
font-family: PingFang SC-Regular, PingFang SC;
font-weight: 400;
@@ -899,6 +938,9 @@ export default {
text-align: right;
white-space: nowrap;
flex: 1;
+ .result-split-btn {
+ margin-right: 10px;
+ }
}
}
.result-content-wrapper {
diff --git a/src/views/documentTool/documentSplit/StandardSplitSheet.vue b/src/views/documentTool/documentSplit/StandardSplitSheet.vue
index 1c1d12b2..56a81bdf 100644
--- a/src/views/documentTool/documentSplit/StandardSplitSheet.vue
+++ b/src/views/documentTool/documentSplit/StandardSplitSheet.vue
@@ -1,6 +1,6 @@
-
+
@@ -15,7 +15,12 @@ export default {
this.$nextTick(() => {
this.$refs.resolutionSheet.queryParams = { id: this.$route.query.id }
this.$refs.resolutionSheet.initClauseFieldList()
- this.$refs.resolutionSheet.initDetailInfo()
+ const query = {}
+ if (this.$route.query.searchValue) {
+ this.$refs.resolutionSheet.queryParam.item_content = this.$route.query.searchValue
+ query.item_content = this.$route.query.searchValue
+ }
+ this.$refs.resolutionSheet.initDetailInfo(query)
})
}
}