From 36c41a732f9fe006d9d77d4cee584c24f51c5859 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 28 Dec 2021 17:25:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standCalendar/index.vue | 45 ++++++++++++++----- .../pages/creatProcess/bzhHd-rh/step5.vue | 36 ++++++++++----- .../pages/creatProcess/bzhHy-ch/step5.vue | 33 ++++++++++---- 3 files changed, 84 insertions(+), 30 deletions(-) diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index 8006a15cc..24e890362 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -103,10 +103,10 @@
@@ -241,9 +241,9 @@ @@ -339,6 +339,7 @@ export default { // 议题选中时储存数组 deleteTable: [], loading: false, + dialogTitle: '' } }, mounted() { @@ -619,10 +620,19 @@ export default { fillFile: this.fillFile = [] } this.editMeetForm.attend.push(list) + this.dialogTitle = '新增人员信息' + this.add_partDialog(list) }, + add_partDialog(row) { + // 用来储存取消时原来的数据，防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.editForm = row + this.editFlag = true + }, // 编辑按钮 edit_partForm(row) { + this.dialogTitle = '编辑人员信息' // 用来储存取消时原来的数据，防止取消时修改 localStorage.setItem('obj', JSON.stringify(row)) this.editForm = row @@ -679,13 +689,26 @@ export default { this.editFlag = false }, falseDrawerTab() { - let Item = JSON.parse(localStorage.getItem('obj')) - this.editForm.fillPeopleId = Item.fillPeopleId - this.editForm.fillPeople = Item.fillPeople - this.editForm.fillUnit = Item.fillUnit - this.editForm.fillDept = Item.fillDept - this.editForm.fillTel = Item.fillTel - this.editForm.fillMail = Item.fillMail + if (this.dialogTitle = '新增人员信息') { + let Items = JSON.parse(localStorage.getItem('objs')) + this.editMeetForm.attend = Items.attend + this.editMeetForm.content = Items.content + this.editMeetForm.date = Items.date + this.editMeetForm.files = Items.files + this.editMeetForm.id = Items.id + this.editMeetForm.partPeople = Items.partPeople + this.editMeetForm.place = Items.place + this.editMeetForm.title = Items.title + this.editMeetForm.type = Items.type + } else { + let Item = JSON.parse(localStorage.getItem('obj')) + this.editForm.fillPeopleId = Item.fillPeopleId + this.editForm.fillPeople = Item.fillPeople + this.editForm.fillUnit = Item.fillUnit + this.editForm.fillDept = Item.fillDept + this.editForm.fillTel = Item.fillTel + this.editForm.fillMail = Item.fillMail + } this.editFlag = false }, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index 5ccfc4e93..d7556c1ce 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -295,7 +295,7 @@
@@ -478,6 +478,7 @@ export default { acceptShow: false, roleShowflag: false, nodeList: [], + isTitle: '' } }, computed: { @@ -539,6 +540,8 @@ export default { fillFile: this.fillFile = [] } this.rh_pageData.myPartRole.push(list) + this.isTitle = '新增人员信息' + this.add_partDialog(list) }, fillFile_up(row) { @@ -625,8 +628,17 @@ export default { handleClose() { this.upDialog = false }, + add_partDialog(row) { + // 用来储存取消时原来的数据，防止取消时修改 + localStorage.setItem('obj', JSON.stringify(row)) + this.fileListData = row + this.reData = this.fileListData.fillFile + this.editForm = row + this.editFlag = true + }, // 编辑按钮 edit_partForm(row) { + this.isTitle = '编辑人员信息' // 用来储存取消时原来的数据，防止取消时修改 localStorage.setItem('obj', JSON.stringify(row)) this.fileListData = row @@ -639,15 +651,19 @@ export default { this.editFlag = false }, falseDrawer() { - let Item = JSON.parse(localStorage.getItem('obj')) - this.editForm.fillPeopleId = Item.fillPeopleId - this.editForm.fillPeople = Item.fillPeople - this.editForm.fillUnit = Item.fillUnit - this.editForm.fillDept = Item.fillDept - this.editForm.fillPost = Item.fillPost - this.editForm.fillTel = Item.fillTel - this.editForm.fillMail = Item.fillMail - this.editForm.fillFile = Item.fillFile + if (this.isTitle === '新增人员信息') { + this.getData() + } else { + let Item = JSON.parse(localStorage.getItem('obj')) + this.editForm.fillPeopleId = Item.fillPeopleId + this.editForm.fillPeople = Item.fillPeople + this.editForm.fillUnit = Item.fillUnit + this.editForm.fillDept = Item.fillDept + this.editForm.fillPost = Item.fillPost + this.editForm.fillTel = Item.fillTel + this.editForm.fillMail = Item.fillMail + this.editForm.fillFile = Item.fillFile + } this.editFlag = false }, // 编辑框选人 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index f1a972017..583a25fe0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -257,7 +257,7 @@ Date: Tue, 28 Dec 2021 17:38:08 +0800 Subject: [PATCH 2/3] commit --- .../processCenter/pages/creatProcess/bzzqyj/step4-1.vue | 9 ++++++--- .../processCenter/pages/creatProcess/bzzqyj/step4.vue | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index de5aa2f41..9a957e8d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -82,7 +82,7 @@ style="display: none;" clearable > - + @@ -467,8 +467,11 @@ this.form.textType = data.textType || data.form.textType this.form.modelList = data.modelList || data.form.modelList this.form.modelNameList = data.modelNameList || data.form.modelNameList - this.form.bzfgId = data.bzfgId || '' - this.form.bzfgName = data.bzfgName || '' + console.log(data); + this.form.bzfgId = data.startUser + this.form.bzfgName = data.startUserName + // this.form.bzfgId = data.bzfgId || '' + // this.form.bzfgName = data.bzfgName || '' this.json = data this.data = data.info || data.data }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 6cf213fce..495404de8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -459,7 +459,7 @@ export default { newText: '', reason: '', id: id, - department: this.$store.getters.userInfo.upDeptName, + department: this.$store.getters.userInfo.institutionName, responUserName: this.$store.getters.userInfo.userName, responUser: this.$store.getters.userInfo.userId } From 7e32e3ab33b119debe5a3ee5e088a52cd1cdd941 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 28 Dec 2021 17:46:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=20-=20?= =?UTF-8?q?=E7=AC=AC=E4=BA=94=E6=AD=A5=20-=20=E6=8A=8A=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E6=9C=9F=E9=83=BD=E5=8E=BB=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step5.vue | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index c8f404d14..011c25da2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -170,32 +170,32 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +