diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index af18030c8..64706c03e 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -135,7 +135,7 @@ - + +
+ + + + + +
+
基础信息
+
审批历史
+
+
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
+ +
+
+ 关闭 +
+
+ 加载中... +
+ + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 2cbe932a9..4f1126628 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -261,6 +261,7 @@ export default { total: 0, pageSize: this.$store.getters.userInfo.configContent, listForm: { + fileIds: '', listType: "", //区分是哪个清单 listName: "", //清单名称 descriptionList: "", //清单说明 @@ -358,6 +359,11 @@ export default { this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.jlUserId = item.jlUserId; this.listForm.zrUserId = item.zrUserId; + let filesId = [] + item.fileName.forEach(itemIds =>{ + filesId.push(itemIds.id) + }) + this.listForm.fileId = filesId.join(',') item.fileName.forEach(itemId => { this.fileIds = itemId.id this.getFileInfo(); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index af104870f..a1dcfe0a3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -543,8 +543,8 @@ }) } else { this.$message.warning('流程启动失败') + this.isSubmit = false } - this.isSubmit = false }) } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index c38825090..3de6d38dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -556,8 +556,8 @@ export default { }) } else { this.$message.warning('流程启动失败') + this.isSubmit = false } - this.isSubmit = false }) } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index e0d16c839..1d19fe428 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -357,7 +357,6 @@ json.commentText = this.commentText json.info = this.data json.department = this.$store.getters.userInfo.orgName - json.introduce = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -383,17 +382,7 @@ this.form.endTime = data.endTime this.form.cname = data.cname this.json = data - if (data.introduce) { - this.data = data.info || [] - } else { - this.$http.get('slrs/sar-public-idea-all/getPublicIdea', { - unique: data.uniques - }, {}, res => { - res.data.forEach(item => { - this.data.push(item) - }) - }) - } + this.data = data.info || [] }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 0d73dd9a0..1320b9156 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -330,6 +330,7 @@ var json = this.json json.oldinfo = this.oldData json.commentText = this.commentText + json.introduce = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -364,6 +365,18 @@ }) this.json = data this.data = data.summaryList + if (data.introduce) { + } else { + this.$http.get('slrs/sar-public-idea-all/getPublicIdea', { + unique: data.uniques + }, {}, res => { + res.data.forEach(item => { + item.chapterNumber = item.partCode + item.responUserName= item.userName + this.data.push(item) + }) + }) + } }).catch(e => { }) }) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index e095c2f12..47fbb736a 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -204,7 +204,7 @@ tooltip-effect="dark" style="width: 100%" border - height="100%" + height="150%" :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @selection-change="selectedChange" @@ -233,7 +233,7 @@ @@ -283,13 +283,10 @@ export default { standModel: false, // 总数 total: 0, - // 当前页数 - pageNo: 1, // 查询未符合项整改数据库数据 queryUnqualidiedData: { - pageNo: 1, - pageSize: 10, - total: 0, + current: 1, + size: this.$store.getters.userInfo.configContent, closeState: '1', standId: '', standSerialNumber: '', // 标准号/名称 @@ -344,6 +341,12 @@ export default { //点击新增事件 addList() { dicTypeData().then(res => { + if (this.pageNo !== undefined) { + this.queryUnqualidiedData.current = this.pageNo + } + if (this.size !== undefined) { + this.queryUnqualidiedData.size = this.size + } this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 standUnqualified(this.queryUnqualidiedData).then(res => { this.unqualidiedData = res.data.records @@ -553,8 +556,9 @@ export default { this.pageNo = page this.getTableByPage() }, - pageSizeChange () { - this.getTableByPage() + pageSizeChange (pageSize) { + this.size = pageSize + this.getTableByPage(pageSize) }, } } diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index f7be9ed8a..2f8411f01 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -219,6 +219,8 @@ export default { }else{ this.toProcessDetail('xmpg2Step1-2',row) } + }else if(prcType === '9'){ + this.toProcessDetail('bzjdStep1-6',row) } } else { this.$message.warning('当前流程未全部办理完成,无法查看') diff --git a/src/pages/regulatoryRepository/partCodeApply/index.vue b/src/pages/regulatoryRepository/partCodeApply/index.vue index b245f5a95..f9c470180 100644 --- a/src/pages/regulatoryRepository/partCodeApply/index.vue +++ b/src/pages/regulatoryRepository/partCodeApply/index.vue @@ -42,8 +42,8 @@ - - 删除 + + 批量删除 diff --git a/src/router/index.js b/src/router/index.js index c01c0ef07..cb6fc9cd6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -862,6 +862,15 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/bzjdStep1-6', + name: 'bzjdStep1-6', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, ] }, // 本地工具