From 36c41a732f9fe006d9d77d4cee584c24f51c5859 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 28 Dec 2021 17:25:35 +0800 Subject: [PATCH 1/7] =?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/7] 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/7] =?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 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + From 6f6c28151eaa10cfbd19281c6d586d29be3671f1 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 28 Dec 2021 17:50:12 +0800 Subject: [PATCH 4/7] feat: There is no way the,vpps car and bus --- .../searchCenter/pages/advancedSearch.vue | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index b84453434..0fcf27ebd 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -305,21 +305,7 @@ - - + @@ -332,21 +318,7 @@ - - + From f03807f9ab4ebca679b38cb251fdc5027abe8239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 28 Dec 2021 18:01:01 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step2.vue | 5 +- .../pages/creatProcess/bzqdfb/step3.vue | 136 +++++++++--------- .../pages/creatProcess/bzqdfb/step4.vue | 5 +- 3 files changed, 75 insertions(+), 71 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index a70f42992..19e5fbd11 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -49,7 +49,7 @@ /> @@ -360,7 +360,8 @@ export default { name: item.oldFileName, uid: item.uid, status: item.status, - id: item.id + id: item.id, + fileSuffix: item.fileSuffix }); }); }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 7128517c9..a10230dd2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -274,75 +274,77 @@ - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -429,7 +429,8 @@ export default { name: item.oldFileName, uid: item.uid, status: item.status, - id: item.id + id: item.id, + fileSuffix: item.fileSuffix }); }); }); From 1336553e5f96f0a229eea4cc77064d05ffab6db1 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 28 Dec 2021 19:32:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20-=201=E5=92=8C4=20-=20=E6=8A=8A=E6=B5=B7?= =?UTF-8?q?=E5=A4=96=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E7=9A=84=E4=B8=AD?= =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=E8=AE=BE=E7=BD=AE=E6=88=90=E9=9D=9E?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 2 ++ .../pages/creatProcess/bzrk/step4.vue | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index a4475fb17..4de50bcb7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1836,9 +1836,11 @@ export default { /** val === '1' (国外) val === '0'（ 国内 ）*/ // 国内英文名称不必填 国外必填 ，标准性质国内不体现 if (val === '1') { + this.rules.standName[0].required = false this.rules.standEnName[0].required = true; this.rules.standNature[0].required = false } else { + this.rules.standName[0].required = true this.rules.standNature[0].required = true this.rules.standEnName[0].required = false; } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 8101bf075..78340e107 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -26,7 +26,7 @@ - + 国内标准入库 海外标准入库 @@ -1692,6 +1692,23 @@ export default { }, }, methods: { + // 标准来源改变事件 + standInChange(val) { + this.verifySarStandard = false + + /** val === '1' (国外) val === '0'（ 国内 ）*/ + // 国内英文名称不必填 国外必填 ，标准性质国内不体现 + if (val === '1') { + this.rules.standName[0].required = false + this.rules.standNature[0].required = false + this.rules.standEnName[0].required = true; + } else { + this.rules.standName[0].required = true + this.rules.standNature[0].required = true + this.rules.standEnName[0].required = false; + } + this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN' + }, getBusStandFileByAttId(attId) { return new Promise((resolve, reject) => { getBusStandFileByAttId({ From 3952d0d0ead62e4113c09822f51852f59ca70a47 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 28 Dec 2021 19:44:12 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 8438138d2..33a90a927 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -226,6 +226,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -753,6 +755,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, //保存事件 handleSave() { this.saveLoading = true;