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/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 908bc9b02..132551c8d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -16,7 +16,7 @@ class="label-input-form" label-width="210px" > -
+
@@ -49,14 +49,14 @@ 否 - + - + - + - + - + 是 否 - + - + { @@ -589,9 +589,9 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - this.qbfsForm.commentText = this.commentText - var json = Object.assign(this.qbfsForm, this.roleForm) - this.$http.get('lawss/activiti/startProcess', {type: '23'}, { + this.standardSearch.commentText = this.commentText + var json = Object.assign(this.standardSearch, this.roleForm) + this.$http.get('lawss/activiti/startProcess', {type: '24'}, { _this: this }, res => { if (res.ok) { @@ -624,8 +624,8 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - this.qbfsForm.commentText = this.commentText - var json = Object.assign(this.qbfsForm, this.roleForm) + this.standardSearch.commentText = this.commentText + var json = Object.assign(this.standardSearch, this.roleForm) this.$http.post('lawss/activiti/completeTask', { taskIds: res.data, userId : this.$store.getters.userInfo.userId, diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue index 30c7c4a51..e4355ac77 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue @@ -22,18 +22,18 @@ > - + - + @@ -309,11 +309,29 @@ export default { }, //流程驳回 beforeBack(){ - + this.isSubmit = true + this.qbfsForm.passFlag = '1' + this.qbfsForm.commentText = this.commentText + let json = JSON.stringify(this.qbfsForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); }, //流程提交 handleSubmit(){ this.isSubmit = true + this.qbfsForm.passFlag = '0' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue index 5a771a8ee..e39220c2f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue @@ -22,18 +22,18 @@ > - + - + @@ -191,14 +191,12 @@
@@ -250,8 +248,8 @@ export default { modalshowflag: false, // drawer开关 loading: false, qbfsForm:{ - entNumber: '', - cnName: '', + standCode: '', + standName: '', enName: '', entCategory: '', replaceNumber: '', @@ -268,8 +266,8 @@ export default { jgUser: "" }, formRules: { - jgUser: [ - {required: true, message: "请选择工作组成员", trigger: "change"} + reviewComments: [ + {required: true, message: "请输入评审意见", trigger: "change"} ], }, } @@ -323,23 +321,31 @@ export default { }, //流程提交 handleSubmit(){ - this.isSubmit = true - this.qbfsForm.commentText = this.commentText - let json = JSON.stringify(this.qbfsForm); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.$route.query.taskIds, - userId: this.$store.getters.userInfo.userId, - json: json, - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message) - this.$router.push('/processCenter') + this.$refs['qbfsForm'].validate((valid) => { + if(valid){ + this.isSubmit = true + this.qbfsForm.commentText = this.commentText + this.qbfsForm.presentPeople = this.$store.getters.userInfo.userName + this.qbfsForm.presentPeopleId = this.$store.getters.userInfo.userId + let json = JSON.stringify(this.qbfsForm); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + }else{ + this.$message.warning('请完善基础信息') } - this.isSubmit = false - }, e => { - }); + }) }, //转办事件 handleTransfer(){ diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue new file mode 100644 index 000000000..a69e73a26 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -0,0 +1,577 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue new file mode 100644 index 000000000..ef0fe56a1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue @@ -0,0 +1,602 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue new file mode 100644 index 000000000..c9a238d51 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue @@ -0,0 +1,602 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue new file mode 100644 index 000000000..6b17384ce --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -0,0 +1,602 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue index b7e8f2ff6..18b11c498 100644 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue @@ -71,10 +71,15 @@ prop="implTime" sortable="custom" align="center" - width="120" + width="155" label="实施日期"> + + + @@ -431,8 +443,12 @@ export default { handleSubmit() { this.$refs["zdrzbzORzchgxxmscForm"].validate((valid) => { if (valid) { + let infoTableDatas = [] + infoTableDatas = JSON.stringify(this.infoTableDatas) this.isSubmit = true; + localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas)) var json = this.json; + json.infoTableDatas = infoTableDatas json.commentText = this.commentText; json.responUserList = this.form.responUserList; json.responUserListName = this.form.responUserListName; diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue index 87fd916f2..8f2c63a09 100644 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue @@ -107,6 +107,12 @@ width="400" label="SOP时间超过法规时限的空档期的业务应对方案"> + + @@ -487,7 +493,14 @@ export default { } let data = JSON.parse(res.mesg) this.infoTableDatas = JSON.parse(data.infoTableDatas) - this.form.cid = data.cid + console.log('490',this.infoTableDatas) + for (let i = 0; i < this.infoTableDatas.length; i++) { + if (this.infoTableDatas[i].isRisk === "1"){ + this.infoTableDatas[i].isRiskShow = '是' + }else { + this.infoTableDatas[i].isRiskShow = '否' + } + } this.form.endTime = data.endTime this.form.cname = data.cname this.form.fjList = data.fjList diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue index e18dd9549..e9bfa7af1 100644 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue @@ -107,6 +107,12 @@ width="400" label="SOP时间超过法规时限的空档期的业务应对方案"> + + @@ -434,11 +440,25 @@ export default { this.$refs["zdrzbzORzchgxxmscForm"].validate((valid) => { if (valid) { this.isSubmit = true; + let infoTableDatas = [] + infoTableDatas = JSON.stringify(this.infoTableDatas) + localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas)) var json = this.json; + json.feedbackDept = this.feedbackDept + console.log('448',json.feedbackDept) json.commentText = this.commentText; + json.infoTableDatas = infoTableDatas json.responUserList = this.form.responUserList; json.responUserListName = this.form.responUserListName; json.introduce = false; + this.$http.postData("policy/activiti/enterIssue",{ + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + },{},res=> { + console.log('455',res) + this.isSubmit = false; + }); this.$http.post("lawss/activiti/completeTask", { json: JSON.stringify(json), taskId: this.taskIds, @@ -487,7 +507,14 @@ export default { } let data = JSON.parse(res.mesg) this.infoTableDatas = JSON.parse(data.infoTableDatas) - this.form.cid = data.cid + console.log('490',data) + for (let i = 0; i < this.infoTableDatas.length; i++) { + if (this.infoTableDatas[i].isRisk === "1"){ + this.infoTableDatas[i].isRiskShow = '是' + }else { + this.infoTableDatas[i].isRiskShow = '否' + } + } this.form.endTime = data.endTime this.form.cname = data.cname this.form.fjList = data.fjList diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 190ceff58..bd6066b13 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -1075,7 +1075,7 @@ export default { } }) } - else if(row.taskInfo === '法规认证部副总监批准'){ + else if(row.taskInfo === '法规认证部副总监审定'){ this.$router.push({ name: 'zdrzbzORzchgxxmscStep9', query: { @@ -1570,6 +1570,76 @@ export default { }) } break + case '24': + if (row.taskInfo === '标准法规部部长审核') { + this.$router.push({ + name: 'qbfzStep2', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '会签并填写意见') { + this.$router.push({ + name: 'qbfzStep3', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '起草人修改标准状态') { + this.$router.push({ + name: 'qbfzStep4', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if(row.taskInfo === '标准法规部部长审核1') { + this.$router.push({ + name: 'qbfzStep5', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + else if(row.taskInfo === '审定责任人审定') { + this.$router.push({ + name: 'qbfzStep6', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if(row.taskInfo === '批准负责人批准') { + this.$router.push({ + name: 'qbfzStep7', + query:{ + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), 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 @@