From df08287d6e86b0d3a4e90fac981ba2b358a51e0c Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 16 Jul 2021 09:46:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzqdfb/step2.vue | 8 ++++---- .../processCenter/pages/creatProcess/bzqdfb/step3.vue | 8 ++++---- .../processCenter/pages/creatProcess/bzqdfb/step4.vue | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 994a198e4..2baf4ee4b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -9,7 +9,7 @@
基础信息
审批历史
-
+
@@ -53,15 +53,15 @@ clearable > - + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index eb8d88b53..2b362a5af 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -9,7 +9,7 @@
基础信息
审批历史
-
+
@@ -51,9 +51,9 @@ clearable > - + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index e9cadf774..ac9bbeee9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -9,7 +9,7 @@
基础信息
审批历史
-
+
@@ -53,16 +53,16 @@ clearable > - + From f3549f3a133e761b41d33efea33a4a7556b432e4 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 16 Jul 2021 11:29:09 +0800 Subject: [PATCH 2/2] commit --- .../pages/creatProcess/bzjd/step1.vue | 176 +++++++++++++++-- .../pages/creatProcess/bzjd/step2.vue | 44 ++++- .../pages/creatProcess/bzjd/step3.vue | 177 ++++++++++-------- 3 files changed, 295 insertions(+), 102 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index b6d86c38e..761ad3913 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -44,6 +44,34 @@ clearable > + + + + + + + + + + + +
@@ -232,6 +260,59 @@
+ +
+
+ +
+
+ + + + + + + + + +
+
+
+ +
+ 取消 + 确定 +
+
+ { - this.tableHeight = $('.content').height() - 44 - } - }, methods: { addZqyjList() { this.title = '标准拆分数据库' @@ -412,6 +499,16 @@ }, e => { }) }, + sarStandCompareHis2 () { + var form = this.standCommonlySearch2 + this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, { + _this: this + }, res => { + this.standInfoList2 = res.data.list + this.total2 = res.data.total + }, e => { + }) + }, pageChange (page) { this.standCommonlySearch.page = page this.sarStandCompareHis() @@ -419,9 +516,19 @@ // 分页每页显示数改变后方法 pageSizeChange (pageSize) { this.$store.getters.userInfo.configContent = pageSize - this.standCommonlySearch.size = pageSize + this.standCommonlySearch.pageSize = pageSize this.sarStandCompareHis() }, + pageChange2 (page) { + this.standCommonlySearch2.page = page + this.sarStandCompareHis2() + }, + // 分页每页显示数改变后方法 + pageSizeChange2 (pageSize) { + this.$store.getters.userInfo.configContent = pageSize + this.standCommonlySearch2.pageSize = pageSize + this.sarStandCompareHis2() + }, /** 选择带入数据的方法操作 * */ handleSelection(data) { @@ -430,6 +537,12 @@ this.selectedList.push(data[i].id); } }, + handleSelection2 (data) { + this.selectedList2 = []; + for (let i = 0; i < data.length; i++) { + this.selectedList2.push(data[i].id); + } + }, closeDrawer() { this.listModel = false }, @@ -452,8 +565,10 @@ this.form.name = bringData[0].standName } this.form.id = bringData[0].id + this.sarType = bringData[0].sarType this.standId = bringData[0].standId this.listModel = false; + this.listModel2 = true this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { infoId: this.form.id, page: 1, @@ -476,6 +591,34 @@ this.$message.warning("请选择一条数据进行带入"); } }, + closeDrawer2() { + this.listModel2 = false + }, + enterDrawer2() { + if (this.selectedList2.length === 1) { + let deposit = new Map(); + this.standInfoList2.forEach(item => { + deposit.set(item.id, item); + }); + let bringData = []; + for (let i = 0; i < this.selectedList2.length; i++) { + bringData.push(deposit.get(this.selectedList2[i])); + } + if (bringData[0].splitStatus === '0') { + this.form.number1 = bringData[0].standNumSplit + this.form.name1 = bringData[0].standNameSplit + } else { + this.form.number1 = bringData[0].showNumber + this.form.name1 = bringData[0].standName + } + this.form.id1 = bringData[0].id + this.listModel2 = false + } else if (this.selectedList2.length > 1) { + this.$message.warning("只能选择一条数据进行带入"); + } else { + this.$message.warning("请选择一条数据进行带入"); + } + }, /*** **********************************************/ /** 流程节点负责人的选择 *****************************/ choiceZRR (type, title, id) { @@ -595,7 +738,7 @@ if (res.ok) { var json = Object.assign(this.form, this.roleForm) json.commentText = this.commentText - json.standInData = this.standId + json.standInData = this.sarType json.itemList = this.itemList this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), @@ -621,7 +764,16 @@ } }) } - } + }, + mounted () { + this.getTree() + this.sarStandCompareHis() + this.sarStandCompareHis2() + this.tableHeight = $('.content').height() - 44 + window.onresize = () => { + this.tableHeight = $('.content').height() - 44 + } + }, } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 0e2f2b4f2..2b4f133eb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -13,7 +13,6 @@ @@ -39,6 +38,34 @@ clearable > + + + + + + + + + + + +
@@ -158,6 +185,7 @@ name: "bzjdStep2", data() { return { + sarType: '', zxIndex: '', zxType: '', zxIdList: [], @@ -181,15 +209,8 @@ isSubmit: false, saveLoading: false, form: { - number: '', // 编号 - name: '', // 结束日期 - zxUserId: '', - zxUserIdName: '' - }, - formRules: { - zxUserId: [ - { required: true, message: '请选择执行人', trigger: 'change' }, - ] + number: '', + name: '', }, json: {}, itemList: [] @@ -311,6 +332,9 @@ let data = JSON.parse(res.mesg) this.form.number = data.number this.form.name = data.name + this.form.number1 = data.number1 + this.form.name1 = data.name1 + this.sarType = data.standInData this.json = data var arr = [] arr = JSON.parse(data.itemList) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index cbc3b1ac8..ba0238f65 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -13,7 +13,6 @@ @@ -39,6 +38,34 @@ clearable > + + + + + + + + + + + +
@@ -48,7 +75,7 @@
- 批量编辑 + 批量编辑
+ + + + + + + + + + + + + + + + + + - - - - -
@@ -148,36 +205,21 @@ name: "bzjdStep3", data() { return { + sarType: '', itemList: [], loading: false, commentText: '', taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - roleRow: {}, - nodeList: [], - type: '', - defaultProps: { - children: 'children', - label: 'name' - }, - treeData: [], // 人员数据 - modalshowflag: false, // drawer开关 - drawerTitle: '', //drawer标题 textarea: '', // 意见 - ListModel: false, // 新增编辑抽屉开关 active: '1', // 默认显示 isSubmit: false, saveLoading: false, form: { - number: '', // 编号 - name: '', // 结束日期 - zxUserId: '', - zxUserIdName: '' - }, - formRules: { - zxUserId: [ - { required: true, message: '请选择执行人', trigger: 'change' }, - ] + number: '', + name: '', + number1: '', + name1: '' }, json: {} } @@ -189,36 +231,6 @@ }, methods: { handleSelectionChange () {}, - saveUserInfo () { - var idList = '' - var nameList = '' - this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => { - if (nameList.length > 0) { - nameList += ',' - idList += ',' - } - idList += item.id - nameList += item.name - }) - this.form.zxUserId = idList - this.form.zxUserIdName = nameList - this.modalshowflag = false - }, - cancleUserInfo () { - this.modalshowflag = false - }, - choiceZRR () { - this.nodeList = [] - if (this.form.zxUserId.length > 0) { - this.nodeList = this.form.zxUserId.split(',') - } - this.modalshowflag = true - }, - getTree () { - this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { - this.treeData = res.data - }) - }, handleTabs(name) { this.active = name }, @@ -261,15 +273,20 @@ let data = JSON.parse(res.mesg) this.form.number = data.number this.form.name = data.name + this.form.number1 = data.number1 + this.form.name1 = data.name1 + this.sarType = data.standInData this.json = data this.itemList = JSON.parse(data.itemList) + this.itemList.forEach( item => { + item.deptName = this.$store.getters.userInfo.orgName + }) }).catch(e => { }) }) }, }, mounted () { - this.getTree() this.getData() } }