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 @@ @@ -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 }); }); }); 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({ 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 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + 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 } 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; 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 @@ - - +