diff --git a/public/static/pdf/web/viewer.js b/public/static/pdf/web/viewer.js index befac4fdd..250fd0d42 100644 --- a/public/static/pdf/web/viewer.js +++ b/public/static/pdf/web/viewer.js @@ -6647,15 +6647,15 @@ var PDFPageView = function () { //cover.innerText = userInfo.uName + "," + userInfo.workNum; var defaultSettings = { watermark_txt: msg, - watermark_x: 0,//水印起始位置x轴坐标 + watermark_x: 50,//水印起始位置x轴坐标 watermark_y: 0,//水印起始位置Y轴坐标 watermark_rows: 10,//水印行数 - watermark_cols: 10,//水印列数 - watermark_x_space: 100,//水印x轴间隔 - watermark_y_space: 200,//水印y轴间隔 + watermark_cols: 3,//水印列数 + watermark_x_space: 30,//水印x轴间隔 + watermark_y_space: 100,//水印y轴间隔 watermark_color: 'rgba(192, 192, 192)',//水印字体颜色 - watermark_alpha: 0.4,//水印透明度 - watermark_fontsize: '56px',//水印字体大小 + watermark_alpha: 0.3,//水印透明度 + watermark_fontsize: '50px',//水印字体大小 watermark_font: '微软雅黑',//水印字体 watermark_width: 120,//水印宽度 watermark_height: 80,//水印长度 diff --git a/src/api/statisticsApi.js b/src/api/statisticsApi.js index 2fa1d3442..d82d71915 100644 --- a/src/api/statisticsApi.js +++ b/src/api/statisticsApi.js @@ -1,5 +1,7 @@ import axios from '@/common/axiosV2' + +/** 协会费用信息统计接口 */ // 获取所有统计数据 export function statisticsAll (data) { return axios({ @@ -12,7 +14,7 @@ export function statisticsAll (data) { export function queryStatistics (data) { return axios({ url: 'api/wgdCensusZ/wgd-assoc-cost/queryAllAssocCosts', - method: 'post', + method: 'get', params: data }) } @@ -21,7 +23,7 @@ export function queryStatistics (data) { export function queryStatistics (data) { return axios({ url: 'api/wgdCensusZ/wgd-assoc-cost/getAssocCostById', - method: 'post', + method: 'get', params: data }) } @@ -30,7 +32,7 @@ export function queryStatistics (data) { export function statisticsEdit (data) { return axios({ url: 'api/wgdCensusZ/wgd-assoc-cost/modAssocCost', - method: 'post', + method: 'put', params: data }) } @@ -42,18 +44,124 @@ export function statisticsAdd (data) { params: data }) } -// 单个数据删除 -export function delOnlyOne (data) { - return axios({ - url: 'api/wgdCensusZ/wgd-assoc-cost/delAssocCost', - method: 'get', - params: data - }) -} // 多数据删除 export function delMore (data) { return axios({ url: 'api/wgdCensusZ/wgd-assoc-cost/delAssocCosts', + method: 'delete', + params: data + }) +} +/** 参会费用信息统计 */ +// 查询 +export function meetAll (data) { + return axios({ + url: 'api/wgdCensusZ/wgd-meet-cost/queryAllMeetCosts', + method: 'get', + params: data + }) +} +// 编辑 +export function meetEdit (data) { + return axios({ + url: 'api/wgdCensusZ/wgd-meet-cost/modMeetCost', + method: 'put', + params: data + }) +} +// 新增 +export function meetAdd (data) { + return axios({ + url: 'api/wgdCensusZ/wgd-meet-cost/addMeetCost', + method: 'post', + params: data + }) +} +// 删除 +export function meetDel (data) { + return axios({ + url: 'api/wgdCensusZ/wgd-meet-cost/delMeetCosts', + method: 'delete', + params: data + }) +} +/** 参与外部标准制修订费用统计 */ +// 数据查询 +export function reviseAll (data) { + return axios({ + url: 'api/wgdCensusZ/wgd-ex-revise-cost/queryAllExReviseCosts', + method: 'get', + params: data + }) +} +// 编辑 +export function reviseEdit (data) { + return axios({ + url: 'api/wgdCensusZ/wgd-ex-revise-cost/modExReviseCost', + method: 'put', + params: data + }) +} +// 新增 +export function reviseAdd (data) { + return axios({ + url: 'api/wgdCensusZ/wgd-ex-revise-cost/addExReviseCost', + method: 'post', + params: data + }) +} +export function reviseDel (data) { + return axios({ + url: 'api/wgdCensusZ/wgd-ex-revise-cost/delExReviseCosts', + method: 'delete', + params: data + }) +} +/** 采购费用信息统计接口 */ +// 查询 +export function CgfysAll (data) { + return axios({ + url: 'api/wgdCensusLeo/wgd-cgfy/queryAllCgfys', + method: 'get', + params: data + }) +} +/*// 查询详情 +export function CgfyDetail(data) { + return axios({ + url: 'api/wgdCensusLeo/wgd-cgfy/getCgfyById', + method: 'get', + params: data + }) +}*/ +// 编辑接口 +export function CgfysEdit (data) { + return axios({ + url: 'api/wgdCensusLeo/wgd-cgfy/modCgfy', + method: 'get', + params: data + }) +} +// 新增接口 +export function CgfysAdd (data) { + return axios({ + url: 'api/wgdCensusLeo/wgd-cgfy/addCgfy', + method: 'get', + params: data + }) +} +// 单条删除 +export function CgfysDelOne (data) { + return axios({ + url: 'api/wgdCensusLeo/wgd-cgfy/delCgfy', + method: 'get', + params: data + }) +} +// 批量删除 +export function CgfysDelMore (data) { + return axios({ + url: 'api/wgdCensusLeo/wgd-cgfy/delCgfys', method: 'get', params: data }) diff --git a/src/pages/regulatoryRepository/dataStatis/index.vue b/src/pages/regulatoryRepository/dataStatis/index.vue index 1995d18cd..b40ef5269 100644 --- a/src/pages/regulatoryRepository/dataStatis/index.vue +++ b/src/pages/regulatoryRepository/dataStatis/index.vue @@ -2,19 +2,19 @@
- + - + - + - + - +
diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue index 205c00722..c3b483243 100644 --- a/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfMember.vue @@ -1,421 +1,636 @@ diff --git a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue index 28d40f8a0..0f39e58eb 100644 --- a/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue +++ b/src/pages/regulatoryRepository/dataStatis/page/listOfSociety.vue @@ -102,155 +102,291 @@ @pageSizeChange="pageSizeChange"/> - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 取消 - 提交 -
- - - - +
+ 取消 + 提交 +
+ @@ -279,49 +415,13 @@ export default { drawer: false, size: '600px', // 新增的集合 - formShowData: { - totalName: '', - branchName: '', - workName: '', - vipRole: '', - players: '', - standard: '', - standardLeader: '', - leader: '', - startTime: '', - thisTime: '', - costStandard: '', - cost: '', - lastTime: '', - costYears: '', - cost2017: '', - cost2018: '', - cost2019: '', - cost2020: '', - cost2021: '', - person: '', - partment: '', - nature: '', - state: '', - linkMan: '', - num: '', - email: '', - }, - dialogVisible1: false, - dialogVisible2: false, - // 文件导入 - formInlineOut: { - name: '', - num: '', - remarks: '' - }, - dialogVisible3: false, - + addForm: {}, // 新增，编辑框 drawerTitle: '', drawerTable: false, - + DrawerType: '', formRules: {}, + } }, @@ -337,6 +437,7 @@ export default { submit() { }, + addDrawerClose () {}, //删除方法 deleteDetail(index, rows) { }, diff --git a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue index df1fa0010..c7a6cdbcf 100644 --- a/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue +++ b/src/pages/regulatoryRepository/dataStatis/pages/attendCost.vue @@ -4,22 +4,28 @@ - + - + - - - + + + + + - 查询 + 查询 清空
- 新增 + 新增 导入 导出 批量删除 @@ -59,18 +65,18 @@
- + - - + + - + - + - + @@ -134,8 +144,8 @@
- 取消 - 提交 + 取消 + 提交
@@ -155,15 +165,16 @@