Merge branch 'dev'
Showing
3 changed files
with
11 additions
and
11 deletions
1 | /* | 1 | /* |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-08-09 14:32:38 | 4 | * @LastEditTime: 2023-09-01 15:10:55 |
5 | */ | 5 | */ |
6 | import request from '@/utils/request' | 6 | import request from '@/utils/request' |
7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) | 7 | let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) |
... | @@ -166,16 +166,16 @@ export function judgeUserTaskPermission (params) { | ... | @@ -166,16 +166,16 @@ export function judgeUserTaskPermission (params) { |
166 | }) | 166 | }) |
167 | } | 167 | } |
168 | 168 | ||
169 | |||
169 | /** | 170 | /** |
170 | * @description: 获取申请书数据 | 171 | * @description: 打印申请书 |
171 | * @param {*} data | 172 | * @param {*} data |
172 | * @author: renchao | 173 | * @author: renchao |
173 | */ | 174 | */ |
174 | export function getPrintApplicationInfo (data) { | 175 | export function getPrintApplicationForm (bsmSldy) { |
175 | return request({ | 176 | return request({ |
176 | url: SERVER.SERVERAPI + '/rest/business/workFlow/getPrintApplicationInfo', | 177 | url: SERVER.SERVERAPI + '/rest/ywbl/print/getPrintApplicationForm?bsmSldy=' + bsmSldy, |
177 | method: 'post', | 178 | method: 'get' |
178 | data | ||
179 | }) | 179 | }) |
180 | } | 180 | } |
181 | 181 | ... | ... |
1 | /* | 1 | /* |
2 | * @Description:workFramezu.vue组件的方法 头部按钮弹框方法 | 2 | * @Description:workFramezu.vue组件的方法 头部按钮弹框方法 |
3 | * @Autor: miaofang | 3 | * @Autor: miaofang |
4 | * @LastEditTime: 2023-08-30 16:15:41 | 4 | * @LastEditTime: 2023-09-01 15:12:48 |
5 | */ | 5 | */ |
6 | import { getPrintTemplateByCode } from "@/api/print"; | 6 | import { getPrintTemplateByCode } from "@/api/print"; |
7 | import { getQllxByBdcdyid } from "@/api/djbDetail.js"; | 7 | import { getQllxByBdcdyid } from "@/api/djbDetail.js"; |
... | @@ -14,7 +14,7 @@ import { | ... | @@ -14,7 +14,7 @@ import { |
14 | completeTask, | 14 | completeTask, |
15 | getNextLinkInfo, | 15 | getNextLinkInfo, |
16 | getWorkFlowImage, | 16 | getWorkFlowImage, |
17 | getPrintApplicationInfo, | 17 | getPrintApplicationForm, |
18 | unClaimTask | 18 | unClaimTask |
19 | } from "@/api/workFlow.js"; | 19 | } from "@/api/workFlow.js"; |
20 | export default { | 20 | export default { |
... | @@ -145,7 +145,7 @@ export default { | ... | @@ -145,7 +145,7 @@ export default { |
145 | //根据编号获取对应信息 | 145 | //根据编号获取对应信息 |
146 | getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => { | 146 | getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => { |
147 | if (res.code == 200) { | 147 | if (res.code == 200) { |
148 | getPrintApplicationInfo(this.currentSelectProps).then(infoRes => { | 148 | getPrintApplicationForm(this.currentSelectProps.bsmSldy).then(infoRes => { |
149 | if (infoRes.code == 200) { | 149 | if (infoRes.code == 200) { |
150 | //打开模板设计 | 150 | //打开模板设计 |
151 | let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); | 151 | let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); | ... | ... |
... | @@ -12,7 +12,7 @@ import { | ... | @@ -12,7 +12,7 @@ import { |
12 | completeTask, | 12 | completeTask, |
13 | getNextLinkInfo, | 13 | getNextLinkInfo, |
14 | getWorkFlowImage, | 14 | getWorkFlowImage, |
15 | getPrintApplicationInfo, | 15 | getPrintApplicationForm, |
16 | deleteFlow, | 16 | deleteFlow, |
17 | unClaimTask, | 17 | unClaimTask, |
18 | getZdInfo | 18 | getZdInfo |
... | @@ -131,7 +131,7 @@ export default { | ... | @@ -131,7 +131,7 @@ export default { |
131 | //根据编号获取对应信息 | 131 | //根据编号获取对应信息 |
132 | getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => { | 132 | getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => { |
133 | if (res.code == 200) { | 133 | if (res.code == 200) { |
134 | getPrintApplicationInfo(this.currentSelectProps).then(infoRes => { | 134 | getPrintApplicationForm(this.currentSelectProps.bsmSldy).then(infoRes => { |
135 | if (infoRes.code == 200) { | 135 | if (infoRes.code == 200) { |
136 | //打开模板设计 | 136 | //打开模板设计 |
137 | let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); | 137 | let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM')); | ... | ... |
-
Please register or sign in to post a comment