diff --git a/src/api/dashboard.js b/src/api/dashboard.js index 9e00056a..0388f784 100644 --- a/src/api/dashboard.js +++ b/src/api/dashboard.js @@ -1,4 +1,10 @@ -import { getAction } from './manage' +import { getAction, postAction } from './manage' +// 获取检索历史数据 +const getSearchHistoryData = (params) => getAction('/home/lawsHomeNormalSearchHistory/page', params) +// 一般检索(标题)——资源类型改变获取下面筛选项统计数据 +const getSearchParamNum = (params) => postAction('/home/lawsHomeNormalSearchData/getNormalSearchTitleCount', params) +// 一般检索(全文)——资源类型改变获取下面筛选项统计数据 +const getSearchParamNumFullText = (params) => postAction('/home/lawsHomeSearch/getNormalSearchAllCount', params) // 国内标准的高级搜索,查询搜索条件 const getDomesticStandardQuery = (params) => getAction('/laws/standard/domestic/getQueryCondition', params) @@ -15,6 +21,9 @@ const getOverseasStandardList = (params) => getAction('/laws//standard/overseas/ const getEnterStandardList = (params) => getAction('/laws/standard/enterprise/getCommonPage', params) export { + getSearchHistoryData, + getSearchParamNum, + getSearchParamNumFullText, getDomesticStandardQuery, getOverseasStandardQuery, getEnterStandardQuery, diff --git a/src/common/lang/dashboard/en.js b/src/common/lang/dashboard/en.js index 09d7d8f4..0828d056 100644 --- a/src/common/lang/dashboard/en.js +++ b/src/common/lang/dashboard/en.js @@ -4,6 +4,7 @@ module.exports = { generalSearch: { advancedSearch: 'Advanced Search', homePage: 'Home', + searchHistory: '检索历史', queryCondition: 'Query Condition', retrievalMode: 'Retrieval Mode', resourceType: 'Resource Type' diff --git a/src/common/lang/dashboard/zh.js b/src/common/lang/dashboard/zh.js index 42e1d115..1e490f48 100644 --- a/src/common/lang/dashboard/zh.js +++ b/src/common/lang/dashboard/zh.js @@ -4,6 +4,7 @@ module.exports = { generalSearch: { advancedSearch: '高级搜索', homePage: '首页', + searchHistory: '检索历史', queryCondition: '查询条件', retrievalMode: '检索方式', resourceType: '资源类型' diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 4113a79a..73953568 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -109,8 +109,8 @@ export const TypeOfClauseItem = { export const Recheck = { STAND_GOOD: { text: '继续有效', value: '1' }, REVISE: { text: '修订', value: '2' }, - ANNUL: { text: '废止', value: '1' }, - SEAL_SAVE: { text: '封存', value: '1' } + ANNUL: { text: '废止', value: '3' }, + SEAL_SAVE: { text: '封存', value: '4' } } // 清单维护类型 diff --git a/src/mixins/WorkCenterMixin.js b/src/mixins/WorkCenterMixin.js index 0a6f256a..a0eb23f0 100644 --- a/src/mixins/WorkCenterMixin.js +++ b/src/mixins/WorkCenterMixin.js @@ -9,8 +9,8 @@ export const WorkCenterMixin = { } }, methods: { - // 查询人员信息结构数据 - getPersonInfoStructure (key) { + // 查询人员信息结构数据,callback用于获取完流程才可以初始化人员信息 + getPersonInfoStructure (key, callback) { const param = {} param.processDefinitionKey = key if (this.$route.query.processInstanceId) { @@ -31,11 +31,15 @@ export const WorkCenterMixin = { this.personnelInfoData[0].linkUserIds = Vue.ls.get(USER_INFO).id this.personnelInfoData[0].userList = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' } + if (callback) { + callback() + } } }) }, // 待办中进入时需要初始化人员信息数据 initPersonInfoData (isFirstNode) { + console.log('-----------isFirstNode------------', isFirstNode) if (isFirstNode) { // 是第一个节点,回显数据 this.personnelInfoData = this.personnelInfoData.map(item => { diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue index a1940b57..43b6d4d7 100644 --- a/src/views/dashboard/search/GeneralSearch.vue +++ b/src/views/dashboard/search/GeneralSearch.vue @@ -6,6 +6,7 @@ {{ $t('dashboard.generalSearch.advancedSearch') }} {{ $t('dashboard.generalSearch.homePage') }} + {{ $t('dashboard.generalSearch.searchHistory') }} @@ -46,35 +47,42 @@ {{ toggleSearchStatus ? $t('putAway') : $t('open') }} - -
-
-
-

{{ item.standard_number + ' ' + item.standard_name }}

-

{{ item.source }}

-

{{ item.publishDate }}

-
-
- {{field.dbFieldTxt}}: {{ item[field.dbFieldName] || '--' }} + + + + + + diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue index d0823bc7..c6c12fe6 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue @@ -1,5 +1,5 @@