From a2185c7badeef156f730ef08c2f3e929b404f3b7 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 23 Jun 2021 15:26:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E7=99=BB=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 89a3e872e..b0a620407 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -91,7 +91,7 @@ export default { let userInfo2 = decodeURIComponent(userInfoStr) let userInfoObj = JSON.parse(userInfo2) this.setToken(userInfoObj.usid) // vuex存储token - this.getByUserInfoCode().then((userInfo) => { + this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => { if (userInfo !== '' && userInfo !== null) { userInfo.workNum = userInfoObj.workNum if (userInfo.userPic !== null) { @@ -237,9 +237,9 @@ export default { }) }, // 获取用户信息 - getByUserInfoCode () { + getByUserInfoCode (userId) { return new Promise((resolve, reject) => { - this.$http.get('person/userInfo/getByUserInfoCode', { + this.$http.get('person/userInfo/getByUserInfoCode?userId='+ userId, { }, { _this: this, prefix: '/foton' From 8b317d092790fb0862c321f92cf1b2000946be5d Mon Sep 17 00:00:00 2001 From: yf <428080876@qq.com> Date: Wed, 23 Jun 2021 15:29:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step3.vue | 152 ++++++++++++++-- .../pages/creatProcess/bzrk/step4.vue | 168 ++++++++++++++++-- .../tabComponents/processCenter/index.vue | 4 +- 3 files changed, 292 insertions(+), 32 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 17a7e98ea..79c453670 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -3,11 +3,12 @@ - +
基础信息
-
审批历史
+
审批历史
+
@@ -45,6 +46,7 @@ disabled v-model="form.standYear" type="year" + value-format="yyy" placeholder="请选择标准年份"> @@ -519,16 +521,16 @@
- - - - + + + + + v-model="commentText">
@@ -581,6 +583,75 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
{ + this.detailData = res + }, e => {}) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId + taskIds: this.taskIds, + pId: this.pId }).then(res => { if (res) { - this.form = JSON.parse(res.mesg) + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) } }).catch(e => { }) }) }, + /** + * @description: 动态表单读取 + */ + getFormFieldList (item) { + this.$nextTick(() => { + this.form = JSON.parse(JSON.stringify(item)) + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = item.id + }) + }, closeDrawer() { this.ListModel = false }, @@ -728,8 +843,22 @@ export default { }, handleSave() {}, handleSubmit() { + this.form.commentText = this.commentText + this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); console.log(json) + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId : this.userId, + json: json + }, { + _this: this + }, res => { + console.log(res); + // if (res.success) { + // this.processCreateStand(json) + // } + }) // this.$http.post('lawss/activiti/completeTask', { // taskIds: res.data, // userId : this.$store.getters.userInfo.userId, @@ -767,6 +896,7 @@ export default { }, }, mounted () { + this.processTable() this.getData() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 67d7ba459..4f01e999f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -3,11 +3,12 @@ - +
基础信息
-
审批历史
+
审批历史
+
@@ -45,6 +46,7 @@ disabled v-model="form.standYear" type="year" + value-format="yyy" placeholder="请选择标准年份"> @@ -516,23 +518,23 @@
- - - + + +
- - - - - - - - - - + + +
+ +
@@ -581,6 +583,75 @@
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
{ + this.detailData = res + }, e => {}) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ - taskIds: this.$route.query.taskIds, - pId: this.$route.query.prcId + taskIds: this.taskIds, + pId: this.pId }).then(res => { if (res) { - this.form = JSON.parse(res.mesg) + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) } }).catch(e => { }) }) }, + /** + * @description: 动态表单读取 + */ + getFormFieldList (item) { + this.$nextTick(() => { + this.form = JSON.parse(JSON.stringify(item)) + this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = item.id + }) + }, closeDrawer() { this.ListModel = false }, @@ -728,8 +843,22 @@ export default { }, handleSave() {}, handleSubmit() { + this.form.commentText = this.commentText + this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); console.log(json) + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId : this.userId, + json: json + }, { + _this: this + }, res => { + console.log(res); + if (res.success) { + this.processCreateStand(json) + } + }) // this.$http.post('lawss/activiti/completeTask', { // taskIds: res.data, // userId : this.$store.getters.userInfo.userId, @@ -767,6 +896,7 @@ export default { }, }, mounted () { + this.processTable() this.getData() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 349d54a99..95a5dce6e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -233,7 +233,7 @@ export default { }) }else if (row.taskInfo === '责任人会签'){ this.$router.push({ - name: 'step3', + name: 'bzrkStep3', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -244,7 +244,7 @@ export default { }) }else if (row.taskInfo === '申请人修订'){ this.$router.push({ - name: 'step4', + name: 'bzrkStep4', query: { taskIds: row.taskIds, prcId: row.prcId,