diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 07fafe8e4..8f723900c 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -286,11 +286,11 @@ path: '/standContrast', menuId: '1d83a6278f781419f628e9f5560f5c86' }, - { - title: '标准化活动日历', - path: '/standCalendar', - menuId: '5e834b3fca90619e593ad0ee83263885' - }, + // { + // title: '标准化活动日历', + // path: '/standCalendar', + // menuId: '5e834b3fca90619e593ad0ee83263885' + // }, // { // title: '标准比对库', // path: '/standardComparisonLibrary', diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index c0847bffe..91c7fef8b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -269,7 +269,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { saveTaskFirst } from 'api/process' +import { queryTaskFirst, saveTaskFirst } from "api/process"; import { taskDel } from 'api/process' export default { name: "bzdyStep1", @@ -559,14 +559,13 @@ export default { this.saveLoading = false }) }, - handleSubmit(username) { + handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true this.$http.post('lawss/activiti/startProcessRollBack', { - id: this.bpnId || '', createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, type: '2', @@ -586,14 +585,12 @@ export default { }, {}, res => { if (res.success) { this.$message.success('流程发起成功') - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) + let taskId = { + id: this.$route.query.bpnId } + taskDel(taskId).then(res=>{ + return res + }) this.$router.push('/processCenter') } this.isSubmit = false @@ -612,12 +609,28 @@ export default { } }) }, - aa () { - return 11111 - } + getData () { + queryTaskFirst({ + bpnId: this.bpnId + }).then(res => { + this.bpnId = this.$route.query.bpnId + let mes = JSON.parse(res.mes) + if (mes.form.date) { + mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) + } else { + mes.form.date = '' + } + this.form = mes.form + this.roleForm = mes.roleForm + this.commentText1 = mes.commentText1 || '' + }) + }, }, mounted () { this.bpnId = this.$route.query.bpnId + if (this.bpnId !== undefined) { + this.getData() + } }, } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 65ac10fdb..a27652d21 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -72,6 +72,31 @@ value-format="yyyy-MM-dd"> + + + + + + + + @@ -153,31 +178,6 @@ clearable > - - - - - - - - @@ -816,17 +816,18 @@
- + - - - + + + + + + + - + - - - + + + + + + + - - - + + + + + + + - - - + + + + + + + + { this.form = JSON.parse(JSON.stringify(item)) this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys3 = [this.form.dybxh] - this.treeCheckedKeys = this.form.treeListId.split(',') + if (this.form.treeListId) { + this.treeCheckedKeys = this.form.treeListId.split(',') + } this.form.standType = this.form.standInData === "0" ? 'INLAND' : 'FOREIGN' this.form.standYear = this.form.standYear ? this.form.standYear : '' - if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') { + if (this.form.country) { this.form.country = this.form.country.split(","); } this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id + console.log(this.form); // 遍历对象初始化文件信息 for (const p in this.form) { @@ -3196,7 +3206,7 @@ export default { handleSave() { //文件处理 this.fileInfoHandle(); - this.form.country = this.countryArr; + // this.form.country = this.countryArr; // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } @@ -3290,7 +3300,7 @@ export default { if (res.ok) { this.fileInfoHandle() this.isSubmit = true - this.form.country = this.countryArr; + // this.form.country = this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId @@ -3349,7 +3359,7 @@ export default { } else { this.fileInfoHandle() this.isSubmit = true - this.form.country = this.countryArr; + // this.form.country = this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId @@ -3482,6 +3492,9 @@ export default { /deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner { width: 100%; } + /deep/.el-form-item__content .el-textarea .el-textarea__inner { + width: 94%; + } /deep/ .search-area { display: contents; diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 4b8627a66..683a81a5a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -555,10 +555,11 @@
- + - + @@ -617,6 +622,7 @@
- + @@ -522,6 +523,7 @@ v-else v-model="form.dtbjh" disabled + type="textarea" placeholder="请输入代替标准号" clearable > @@ -548,11 +550,12 @@
- + @@ -579,6 +584,7 @@ v-else v-model="form.cbbh" disabled + type="textarea" placeholder="请输入采标编号" clearable > @@ -604,6 +610,7 @@
- + - + item.name).join(",") }, handleSubmit() { - this.form.country = this.countryArr; this.$refs['form'].validate((valid) => { if (valid) { if (this.submitType === 1) { @@ -2999,7 +3008,9 @@ export default { /deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner { width: 70%; } - + /deep/.el-form-item__content .el-textarea .el-textarea__inner { + width: 94%; + } /deep/ .el-upload-list__item-name { white-space: inherit; } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 80881c2e8..56ea88033 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -24,13 +24,26 @@
- + 国内标准入库 海外标准入库 - + + + + + + + + @@ -108,7 +122,8 @@ disabled v-model="form.issueTime" type="date" - placeholder="请选择标准发布日期"> + placeholder="请选择标准发布日期" + value-format="yyyy-MM-dd"> - - - - - - + + - + 文本信息
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- {{ form.xgdName }} +
+ + {{ value.name }}
- -
-
- {{ form.fbgbjbdName }} +
+ {{ value.name }}
- -
-
- {{ form.zbjbdName }} +
+ {{ value.name }}
- -
-
- {{ form.ssgName }} +
+ {{ value.name }}
- -
-
- {{ form.caName }} +
+ {{ value.name }}
- - @@ -242,8 +328,16 @@ -
- {{ form.kwjName }} +
+ {{ value.name }} +
+
+ - - +
+ + +
+ {{ value.name }}
- - @@ -252,24 +346,24 @@ -
- {{ form.jdwjName }} +
+ {{ value.name }}
- -
-
- {{ form.bpgName }} +
+ {{ value.name }}
- -
-
- {{ form.zqyjgName }} +
+ {{ value.name }}
- - @@ -307,7 +401,7 @@ - + - + - + - + - + - + - + - + - - + {{ form.wssmr }} - - + + + + + + + @@ -458,6 +536,17 @@ > + + + + +
@@ -466,22 +555,24 @@
- + @@ -489,80 +580,60 @@ - - - - - - - - -
- {{ form.glwjName }} +
+ {{ value.name }}
- -
- - + - - - - - - - - - - - - - - - - @@ -582,25 +654,6 @@
-
- - - - - - - - - - - - - - - - - -
@@ -650,7 +703,7 @@
-
+
diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue index 96be90b23..ab9b04792 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step2.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue @@ -24,6 +24,7 @@
+ @@ -265,25 +266,26 @@ } }) }, - getData() { - return new Promise((resolve, reject) => { - inboundLiaisonDetail({ - taskIds: this.taskIds, - pId: this.pId - }).then(res => { - let data = JSON.parse(res.mesg) - this.form.fjList = data.fjList || data.form.fjList - this.form.modelList = data.modelList || data.form.modelList - this.form.title = data.title || data.form.title - this.form.date = data.date || data.form.date - this.json = data || data.form - this.form.responUserList = data.form? data.form.responUserList : '' - this.form.responUserListName = data.form? data.form.responUserListName : '' - this.commentText2 = data.commentText2 || '' - }).catch(e => { - }) - }) - }, + getData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.taskIds, + pId: this.pId + }).then(res => { + let data = JSON.parse(res.mesg) + this.form.fjList = data.fjList || data.form.fjList + this.form.modelList = data.modelList || data.form.modelList + this.form.title = data.title || data.form.title + this.form.processName = data.processName || data.form.processName + this.form.date = data.date || data.form.date + this.json = data || data.form + this.form.responUserList = data.form? data.form.responUserList : '' + this.form.responUserListName = data.form? data.form.responUserListName : '' + this.commentText2 = data.commentText2 || '' + }).catch(e => { + }) + }) + }, }, mounted () { this.getData() diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue index 262f1f350..26990a8cf 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step4.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue @@ -24,6 +24,7 @@
+ @@ -94,7 +95,6 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" - @save="handleSave" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -268,6 +268,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.processName = data.form ? data.form.processName : data.processName this.form.dyhz = data.form ? data.form.dyhz : data.dyhz this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date diff --git a/src/pages/processCenter/pages/phone/bzdy/step6.vue b/src/pages/processCenter/pages/phone/bzdy/step6.vue index 8d06711e7..90d7ae54a 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step6.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step6.vue @@ -24,6 +24,7 @@
+ @@ -324,6 +325,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.processName = data.form ? data.form.processName : data.processName this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue index fd0c0504a..d31948e15 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step7.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue @@ -23,6 +23,7 @@
+ @@ -286,6 +287,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.processName = data.form ? data.form.processName : data.processName this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form diff --git a/src/pages/processCenter/pages/phone/bzdy/step8.vue b/src/pages/processCenter/pages/phone/bzdy/step8.vue index a7546b022..d384fa013 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step8.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step8.vue @@ -23,6 +23,7 @@
+ @@ -286,6 +287,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.processName = data.form ? data.form.processName : data.processName this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue index 2b5e8548e..284c9978a 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step9.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue @@ -23,6 +23,7 @@
+ @@ -288,6 +289,7 @@ }).then(res => { let data = JSON.parse(res.mesg) this.commentText9 = data.commentText9 || '' + this.form.processName = data.form ? data.form.processName : data.processName this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index ba636badf..c6de1f965 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -39,7 +39,7 @@ > - + - + + + + + + + + + + +
@@ -252,12 +274,25 @@ > + + + + + - - + + + + @@ -274,28 +309,17 @@ > - - - - - - - - - - + + + + + + + + + + +
- - + +
- - - - - - + +
@@ -426,6 +441,7 @@ export default { name: "phoneBzrkStep2", data() { return { + commentText: '', textStatusMap: {}, // 文本状态id与name对应 xgdFileMap: [], fbgbjbdFileMap: [], @@ -788,6 +804,8 @@ export default { // jdwjFileMap: {}, this.kwjFileMap = this.assemble(processForm.kwj, processForm.kwjName); // kwjFileMap: {}, + this.xdbFileMap = this.assemble(processForm.xdb, processForm.xdbName); + // xdbFileMap: {}, this.glwjFileMap = this.assemble(processForm.glwj, processForm.glwjName); // glwjFileMap: {}, this.caFileMap = this.assemble(processForm.ca, processForm.caName); @@ -806,14 +824,19 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) -/* console.log(this.form) + let wssmrName = this.form.wssmrname || this.form.wssmr + this.form.wssmr = wssmrName + this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : '' + this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : '' + this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: '' + this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : '' this.defaultCheckedKeys = [this.form.standSystem] this.defaultCheckedKeys1 = [this.form.cycvppsbm] this.defaultCheckedKeys2 = [this.form.kccvppsbm] - this.defaultCheckedKeys3 = [this.form.dybxh]*/ + this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' - if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') { + this.form.standYear = this.form.standYear ? this.form.standYear : '' + if (this.form.country) { this.form.country = this.form.country.split(","); } this.form.prcNum = this.prcNum @@ -845,7 +868,7 @@ export default { handleSave() { }, handle1() { - if(this.formTongGuo.commentText){ + if(this.commentText){ this.formTongGuo.approvalOpinion = 1 this.handleSubmit() }else{ @@ -857,16 +880,6 @@ export default { this.handleSubmit() }, handleSubmit() { - const val = this.form.country; - if (val !== "" && val !== null && typeof (val) !== "undefined") { - if (val instanceof Array) { - this.form.country = val.join(","); - } else { - this.form.country = val; - } - } else if (val === "") { - this.form.country = []; - } this.isSubmit = true; this.form.commentText = this.commentText; this.form.approvalOpinion = this.formTongGuo.approvalOpinion; diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 2388596ef..e6aed9d79 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -621,7 +621,7 @@ export default { // 法规入库及评估流程 case '2': this.$router.push({ - name: 'bzdyStep1-1', + name: 'bzdyStep1', query: { type: '2', processName: '标准调研流程', diff --git a/src/pages/regulatoryRepository/workingGroup/index.vue b/src/pages/regulatoryRepository/workingGroup/index.vue index e99e5b298..cb22f3ab5 100644 --- a/src/pages/regulatoryRepository/workingGroup/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/index.vue @@ -14,7 +14,10 @@ - 工作组统计 +
+ 标准化活动日历 + 工作组统计 +