158ed347 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents cc7f71b9 5d58e4ef
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-09 14:32:38
* @LastEditTime: 2023-09-01 15:10:55
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -166,16 +166,16 @@ export function judgeUserTaskPermission (params) {
})
}
/**
* @description: 获取申请书数据
* @description: 打印申请书
* @param {*} data
* @author: renchao
*/
export function getPrintApplicationInfo (data) {
export function getPrintApplicationForm (bsmSldy) {
return request({
url: SERVER.SERVERAPI + '/rest/business/workFlow/getPrintApplicationInfo',
method: 'post',
data
url: SERVER.SERVERAPI + '/rest/ywbl/print/getPrintApplicationForm?bsmSldy=' + bsmSldy,
method: 'get'
})
}
......
/*
* @Description:workFramezu.vue组件的方法 头部按钮弹框方法
* @Autor: miaofang
* @LastEditTime: 2023-08-30 16:15:41
* @LastEditTime: 2023-09-01 15:12:48
*/
import { getPrintTemplateByCode } from "@/api/print";
import { getQllxByBdcdyid } from "@/api/djbDetail.js";
......@@ -14,7 +14,7 @@ import {
completeTask,
getNextLinkInfo,
getWorkFlowImage,
getPrintApplicationInfo,
getPrintApplicationForm,
unClaimTask
} from "@/api/workFlow.js";
export default {
......@@ -145,7 +145,7 @@ export default {
//根据编号获取对应信息
getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
if (res.code == 200) {
getPrintApplicationInfo(this.currentSelectProps).then(infoRes => {
getPrintApplicationForm(this.currentSelectProps.bsmSldy).then(infoRes => {
if (infoRes.code == 200) {
//打开模板设计
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
......
......@@ -12,7 +12,7 @@ import {
completeTask,
getNextLinkInfo,
getWorkFlowImage,
getPrintApplicationInfo,
getPrintApplicationForm,
deleteFlow,
unClaimTask,
getZdInfo
......@@ -131,7 +131,7 @@ export default {
//根据编号获取对应信息
getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
if (res.code == 200) {
getPrintApplicationInfo(this.currentSelectProps).then(infoRes => {
getPrintApplicationForm(this.currentSelectProps.bsmSldy).then(infoRes => {
if (infoRes.code == 200) {
//打开模板设计
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
......