diff --git a/src/pages/personal/pages/individual-plate/index.vue b/src/pages/personal/pages/individual-plate/index.vue index 5cfbe5636..ff7c46b70 100644 --- a/src/pages/personal/pages/individual-plate/index.vue +++ b/src/pages/personal/pages/individual-plate/index.vue @@ -192,7 +192,7 @@ export default { height:100% !important; } .el-transfer-panel__list.is-filterable { - height: 360px; + height: calc(~'100% - 100px'); padding-top: 0; overflow-y: auto; } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index de83172fa..fe16bf313 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -265,6 +265,7 @@ name: "bzjdStep1", data() { return { + standId: '', commentText: '', textarea: '', // 意见 title: '', // 新增抽屉标题 @@ -416,6 +417,7 @@ this.form.name = bringData[0].standName } this.form.id = bringData[0].id + this.standId = bringData[0].standId this.listModel = false; this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { infoId: this.form.id, @@ -508,6 +510,7 @@ if (res.ok) { var json = Object.assign(this.form, this.roleForm) json.commentText = this.commentText + json.standInData = this.standId json.itemList = this.itemList this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 8f931edfe..e7904ad72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -26,7 +26,7 @@ @@ -34,26 +34,18 @@ - - - - - + - + @@ -140,15 +132,14 @@ isSubmit: false, saveLoading: false, form: { - cid: '', // 编号 - endTime: '', // 结束日期 - cname: '', // 名称 - responUserList: '', - responUserListName: '' + number: '', // 编号 + name: '', // 结束日期 + zxUserId: '', + zxUserIdName: '' }, formRules: { - responUserList: [ - { required: true, message: '请选择责任人', trigger: 'change' }, + zxUserId: [ + { required: true, message: '请选择执行人', trigger: 'change' }, ] }, json: {} @@ -171,8 +162,8 @@ idList += item.id nameList += item.name }) - this.form.responUserList = idList - this.form.responUserListName = nameList + this.form.zxUserId = idList + this.form.zxUserIdName = nameList this.modalshowflag = false }, cancleUserInfo () { @@ -180,8 +171,8 @@ }, choiceZRR () { this.nodeList = [] - if (this.form.responUserList.length > 0) { - this.nodeList = this.form.responUserList.split(',') + if (this.form.zxUserId.length > 0) { + this.nodeList = this.form.zxUserId.split(',') } this.modalshowflag = true }, @@ -199,8 +190,15 @@ if (valid) { var json = this.json json.commentText = this.commentText - json.responUserList = this.form.responUserList - json.responUserListName = this.form.responUserListName + var arr = this.form.zxUserId.split(',') + var newArr = [] + arr.forEach(item => { + var json1 = {} + json1.id = item + newArr.push(json1) + }) + json.zxUserId = newArr + json.zxUserIdName = this.form.zxUserIdName this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -223,9 +221,8 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname + this.form.number = data.number + this.form.name = data.name this.json = data }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue new file mode 100644 index 000000000..d0da3fac1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -0,0 +1,297 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f97527a6f..0ac07ba53 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -569,7 +569,7 @@ export default { } break case '9': - if (row.taskInfo === '') { + if (row.taskInfo === '选择执行人') { this.$router.push({ name: 'bzjdStep2', query: { @@ -580,6 +580,17 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '填写解读分析') { + this.$router.push({ + name: 'bzjdStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } } }, diff --git a/src/router/index.js b/src/router/index.js index 9aef11b99..4fdfc96b2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -609,6 +609,15 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/bzjdStep3', + name: 'bzjdStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step3.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, ] }, // 本地工具