From 74da433d63fbec07725bb55c29669c25de30c01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 23 Jul 2021 14:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 1889 ++++++++--------- .../pages/creatProcess/xmpg2/step5.vue | 78 +- .../pages/creatProcess/xmpg2/step6.vue | 579 ++++- .../pages/details.vue | 5 +- 4 files changed, 1538 insertions(+), 1013 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 379ce8cf2..5722564a6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1,785 +1,726 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 21631e4b2..0158e60ac 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -51,8 +51,6 @@ row-key= "id" height="70%" border - lazy - :load="load" @selection-change="selectStandChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" @@ -224,13 +222,6 @@ export default { }; }, methods: { - load(tree, treeNode, resolve) { - setTimeout(() => { - resolve( - this.listForm.children - ) - }, 1000) - }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -266,32 +257,50 @@ export default { }, //动态表单读取 getFormFieldList(item) { - this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)); - item.dataList.forEach(item => { - item.hasChildren = true - }) - 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; - this.listForm.children = item.breakdownList; - let children = [] - item.breakdownList.forEach( - item=>{ - let aa = { - id:item.id, - standId:'条款号: '+ item.itemsNum, - standName:'条款名称: '+ item.itemsName, + const listForm = JSON.parse(JSON.stringify(item)); + const { breakdownList, dataList } = listForm + listForm.prcNum = this.prcNum; + listForm.prcName = this.prcName; + this.listForm = listForm + listForm["id"] = item.id; + listForm.dataList = item.dataList; + dataList.forEach(stand => { + stand.hasChildren = true + console.log(stand); + const children = [] + breakdownList.forEach(childItem => { + if (stand.standId === childItem.standId) { + const childItemData = { + id: childItem.id, + standId: '条款号: '+ childItem.itemsNum, + standName: '条款名称: '+ childItem.itemsName } - children.push(aa) + children.push(childItemData) } - ) - this.listForm.children = children; - }); + }) + if (children.length) { + stand.children = children + stand.hasChildren = true + } + }) + + // dataList.distributePerson = item.dataList[0].distributePerson; + // listForm.breakdownList = item.breakdownList; + // listForm.children = item.breakdownList; + // let children = [] + // item.breakdownList.forEach( + // item=>{ + // let aa = { + // id:item.id, + // standId:'条款号: '+ item.itemsNum, + // standName:'条款名称: '+ item.itemsName, + // } + // children.push(aa) + // } + // ) + // this.listForm.children = children; + this.dataList = dataList + console.log(this.dataList) }, //保存事件 handleSave() { @@ -377,7 +386,8 @@ export default { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } }, - mounted() { + async mounted() { + // const res = await xx() this.processTable(); this.getData(); this.getTree(); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 60a93e5dc..5ba515f15 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -1,13 +1,586 @@ - + diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index ba58aec42..6ab697efe 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -30,10 +30,11 @@
- 调取 - 批量删除 + 调取 + 批量删除 导出