diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index e6ec3219a..60e702bfb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -194,7 +194,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准法规工程师

@@ -218,7 +218,7 @@
- +

标准法规部领导

@@ -495,7 +495,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { queryTaskFirst, saveTaskFirst, taskDel } from "api/process"; +import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, taskDel } from "api/process"; export default { name: "bzpgStep1", @@ -506,6 +506,7 @@ export default { }, data() { return { + submitFlag: '', managementHostName: [], //管理主体名称下拉框 developmentHostName: [], //开发主体名称下拉框 categoryName: [], //项目细分类下拉框 @@ -642,6 +643,40 @@ export default { }; }, methods: { + getHistoryData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, + }).then(res => { + if (res) { + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) + } + }).catch(e => { + }) + }) + }, + /** + * @description: 动态表单读取 + */ + getFormFieldList (item) { + console.log(item); + this.$nextTick(() => { + this.listForm = JSON.parse(JSON.stringify(item)) + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList + this.roleForm.dockUser = item.dockUser + this.roleForm.dockUserName = item.dockUserName + this.roleForm.ministerUser = item.ministerUser + this.roleForm.ministerUserName = item.ministerUserName + this.submitFlag = '修改节点' + this.dataList.distributePerson = item.dataList[0].distributePerson + }) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag; @@ -808,75 +843,118 @@ export default { this.saveLoading = false; }); }, - //提交事件 - handleSubmit() { - if(!this.dataList.length){ - this.$message.warning('请添加项目群信息') - }else{ - this.dataList.forEach(item => { - if(!item.distributePerson || !item.projectGroupPeople){ - this.$message.warning('请填写完整的人员信息') - }else { - this.isSubmit = true; - this.listForm.dataList = this.dataList; - this.listForm.commentText = this.commentText; - let json = Object.assign(this.listForm, this.roleForm); - console.log(json); - this.$refs["listForm"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.$http.post("lawss/activiti/startProcessRollBack", { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: "5", - json: JSON.stringify({ - taskInfo: "选择已拆分标准", - form: this.listForm, - roleForm: this.roleForm, - commentText: this.commentText - }) - }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } - }); - } else { - this.isSubmit = false; - return this.$message.warning("请完善人员信息"); - } - }); - } else { - this.isSubmit = false; - return this.$message.warning("请完善基础信息"); - } - }); - } - }) - } + //提交事件 + handleSubmit(){ + let peopleFlag = true + if(!this.dataList.length){ + this.$message.warning('请添加项目群信息') + }else{ + this.dataList.forEach(item => { + if(!item.distributePerson || !item.projectGroupPeople){ + peopleFlag = false + return + } + }) + if(peopleFlag){ + this.isSubmit = true; + this.listForm.dataList = this.dataList; + this.listForm.commentText = this.commentText; + let json = Object.assign(this.listForm, this.roleForm); + if(!this.submitFlag){ + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: "5", + json: JSON.stringify({ + taskInfo: "选择已拆分标准", + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善人员信息"); + } + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善基础信息"); + } + }); + }else{ + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json), + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善人员信息"); + } + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善基础信息"); + } + }); + } + }else{ + this.$message.warning('请完善人员信息') + } + + } }, //选择拆分标准取消事件 closeDrawer() { @@ -1056,6 +1134,9 @@ export default { if (this.bpnId !== undefined) { this.getData() } + if(this.$route.query.taskIds){ + this.getHistoryData() + } this.getStandData(); /** * 获取项目群筛选项的值 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue index eb3a7428d..5846c6439 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index 96b83d483..d30dab66f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index cadc01dd0..71426e24e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index 188779b39..e5f70d4c0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue index 86e5cb9a8..779e3aed7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index 5badbc1cf..0b8a34174 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue index 3b4239e97..496336577 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue index aac3a90b9..e2f0f3c9b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue new file mode 100644 index 000000000..c24d9ab2b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index b96977649..ed23826e3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -336,6 +336,7 @@ name: "bzzqyjStep3", data() { return { + standId: '', modaltitle2: '', addType: '', onlyKey: '', @@ -464,22 +465,16 @@ } }, addModal() { - var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); - this.itemId = id - this.editForm = { - chapterNumber: '', - chapterName: '', - oldText: '', - newText: '', - reason: '', - id: id, - department: this.$store.getters.userInfo.institutionName, - responUserName: this.$store.getters.userInfo.userName, - responUser: this.$store.getters.userInfo.userId - } - this.addType = 'add' - this.modaltitle2 = '新增' - this.modalshowflag2 = true + localStorage.setItem('freshClueNum', new Date().getTime()) + let routeData = this.$router.resolve({ + name: "ZQYJAddFileDetails", + query: { + standId: this.standId, + attId: this.form.fjList[0].attId, + fileType: this.form.fjList[0].standFileClassify, + } + }); + window.open(routeData.href, '_blank') }, itemEdit (row) { this.addType = 'edit' @@ -712,6 +707,7 @@ this.todoId = res.id this.json = data this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey + this.standId = data.standId this.getItemList(data.standId,data.textType) this.data = data.form ? data.form.data : (data.data ? data.data : (data.info ? data.info : [])) }).catch(e => { @@ -720,9 +716,18 @@ }, }, mounted() { + window.addEventListener("storage", ev => { + if(ev.key === 'freshClueNum'){ + let form = JSON.parse(window.localStorage.getItem('bzzqyjForm')) + form.department = this.$store.getters.userInfo.institutionName + form.responUserName = this.$store.getters.userInfo.userName + form.responUser = this.$store.getters.userInfo.userId + this.data.push(form) + } + }) this.getHistoryData() this.getData() - } + }, } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index aa0bb8ae0..fed06959d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -346,6 +346,7 @@ export default { name: "bzzqyjStep4", data() { return { + standId: '', modaltitle2: '', addType: '', commentText4: '', @@ -505,22 +506,32 @@ export default { } }, addModal() { - var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); - this.itemId = id - this.editForm = { - chapterNumber: '', - chapterName: '', - oldText: '', - newText: '', - reason: '', - id: id, - department: this.$store.getters.userInfo.institutionName, - responUserName: this.$store.getters.userInfo.userName, - responUser: this.$store.getters.userInfo.userId - } - this.addType = 'add' - this.modaltitle2 = '新增' - this.modalshowflag2 = true + localStorage.setItem('freshClueNum', new Date().getTime()) + let routeData = this.$router.resolve({ + name: "ZQYJAddFileDetails", + query: { + standId: this.standId, + attId: this.form.fjList[0].attId, + fileType: this.form.fjList[0].standFileClassify, + } + }); + window.open(routeData.href, '_blank') + // var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + // this.itemId = id + // this.editForm = { + // chapterNumber: '', + // chapterName: '', + // oldText: '', + // newText: '', + // reason: '', + // id: id, + // department: this.$store.getters.userInfo.institutionName, + // responUserName: this.$store.getters.userInfo.userName, + // responUser: this.$store.getters.userInfo.userId + // } + // this.addType = 'add' + // this.modaltitle2 = '新增' + // this.modalshowflag2 = true }, itemEdit (row) { this.addType = 'edit' @@ -673,6 +684,7 @@ export default { this.form.spId = data.spId || '' this.form.spName = data.spName || '' this.json = data + this.standId = data.standId this.getItemList(data.standId,data.textType) this.data = data.info || data.data }).catch(e => { @@ -683,6 +695,15 @@ export default { mounted() { this.getHistoryData() this.getData() + window.addEventListener("storage", ev => { + if(ev.key === 'freshClueNum'){ + let form = JSON.parse(window.localStorage.getItem('bzzqyjForm')) + form.department = this.$store.getters.userInfo.institutionName + form.responUserName = this.$store.getters.userInfo.userName + form.responUser = this.$store.getters.userInfo.userId + this.data.push(form) + } + }) } } diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index e9569dfe9..44e1b82c8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -977,6 +977,17 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '整改节点'){ + this.$router.push({ + name: 'bzpgStep1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //项目评估流程-项目 diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index b32569443..0fc96470c 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -452,14 +452,6 @@ } }); window.open(routeData.href, '_blank') - // return - // this.id = '' - // this.opiniontitle = '新增意见' - // this.opinionContent.partCode = '' - // this.opinionContent.reason = '' - // this.opinionContent.oldText = '' - // this.opinionContent.newText = '' - // this.opinionContent.cause = '' } }, //删除 diff --git a/src/router/index.js b/src/router/index.js index 3780eb167..281dfbf52 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1363,6 +1363,17 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/ZQYJAddFileDetails', + name: 'ZQYJAddFileDetails', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue'), + meta: { + requireAuth: true, + title: '新增', + isBoolean: true, + // menuId: '' + } + }, { path: '/bzzqyjStep1', name: 'bzzqyjStep1',