From 98b1dded34628a2f8a24424c4078b6c563d88194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 15 Mar 2022 10:31:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6bug=205?= =?UTF-8?q?1778?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 0d0d7d54e..5e53efff1 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -3,7 +3,7 @@
-
+
@@ -689,11 +689,11 @@ export default { this.$http.get('sys/EarlyWarning/ChangePermissions', { id: row.id, }, {}, res => { - this.pageConfig.page = 1 - this.pageConfig.newPolicyPage = 1 - this.pageConfig.oldPolicyPage = 1 - this.searchBtnClick() - this.getEarlyDate() + this.pageConfig.page = 1 + this.pageConfig.newPolicyPage = 1 + this.pageConfig.oldPolicyPage = 1 + this.searchBtnClick() + this.getEarlyDate() } ) }).catch(() => { @@ -1049,7 +1049,7 @@ export default { .content { padding-bottom: 10px; - height: calc(~'100% - 7%'); + height: calc(~'100% - 25%') ; /deep/ .el-button--mini { padding: 5px 7px; From 483ac77bad3afee6660d416cdf34f22b0306bcc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E6=96=B0=E4=BC=9F?= <1152856986@qq.com> Date: Tue, 15 Mar 2022 13:33:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 220 ++++++++++++++++++ .../dataStatis/miniPages/expendSubsidy.vue | 116 +++++++-- .../dataStatis/miniPages/inComeSubsidy.vue | 103 +++++++- .../dataStatis/page/listOfMeeting.vue | 106 ++++++++- .../dataStatis/page/listOfMember.vue | 106 ++++++++- .../dataStatis/page/listOfSociety.vue | 115 ++++++++- .../dataStatis/page/listOfStandard.vue | 105 ++++++++- .../dataStatis/pages/attendCost.vue | 104 ++++++++- .../dataStatis/pages/purchaseCost.vue | 102 +++++++- .../dataStatis/pages/reviseCost.vue | 105 ++++++++- .../dataStatis/pages/societyCost.vue | 105 ++++++++- .../dataStatis/pages/translateCost.vue | 101 +++++++- 12 files changed, 1341 insertions(+), 47 deletions(-) diff --git a/src/api/process.js b/src/api/process.js index 873a4600a..b582172ae 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -804,3 +804,223 @@ export function upFile(data) { data }) } +// 工作组协会信息数据统计导出 +export function exportAssocInfos(params) { + return axios({ + url: '/api/wgdCensusZ/wgd-assoc-info/exportAllAssocInfos', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组参与外部标准制修订信息统计导出 +export function exportAllWbxds(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-wbxd/exportAllWbxds', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组委员信息数据统计导出 +export function exportAllCommiInfos(params) { + return axios({ + url: '/api/wgdCensusZ/wgd-commi-info/exportAllCommiInfos', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组协会费用信息统计导出 +export function exportAllAssocCosts(params) { + return axios({ + url: '/api/wgdCensusZ/wgd-assoc-cost/exportAllAssocCosts', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组参与外部协会会议统计导出 +export function exportAllWbtjs(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-wbtj/exportAllWbtjs', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组参会费用信息统计导出 +export function exportAllMeetCosts(params) { + return axios({ + url: '/api/wgdCensusZ/wgd-meet-cost/exportAllMeetCosts', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组采购费用信息统计导出 +export function exportAllCgfys(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-cgfy/exportAllCgfys', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组参与外部标准制修订费用统计导出 +export function exportAllExReviseCost(params) { + return axios({ + url: '/api/wgdCensusZ/wgd-ex-revise-cost/exportAllExReviseCost', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组翻译费用信息统计导出 +export function exportAllFyfys(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-fyfy/exportAllFyfys', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组标准制修订补助资金收支统计收入表导出 +export function exportAllSrbs(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-srb/exportAllSrbs', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 工作组标准制修订补助资金收支统计支出表导出 +export function exportAllZcbs(params) { + return axios({ + url: '/api/wgdCensusLeo/wgd-zcb/exportAllZcbs', + params, + method: 'get', + responseType: 'blob', + header: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} +// 协会信息数据统计导入 +export function importAllAssocInfos(data) { + return axios({ + url: '/api/wgdCensusZ/wgd-assoc-info/importAllAssocInfos', + method: 'post', + data + }) +} +// 委员信息数据统计导入 +export function importAllCommiInfos(data) { + return axios({ + url: '/api/wgdCensusZ/wgd-commi-info/importAllCommiInfos', + method: 'post', + data + }) +} +// 参与外部协会会议统计导入 +export function importAllAllWbtjs(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-wbtj/importAllAllWbtjs', + method: 'post', + data + }) +} +// 参与外部标准制修订信息统计导入 +export function importAllWbxds(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-wbxd/importAllWbxds', + method: 'post', + data + }) +} +// 协会费用信息统计导入 +export function importAssocCosts(data) { + return axios({ + url: '/api/wgdCensusZ/wgd-assoc-cost/importAssocCosts', + method: 'post', + data + }) +} +//参会费用信息统计导入 +export function importMeetCost(data) { + return axios({ + url: '/api/wgdCensusZ/wgd-meet-cost/importMeetCost', + method: 'post', + data + }) +} +//参与外部标准制修订费用统计导入 +export function importExReviseCost(data) { + return axios({ + url: '/api/wgdCensusZ/wgd-ex-revise-cost/importExReviseCost', + method: 'post', + data + }) +} +//采购费用信息统计导入 +export function importAllCgfys(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-cgfy/importAllCgfys', + method: 'post', + data + }) +} +//翻译费用信息统计导入 +export function importAllFyfys(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-fyfy/importAllFyfys', + method: 'post', + data + }) +} +//标准制修订补助资金收支统计收入表导入 +export function importAllSrbs(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-srb/importAllSrbs', + method: 'post', + data + }) +} +//标准制修订补助资金收支统计支出表导入 +export function importAllZcbs(data) { + return axios({ + url: '/api/wgdCensusLeo/wgd-zcb/importAllZcbs', + method: 'post', + data + }) +} diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue index 8075b5417..e1e0fb8df 100644 --- a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue +++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue @@ -20,8 +20,8 @@
新增 - - + 导入 + 导出 批量删除
@@ -149,18 +149,37 @@
- - - + + + + +
将文件拖到此处,或点击上传
+
+
+ + + + + + + + + +
@@ -170,6 +189,7 @@ + + diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue new file mode 100644 index 000000000..fb3bc8f6b --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue @@ -0,0 +1,668 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue new file mode 100644 index 000000000..635047f5a --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue @@ -0,0 +1,689 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue new file mode 100644 index 000000000..2d813d39e --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue @@ -0,0 +1,2128 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue new file mode 100644 index 000000000..3acf6e9cb --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue @@ -0,0 +1,2128 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step13.vue b/src/pages/processCenter/pages/phone/qbrk-product/step13.vue new file mode 100644 index 000000000..e2b1010cd --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbrk-product/step13.vue @@ -0,0 +1,2354 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue new file mode 100644 index 000000000..e55f24ab3 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue @@ -0,0 +1,2060 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue new file mode 100644 index 000000000..9430bbcab --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue @@ -0,0 +1,2266 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue new file mode 100644 index 000000000..113c45a16 --- /dev/null +++ b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue @@ -0,0 +1,2128 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk/common/formList.vue index 7f90c0bdf..4ae929bf7 100644 --- a/src/pages/processCenter/pages/phone/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/phone/qbrk/common/formList.vue @@ -9,8 +9,8 @@ diff --git a/src/router/index.js b/src/router/index.js index bf4181225..09f5e4b45 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2825,6 +2825,66 @@ const routes = [ title: '企标制修订流程及企业标准库流程' } }, + { + path: '/phoneBussLibraryProduct4', + name: 'phoneBussLibraryProduct4', + component: () => import('@/pages/processCenter/pages/phone/qbrk-product/step4.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, + { + path: '/phoneBussLibraryProduct7', + name: 'phoneBussLibraryProduct7', + component: () => import('@/pages/processCenter/pages/phone/qbrk-product/step7.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, + { + path: '/phoneBussLibraryProduct8', + name: 'phoneBussLibraryProduct8', + component: () => import('@/pages/processCenter/pages/phone/qbrk-product/step8.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, + { + path: '/phoneBussLibraryProduct10', + name: 'phoneBussLibraryProduct10', + component: () => import('@/pages/processCenter/pages/phone/qbrk-product/step10.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, + { + path: '/phoneBussLibraryProduct12', + name: 'phoneBussLibraryProduct12', + component: () => import('@/pages/processCenter/pages/phone/qbrk-product/step12.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, + { + path: '/phoneBussLibraryProduct13', + name: 'phoneBussLibraryProduct13', + component: () => import('@/pages/processCenter/pages/phone/qbrk-product/step13.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, ] }, From 3d8783b87355e078a231ffc4788a71288351e6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 15 Mar 2022 14:29:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=2051799?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step1.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step2.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step4.vue | 2 +- src/pages/processCenter/pages/creatProcess/xmpg/step5.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue index f33135d35..077d97c5d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue @@ -360,7 +360,7 @@ export default { name: "OtherStandardDetails", params: { id: item.key || item.standId, - pageType: "INLAND_STAND" + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index ed674b6cf..8ae65380d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -879,7 +879,7 @@ export default { name: "OtherStandardDetails", params: { id: item.standId, - pageType: "INLAND_STAND" + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index bbd813598..c2f6b3bd4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -254,7 +254,7 @@ export default { name: "OtherStandardDetails", params: { id: item.standId, - pageType: "INLAND_STAND" + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 910f6e02e..f34c68eb4 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -658,7 +658,7 @@ export default { name: "OtherStandardDetails", params: { id: item.standId, - pageType: "INLAND_STAND" + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index 385cc43ac..6fc56793d 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -374,7 +374,7 @@ export default { name: "OtherStandardDetails", params: { id: item.key || item.standId, - pageType: "INLAND_STAND" + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank"); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index eb6d8fee4..4c03aa4ce 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -371,7 +371,7 @@ export default { name: "OtherStandardDetails", params: { id: item.key || item.standId, - pageType: "INLAND_STAND" + pageType: item.standType + '_STAND' } }); window.open(routeUrl.href, "_blank");