From d48d54b4a7074ac2e7d0c898fb086f5acbf71fb0 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Fri, 23 Jul 2021 13:58:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E6=97=B6=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 16 ++++++++++------ .../pages/otherAddEit.vue | 15 ++++++++++----- .../pages/projectAddEit.vue | 13 ++++++++++--- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 385a6e235..69bb4a9e0 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -658,6 +658,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; import { mapGetters } from 'vuex' import { editDataInfo } from '@/api/unqualProcess' +import {interfaceUrl} from "@/sysConfig"; export default { name: 'ListOfStandardsAndRegulationsDetails', components: { @@ -1512,7 +1513,6 @@ export default { // 数据搜索 table select事件 sarAccessInfoSearchSelect (val) { this.selectedAccInfoSearchList = val - console.log(val) }, // 数据搜索 清单类型 table select事件 accessSarTypeSelect (selectData) { @@ -1531,8 +1531,13 @@ export default { }, // 点击 导出、全部导出按钮事件 exportAccessInfo (type) { - this.exportTestItemNameFlag = true - this.exportName = '' + if (this.sarAccessInfoListArry.length > 0) { + this.exportTestItemNameFlag = true + this.exportName = '' + }else { + this.$message.warning('请选择数据进行导出') + } + }, // 导出确定功能 exportTestItem () { @@ -1548,10 +1553,9 @@ export default { for (var accessInfo in exportList) { accIdAndrestype.push(exportList[accessInfo].id) } - window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames + const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName + window.open(exportURL) this.$message.success('导出信息成功') - } else { - this.$message.warning('当前没有需要导出的数据') } this.exportTestItemNameFlag = false }, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index bac9b5b5a..0ab7a1a5d 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -488,6 +488,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; import { mapGetters } from 'vuex' +import {interfaceUrl} from "@/sysConfig"; export default { name: 'OtherAddEit', components: { @@ -1284,8 +1285,12 @@ export default { }, // 点击 导出、全部导出按钮事件 exportAccessInfo (type) { - this.exportTestItemNameFlag = true - this.exportName = '' + if (this.sarAccessInfoListArry.length > 0) { + this.exportTestItemNameFlag = true + this.exportName = '' + }else { + this.$message.warning('请选择数据进行导出') + } }, // 导出确定功能 exportTestItem () { @@ -1301,10 +1306,10 @@ export default { for (var accessInfo in exportList) { accIdAndrestype.push(exportList[accessInfo].id) } - window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames + const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName + window.open(exportURL) + // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames this.$message.success('导出信息成功') - } else { - this.$message.warning('当前没有需要导出的数据') } this.exportTestItemNameFlag = false }, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 1825f39ed..d4970e303 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -488,6 +488,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import stand from "../../../config/pages/attributeCustom/components/stand"; import { mapGetters } from 'vuex' +import {interfaceUrl} from "@/sysConfig"; export default { name: 'OtherAddEit', components: { @@ -1285,8 +1286,12 @@ export default { }, // 点击 导出、全部导出按钮事件 exportAccessInfo (type) { - this.exportTestItemNameFlag = true - this.exportName = '' + if (this.sarAccessInfoListArry.length > 0) { + this.exportTestItemNameFlag = true + this.exportName = '' + }else { + this.$message.warning('请选择数据进行导出') + } }, // 导出确定功能 exportTestItem () { @@ -1302,7 +1307,9 @@ export default { for (var accessInfo in exportList) { accIdAndrestype.push(exportList[accessInfo].id) } - window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames + const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName + window.open(exportURL) + // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames this.$message.success('导出信息成功') } else { this.$message.warning('当前没有需要导出的数据') 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 2/5] =?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 @@
- 调取 - 批量删除 + 调取 + 批量删除 导出 From a5175c49675dc489d76a6905545a9b28ecea6045 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 23 Jul 2021 14:17:21 +0800 Subject: [PATCH 3/5] commit --- src/pages/config/pages/linkManage/index.vue | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index d240cc882..9c37984b4 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -8,11 +8,11 @@ @click="addLink" v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'" size="mini">新增 - 顺序调整 + + + + + { item.orderBy = index + 1 }) + let arr = [] + this.sortData.forEach(item => { + let json = {} + json.id = item.id + json.orderBy = item.orderBy + arr.push(json) + }) + this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => { + this.$message.success('保存成功') + }) } }) }, From eab5db8f2b336fa8dd213090081af301f7c3606e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 23 Jul 2021 15:05:02 +0800 Subject: [PATCH 4/5] commit --- src/pages/config/pages/linkManage/index.vue | 668 ++++++++++---------- 1 file changed, 336 insertions(+), 332 deletions(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 9c37984b4..89846f4df 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -1,352 +1,356 @@ From 7802ed69d6662877718a621f53649dca98bc0e31 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 15:07:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B5=81=E7=A8=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/linkManage/index.vue | 2 +- .../pages/creatProcess/bzqdfb/step1.vue | 85 ++++++++++--------- .../pages/creatProcess/xmpg/step1.vue | 55 ++++-------- 3 files changed, 63 insertions(+), 79 deletions(-) diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue index 89846f4df..f23611502 100644 --- a/src/pages/config/pages/linkManage/index.vue +++ b/src/pages/config/pages/linkManage/index.vue @@ -103,7 +103,7 @@