From 00a53f0823eab39d699479445ae19ded2e9f240e Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 14 Nov 2021 13:23:08 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=87=8D=E7=82=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E5=8F=96=20-=20=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/zdrzbzORzchgxxmsc/step1.vue | 331 +++++++++++++++++- 1 file changed, 330 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue index 82e0bd747..53999e8fb 100644 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue @@ -22,7 +22,7 @@
- 调取 + 调取 删除
@@ -210,6 +210,155 @@ @submit="handleSubmit" > + + +
+
+
+ + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + +
+ + 数据获取中 +
+
+
+ + + + + + + + 带入 + + 取消 + +
+ @@ -228,6 +377,31 @@ export default { }, data() { return { + productTypeOptions: [{label: '树形结构', value: 'TREE'}, {label: '下拉选项', value: 'SEL_OPTION'}], + loadSarStandard: false, + tableHeight: { + standardTableHeight: null + }, + tableData: { + // 标准表格数据 + standardData: [], + // 任务分解单数据 + taskTableData: [] + }, + standardSearchForm: { + lawId: '', + lawName: '', + productType: '', + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + total: 0, + standType: 'INLAND', + standSort: '', + standName: '', + standEnName: '', + standNumber: '' + }, + standardDrawer: false, isSubmit: false, active: "1", //默认显示基础信息页面 // 基础信息form表单 @@ -312,6 +486,135 @@ export default { } }, methods: { + handleProcessStandardNext(status) { + switch (status) { + // 新增 + case 1: + this.selectedList = [] + this.standardCheckedList = [] + this.standardDrawer = false + this.verifySarStandard = true + this.clearFormData(this.form) + break + // 带入 + case 2: + if (this.standardCheckedList.length === 1) { + this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, { + _this: this + }, res => { + if (res && res.data) { + const bringData = res.data + + const json = Object.assign(bringData, bringData.attrInfoMap); + this.form = JSON.parse(JSON.stringify(json)) + this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : [] + this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : [] + this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : [] + this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : [] + this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : [] + this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : [] + this.form.prcNum = this.prcNum + this.form.prcName = this.prcName + this.form['id'] = bringData.id + this.standardDrawer = false + this.verifySarStandard = true + this.busVsFunc() + this.modelFunc() + this.$forceUpdate() + } + // 遍历对象初始化文件信息 + for (const p in this.form) { + if (typeof (this.form[p]) != "function") { + this.initializeFileList(p, this.form[p]); + } + } + console.log("res", res); + }) + + } else if (this.standardCheckedList.length > 1) { + this.$message.warning('最多可以带入一条政策信息') + } else { + this.$message.warning('请选择要带入的政策信息') + } + break + // 取消 + case 3: + this.selectedList = [] + this.standardCheckedList = [] + this.standardDrawer = false + break + } + }, + handleStandardPageChange(page) { + this.standardSearchForm.page = page + this.handleSearchStandard() + }, + handleStandardPageSizeChange(pageSize) { + this.standardSearchForm.page = 1 + this.standardSearchForm.pageSize = this.$store.getters.userInfo.configContent + this.handleSearchStandard() + }, + // 点击查看 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: 'OtherLawsStandDetails', + params: { + id: item.id, + pageType: 'LAWS_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, + standSelectChange(data) { + this.selectedList = [] + for (let i = 0; i < data.length; i++) { + this.selectedList.push(data[i].id) + } + this.standardCheckedList = data + }, + //清空搜索条件 + handleResetSearch() { + this.standardSearchForm.lawId = '' + this.standardSearchForm.lawName = '' + this.standardSearchForm.productType = '' + this.standardSearchForm.standType = 'INLAND' + this.standardSearchForm.standNumber = '' + this.standardSearchForm.standSort = '' + this.standardSearchForm.standName = '' + this.standardSearchForm.standEnName = '' + this.handleSearchStandard() + }, + getDomesticStandardTable() { + this.loadSarStandard = true + this.$http.get('sarIssueTrack/issueTrack', this.standardSearchForm, {_this: this}, res => { + this.loadSarStandard = false + if (res.ok) { + this.standardSearchForm.page = 1 + this.tableData.standardData = res.data.records + this.standardSearchForm.total = res.data.total + } + }, e => { + this.loadSarStandard = false + }) + }, + handleSearchStandard() { + this.standardDrawer = true + this.$nextTick(() => { + // 动态设置表格高度 + this.tableHeight.standardTableHeight = $('.standard-table-wrap').height() + window.onresize = () => { + this.tableHeight.standardTableHeight = $('.standard-table-wrap').height() + } + }) + this.getDomesticStandardTable() + }, + /** + * 关闭修订 Drawer 的监听 + * @param done + */ + handleReviseDrawerClose(done) { + done() + }, //基础信息/人员信息 handleTabs(type) { this.active = type; @@ -429,6 +732,32 @@ export default { .zdrzbzORzchgxxmsc-step1 { + .standard-content { + height: 100%; + padding: 10px 0 0; + .content { + height: 100%; + display: flex; + flex-direction: column; + padding: 0 10px; + .standard-table-wrap { + flex: auto; + overflow-y: auto; + } + .pagination { + position: static; + /deep/ .pagination-slot { + padding: 0; + } + } + .search-area { + display: flex; + justify-content: left; + background: #FFF; + padding: 10px 10px 0; + } + } + } .myForm { /deep/ .el-form-item__content { line-height: 10px; From c0f90df0247a403d22e9c0d91c04beac5e58a754 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 14 Nov 2021 13:37:54 +0800 Subject: [PATCH 2/8] commit --- .../accessStandardsAndRegulations/page/listTracking.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index 5a8984b4c..e7cd0744f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -712,6 +712,7 @@ export default { handleSelect() { this.selectModal = true this.handleSelectForm.standType = this.handleSelectForm.dataSource + this.clearLawBtn() this.searchLawBtn() }, saveInfo () { From 217a5eb09105f74448882bc2dfd32a670697b12f Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Sun, 14 Nov 2021 13:38:06 +0800 Subject: [PATCH 3/8] commit --- .../pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue index 53999e8fb..07dacb208 100644 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue @@ -227,7 +227,7 @@ v-model="standardSearchForm.lawId" clearable placeholder="根据编号查找" :maxlength="100" - @keyup.enter.native="handleSearchStandard"/> + @keyup.enter.native="getDomesticStandardTable"/> { // 动态设置表格高度 From 59b79aece35262157d967b86b5bf6dac442081e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 14 Nov 2021 14:02:13 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?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/xmpg2/step1-12.vue | 47 +++++++++++++-- .../pages/creatProcess/xmpg2/step10.vue | 49 +++++++++++++-- .../pages/creatProcess/xmpg2/step11.vue | 50 ++++++++++++++-- .../pages/creatProcess/xmpg2/step12.vue | 49 +++++++++++++-- .../pages/creatProcess/xmpg2/step6.vue | 60 ++++++++++++++----- .../pages/creatProcess/xmpg2/step7.vue | 51 +++++++++++++--- .../pages/creatProcess/xmpg2/step8.vue | 53 +++++++++++++--- .../pages/creatProcess/xmpg2/step9.vue | 49 +++++++++++++-- 8 files changed, 348 insertions(+), 60 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue index c04db49b6..4a2f6a388 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue @@ -43,11 +43,12 @@ @@ -190,6 +191,14 @@ label="责任人"> + +
@@ -292,6 +301,9 @@ export default { }, data() { return { + total: 0, + currentPage: 1, + pageSize: 20, active: "1", loading: false, // 当前流程类型(1待办/2已办) @@ -392,11 +404,36 @@ export default { this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + let dataChildren = [] + let dataListChildren = [] + this.listForm.dataList.forEach(item => { + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + this.dataList = dataListChildren + this.total = this.dataList.length; + // this.dataList = item.dataList; + // this.dataList.distributePerson = item.dataList[0].distributePerson; + // this.listForm.breakdownList = item.breakdownList; }); }, + // 分页 + handleCurrentChange(currentPage) { + this.currentPage = currentPage; + }, //驳回事件 beforeBack() { if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 955e5cb4e..041a1f3a3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -43,11 +43,12 @@ @@ -195,6 +196,14 @@ label="责任人"> + +
@@ -318,6 +327,9 @@ export default { }, data() { return { + total: 0, + currentPage: 1, + pageSize: 20, nodeList:[], drawerTitle:'', isTransfer: false, @@ -462,9 +474,30 @@ export default { this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + let dataChildren = [] + let dataListChildren = [] + this.listForm.dataList.forEach(item => { + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + this.dataList = dataListChildren + this.total = this.dataList.length; + // this.dataList = item.dataList; + // this.dataList.distributePerson = item.dataList[0].distributePerson; + // this.listForm.breakdownList = item.breakdownList; }); }, //驳回事件 @@ -511,7 +544,11 @@ export default { this.isSubmit = false; }, e => { }); - } + }, + // 分页 + handleCurrentChange(currentPage) { + this.currentPage = currentPage; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index a92c03698..bbfdd69d1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -43,11 +43,12 @@ @@ -195,6 +196,14 @@ label="责任人"> + +
@@ -316,6 +325,9 @@ export default { }, data() { return { + total: 0, + currentPage: 1, + pageSize: 20, nodeList:[], drawerTitle:'', isTransfer: false, @@ -455,15 +467,37 @@ export default { }, //动态表单读取 getFormFieldList(item) { + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + let dataChildren = [] + let dataListChildren = [] + this.listForm.dataList.forEach(item => { + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + this.dataList = dataListChildren + this.total = this.dataList.length; + // this.dataList = item.dataList; + // this.dataList.distributePerson = item.dataList[0].distributePerson; + // this.listForm.breakdownList = item.breakdownList; }); }, //提交事件 @@ -486,7 +520,11 @@ export default { this.isSubmit = false; }, e => { }); - } + }, + // 分页 + handleCurrentChange(currentPage) { + this.currentPage = currentPage; + }, }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 788621eb0..0efc5a1d9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -43,11 +43,12 @@ @@ -195,6 +196,14 @@ label="责任人"> + +
@@ -318,6 +327,9 @@ export default { }, data() { return { + total: 0, + currentPage: 1, + pageSize: 20, nodeList:[], drawerTitle:'', isTransfer: false, @@ -462,9 +474,30 @@ export default { this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + let dataChildren = [] + let dataListChildren = [] + this.listForm.dataList.forEach(item => { + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + this.dataList = dataListChildren + this.total = this.dataList.length; + // this.dataList = item.dataList; + // this.dataList.distributePerson = item.dataList[0].distributePerson; + // this.listForm.breakdownList = item.breakdownList; }); }, //驳回事件 @@ -510,7 +543,11 @@ export default { this.isSubmit = false; }, e => { }); - } + }, + // 分页 + handleCurrentChange(currentPage) { + this.currentPage = currentPage; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 3de61a2a1..a098e5bef 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -706,8 +706,6 @@ export default { //批量编辑确定按钮事件 saveBatchEditForm() { this.selectList = JSON.parse(localStorage.getItem("selectList")); - console.log("datalist", this.dataList); - console.log("select", this.selectList); this.dataList.forEach(item => { this.selectList.forEach(items => { if (item.id === items) { @@ -873,27 +871,59 @@ export default { }, //动态表单读取 getFormFieldList(item) { - console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { + let dataChildren = [] + let dataListChildren = [] this.listForm.prcNum = this.prcNum; this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; - // this.listForm.dataList = item.dataList; - this.dataList = this.listForm.dataList[0].children; - this.dataList.map(item => { - this.$set(item, "standName", this.listForm.dataList[0].standName); - this.$set(item, "standEnName", this.listForm.dataList[0].standEnName); - this.$set(item, "standYear", this.listForm.dataList[0].standYear); - this.$set(item, "standSort", this.listForm.dataList[0].standSort); - this.$set(item, "standNumber", this.listForm.dataList[0].standNumber); - }); - this.total = this.listForm.dataList[0].children.length; + this.listForm.dataList = item.dataList; + this.listForm.dataList.forEach(item => { + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + this.dataList = dataListChildren + this.total = this.dataList.length; } else { this.listForm = item.form; - this.dataList = item.form.dataList[0].children; - this.total = item.form.dataList[0].children.length; + let dataChildren = [] + let dataListChildren = [] + this.listForm.dataList.forEach(item => { + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + this.dataList = dataListChildren + this.total = this.dataList.length; + // this.dataList = item.form.dataList[0].children; + // this.total = item.form.dataList[0].children.length; } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 229c8a9ed..9a1d4bcef 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -43,11 +43,12 @@ @@ -195,6 +196,14 @@ label="责任人"> + +
@@ -318,6 +327,9 @@ export default { }, data() { return { + total: 0, + currentPage: 1, + pageSize: 20, nodeList:[], drawerTitle:'', isTransfer: false, @@ -389,7 +401,6 @@ export default { }, // 点击查看 handlePreview(item) { - console.log(item); let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { @@ -447,7 +458,6 @@ export default { taskIds: this.taskIds, pId: this.pId }).then(res => { - console.log(res.mesg); if (res) { const processForm = JSON.parse(res.mesg); this.getFormFieldList(processForm); @@ -464,9 +474,30 @@ export default { this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + let dataChildren = [] + let dataListChildren = [] + this.listForm.dataList.forEach(item => { + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + this.dataList = dataListChildren + this.total = this.dataList.length; + // this.dataList = item.dataList; + // this.dataList.distributePerson = item.dataList[0].distributePerson; + // this.listForm.breakdownList = item.breakdownList; }); }, //驳回事件 @@ -511,7 +542,11 @@ export default { } this.isSubmit = false; }); - } + }, + // 分页 + handleCurrentChange(currentPage) { + this.currentPage = currentPage; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 386a96dc9..604607676 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -43,11 +43,12 @@ @@ -193,6 +194,14 @@ label="责任人"> + +
@@ -316,6 +325,9 @@ export default { }, data() { return { + total: 0, + currentPage: 1, + pageSize: 20, nodeList:[], drawerTitle:'', isTransfer: false, @@ -460,9 +472,30 @@ export default { this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + let dataChildren = [] + let dataListChildren = [] + this.listForm.dataList.forEach(item => { + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + this.dataList = dataListChildren + this.total = this.dataList.length; + // this.dataList = item.dataList; + // this.dataList.distributePerson = item.dataList[0].distributePerson; + // this.listForm.breakdownList = item.breakdownList; }); }, //驳回事件 @@ -509,6 +542,10 @@ export default { }, e => { }); }, + // 分页 + handleCurrentChange(currentPage) { + this.currentPage = currentPage; + }, }, computed: { listNoDataText() { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index ee99d79fd..647699719 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -43,11 +43,12 @@ @@ -195,6 +196,14 @@ label="责任人"> + +
@@ -318,6 +327,9 @@ export default { }, data() { return { + total: 0, + currentPage: 1, + pageSize: 20, nodeList:[], drawerTitle:'', isTransfer: false, @@ -462,9 +474,30 @@ export default { this.listForm.prcName = this.prcName; this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; - this.dataList = item.dataList; - this.dataList.distributePerson = item.dataList[0].distributePerson; - this.listForm.breakdownList = item.breakdownList; + let dataChildren = [] + let dataListChildren = [] + this.listForm.dataList.forEach(item => { + item.children.forEach(items=> { + if(items.key === item.standId){ + this.$set(items, "standName", item.standName); + this.$set(items, "standEnName", item.standEnName); + this.$set(items, "standYear", item.standYear); + this.$set(items, "standSort", item.standSort); + this.$set(items, "standNumber", item.standNumber); + } + }) + }) + this.listForm.dataList.forEach(item => { + dataChildren.push(item.children) + }) + dataChildren.forEach((item,index) => { + dataListChildren = dataListChildren.concat(item) + }) + this.dataList = dataListChildren + this.total = this.dataList.length; + // this.dataList = item.dataList; + // this.dataList.distributePerson = item.dataList[0].distributePerson; + // this.listForm.breakdownList = item.breakdownList; }); }, //驳回事件 @@ -510,7 +543,11 @@ export default { this.isSubmit = false; }, e => { }); - } + }, + // 分页 + handleCurrentChange(currentPage) { + this.currentPage = currentPage; + }, }, computed: { listNoDataText() { From ee9c388759681340b15ce05eabef3295886b0d8c Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Sun, 14 Nov 2021 14:43:17 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/empennage/index.vue | 2 ++ src/pages/home2/components/navMenu/index.vue | 5 ++++- src/pages/home2/components/searchGroup/index.vue | 13 ++++++++----- src/pages/home2/components/todoList/index.vue | 2 ++ src/pages/home2/index.vue | 4 ++-- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index c0ebeee2f..180405eef 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -80,11 +80,13 @@ diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 8925d7ae5..14aefd24c 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1274,10 +1274,12 @@ export default { diff --git a/src/router/index.js b/src/router/index.js index a0c80586b..d279f17dc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1857,6 +1857,17 @@ const routes = [ requireAuth: true, title: '工作组', } + }, + // 企标制修订计划 + { + path: '/enterpriseStandardPlan', + name: 'enterpriseStandardPlan', + component: () => + import('@/pages/regulatoryRepository/enterpriseStandardPlan/index'), + meta: { + requireAuth: true, + title: '企标制修订计划', + } }, // 标准涉及项目 {