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] || '--' }}
+
+
+
+
+
+
{{ 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 @@
-
+
@@ -81,7 +81,7 @@
@@ -160,15 +160,6 @@ export default {
}
},
mounted () {
- // 获取人员信息结构
- this.getPersonInfoStructure(ProcessKey.ES_RECHECK.value)
- if (this.$route.query.taskId) {
- this.currentNodeName = this.$route.query.taskName
- // 有流程id说明是从流程中心来的,需要初始化数据
- this.getProcessData(this.$route.query.taskId)
- } else {
- this.currentNodeName = '发起人发起'
- }
// 初始化节点
const taskName = this.$route.query.taskName
if (taskName) {
@@ -189,14 +180,26 @@ export default {
this.currentNode = 999
}
}
- if (this.currentNode === 1) {
- this.disabled = false
- // 是节点1的话还需要设置是联络人发起还是标准化发起 ??
- this.initRole = 'contact'
+ // 获取人员信息结构
+ this.getPersonInfoStructure(ProcessKey.ES_RECHECK.value, () => {
+ // 获取完人员信息结构,初始化人员信息是否可更改
+ if (this.currentNode === 1) {
+ this.disabled = false
+ // 是节点1的话还需要设置是联络人发起还是标准化发起 ??
+ this.initRole = 'contact'
+ this.initPersonInfoData(true)
+ } else {
+ this.disabled = true
+ // 如果不是第一个节点,人员信息全部不可选
+ this.initPersonInfoData(false)
+ }
+ })
+ if (this.$route.query.taskId) {
+ this.currentNodeName = this.$route.query.taskName
+ // 有流程id说明是从流程中心来的,需要初始化数据
+ this.getProcessData(this.$route.query.taskId)
} else {
- this.disabled = true
- // 如果不是第一个节点,人员信息全部不可选
- this.initPersonInfoData()
+ this.currentNodeName = '发起人发起'
}
// 如果是查看进入的,不可编辑,不可操作
if (this.$route.query.onlyLook) {
@@ -248,7 +251,6 @@ export default {
},
formInline: {},
approvalInfoForm: this.$form.createForm(this), // 审批信息表单
- personnelInfoData: [],
url: {
list: '' // 人员信息的右侧表格获取接口
}
@@ -257,19 +259,25 @@ export default {
methods: {
// 根据流程id获取数据并回显
getProcessData (taskId) {
+ this.loading = true
enStandardRecheckGetDataById(taskId).then(res => {
if (res.success) {
this.model = res.result
this.$nextTick(() => {
// 初始化流程信息
- this.processInfoForm.setFieldsValue(pick(this.model[0], 'processName', 'deadlineDate', 'processDescription'))
+ this.processInfoForm.setFieldsValue(pick(this.model.common, 'processName', 'deadlineDate', 'processDescription'))
// 初始化流程审批信息,todo:需要判断是不是草稿进来的,草稿进来的才回显审批信息
// this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'remarks', 'attachment'))
+ // 初始化业务基本信息中组件内容
+ if (this.$refs.baseInfoRef) {
+ this.$refs.baseInfoRef.initData(this.model.data)
+ }
})
- // 初始化业务基本信息中组件内容
} else {
this.$message.warning(res.message)
}
+ }).finally(() => {
+ this.loading = false
})
},
// 头部tab改变
@@ -339,6 +347,7 @@ export default {
enStandardRecheckApproval(paramObj).then(res => {
if (res.success) {
this.$message.success(res.message)
+ this.goBack()
} else {
this.$message.warning(res.message)
}
@@ -366,6 +375,32 @@ export default {
enStandardRecheckTurnTo(param).then(res => {
if (res.success) {
this.$message.success(res.message)
+ this.goBack()
+ } else {
+ this.$message.warning(res.message)
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ }
+ })
+ },
+ // 提交
+ handleSubmit () {
+ if (this.loading) return
+ this.approvalInfoForm.validateFields(async (err, values) => {
+ const data = await this.$refs.baseInfoRef.getDataValidate()
+ if (!err && data) {
+ this.loading = true
+ const param = {}
+ param.common = Object.assign({}, values)
+ param.common.taskId = this.$route.query.taskId
+ param.data = Object.assign({}, data.formInline)
+ console.log(param)
+ enStandardRecheckAgree(param).then(res => {
+ if (res.success) {
+ this.$message.success(res.message)
+ this.goBack()
} else {
this.$message.warning(res.message)
}
@@ -381,11 +416,13 @@ export default {
this.approvalInfoForm.validateFields((err, values) => {
if (!err) {
this.loading = true
- const param = Object.assign({}, values)
- param.taskId = this.$route.query.taskId
+ const param = {}
+ param.common = Object.assign({}, values)
+ param.common.taskId = this.$route.query.taskId
enStandardRecheckAgree(param).then(res => {
if (res.success) {
this.$message.success(res.message)
+ this.goBack()
} else {
this.$message.warning(res.message)
}
@@ -406,11 +443,13 @@ export default {
this.approvalInfoForm.validateFields((err, values) => {
if (!err) {
this.loading = true
- const param = Object.assign({}, values)
- param.taskId = this.$route.query.id
+ const param = {}
+ param.common = Object.assign({}, values)
+ param.common.taskId = this.$route.query.taskId
enStandardRecheckReject(param).then(res => {
if (res.success) {
this.$message.success(res.message)
+ this.goBack()
} else {
this.$message.warning(res.message)
}
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
index 5f5dfbcf..9949ad44 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue
@@ -155,9 +155,8 @@ export default {
methods: {
// 拿到外面传进来的数据初始化,因为套了几层就不在外层初始化数据了
initData (data) {
- this.data = data
// 给表单赋值
- // this.formInline =
+ this.formInline = data
},
// 外层要获取数据
getData () {
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
index a7ac4c0c..a3bb5071 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/DrafterEnterOptionBaseInfo.vue
@@ -9,12 +9,12 @@
{{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
-
+
+ v-model="formInline.standardNumber" />
@@ -24,9 +24,9 @@
{{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
-
+
event.target.value = event.target.value.trim()"
@@ -85,9 +85,9 @@
{{ $t('workCenter.enStandardChange.materialDate') }}
-
+
@@ -118,8 +118,8 @@
{{ $t('workCenter.enStandardRecheck.recheck') }}
-
-
+
+
{{ $t('workCenter.enStandardRecheck.standGood') }}
@@ -166,7 +166,7 @@ export default {
formInline: {},
rules: {
// 复审
- recheck: [
+ recheckAdvice: [
{
required: true,
message: this.$t('workCenter.enStandardRecheck.recheck') + this.$t('cannotEmpty'),
@@ -177,11 +177,12 @@ export default {
}
},
methods: {
- // 拿到外面传进来的数据初始化,因为套了几层就不在外层初始化数据了
+ // 拿到外面传进来的数据初始化
initData (data) {
- this.data = data
// 给表单赋值
- // this.formInline =
+ this.$nextTick(() => {
+ this.formInline = Object.assign({}, data)
+ })
},
// 外层要获取数据
getData () {
@@ -191,14 +192,16 @@ export default {
return data
},
// 外层获取数据要过校验,返回false表示没有通过校验
- getDataValidate (callback) {
- this.$refs.ruleForm.validate(valid => {
+ async getDataValidate () {
+ let data = {}
+ await this.$refs.ruleForm.validate(valid => {
if (valid) {
- const data = {}
data.formInline = this.formInline
- callback(data)
+ } else {
+ data = false
}
})
+ return data
},
}
}
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/RecheckApproveBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/RecheckApproveBaseInfo.vue
index d848a7e2..48f5e150 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/modules/RecheckApproveBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/RecheckApproveBaseInfo.vue
@@ -139,16 +139,14 @@ export default {
Recheck,
StandardSource,
formInline: {},
- rules: {},
- data: {}
+ rules: {}
}
},
methods: {
// 拿到外面传进来的数据初始化,因为套了几层就不在外层初始化数据了
initData (data) {
- this.data = data
// 给表单赋值
- // this.formInline =
+ this.formInline = data
}
}
}
diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue
index 3e96aed9..43c9e597 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/modules/StandardizationInitBaseInfo.vue
@@ -10,12 +10,12 @@
{{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') }}
-
+
@@ -26,9 +26,9 @@
{{ $t('workCenter.enterpriseInitChangePlan.enterpriseStandardName') }}
-
+
event.target.value = event.target.value.trim()"
@@ -78,7 +78,7 @@ export default {
formInline: {},
rules: {
// 企标编号
- enStandardNo: [
+ standardNumber: [
{
required: true,
message: this.$t('workCenter.enterpriseInitChangePlan.enterpriseStandardNum') + this.$t('cannotEmpty'),
@@ -93,16 +93,14 @@ export default {
trigger: 'change'
}
]
- },
- data: {}
+ }
}
},
methods: {
// 拿到外面传进来的数据初始化,因为套了几层就不在外层初始化数据了
initData (data) {
- this.data = data
// 给表单赋值
- // this.formInline =
+ this.formInline = data
},
// 外层要获取数据
getData () {
@@ -127,10 +125,10 @@ export default {
listChange (value) {
console.log(value)
// 企标名称
- this.formInline.enStandardName = value[0].standardName
+ this.formInline.standardName = value[0].standardName
// 主起草人赋值给联络人
// this.formInline.contactPerson = value[0].
- this.$emit('processNameChange', (this.formInline.enStandardNo || '') + '-' + (this.formInline.enStandardName || '') + '-' + '复审')
+ this.$emit('processNameChange', (this.formInline.standardNumber || '') + '-' + (this.formInline.standardName || '') + '-' + '复审')
},
// 选择用户得到用户名
userSelectNameChange (value, fieldName) {
diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue
index 4270d615..9967967c 100644
--- a/src/views/workCenter/processCenter/table/TodoList.vue
+++ b/src/views/workCenter/processCenter/table/TodoList.vue
@@ -131,8 +131,7 @@ export default {
url: {
list: '/workCenter/getTodoList'
},
- currentTurnTo: {}, // 当前转办
-
+ currentTurnTo: {} // 当前转办
}
},
methods: {
@@ -157,6 +156,30 @@ export default {
case '9':
path = '/workCenter/annualRevisionPlanStandardizationInit/revisionPlanStandardizationInitFlow'
break
+ // 企标制修订流程
+ case '10':
+ path = '/workCenter/enterpriseStandardRevision/enterpriseStandardRevisionFlow'
+ break
+ // 企标更改流程
+ case '11':
+ path = '/workCenter/enterpriseStandardChange/enterpriseStandardChangeFlow'
+ break
+ // 企标复审流程
+ case '12':
+ path = '/workCenter/enterpriseStandardRecheck/enterpriseStandardRecheckFlow'
+ break
+ // 企标废止流程
+ case '13':
+ path = '/workCenter/enterpriseStandardAnnul/enterpriseStandardAnnulFlow'
+ break
+ // 企标封存流程
+ case '14':
+ path = '/workCenter/enterpriseStandardSealSave/enterpriseStandardSealSaveFlow'
+ break
+ // 已封存企标启用流程
+ case '15':
+ path = '/workCenter/enterpriseStandardStartUse/enterpriseStandardStartUseFlow'
+ break
}
this.$router.push({
path: path,