lion 5 months ago
parent a3a86a4e82
commit 784b1999c2

@ -19,7 +19,11 @@ export async function print(printJs, isLog, form, logContent) {
const regexField = /<field[^>]*>(.*?)<\/field>/g; const regexField = /<field[^>]*>(.*?)<\/field>/g;
let fieldMaths = [] let fieldMaths = []
let match; let match;
console.log("printStr",printStr)
if(!printStr){
window.alert("暂无打印模板")
return
}
while ((match = regexField.exec(printJs)) !== null) { while ((match = regexField.exec(printJs)) !== null) {
fieldMaths.push(match[0]); // 提取 <field> 之间的内容 fieldMaths.push(match[0]); // 提取 <field> 之间的内容
} }

@ -147,8 +147,8 @@
type="primary" type="primary"
size="small" size="small"
@click="showExport" @click="showExport"
>导出</el-button> >导出</el-button
>
<!-- <el-button <!-- <el-button
v-if="$route.path === '/flow/list/todo'" v-if="$route.path === '/flow/list/todo'"
icon="el-icon-edit" icon="el-icon-edit"
@ -556,6 +556,7 @@ import ListPopover from "./components/ListPopover.vue";
import MultiDeal from "./components/MultiDeal.vue" import MultiDeal from "./components/MultiDeal.vue"
import share from "./components/share.vue"; import share from "./components/share.vue";
import payMx from "./components/payMx.vue"; import payMx from "./components/payMx.vue";
import FieldExport from "./components/FieldExport.vue"; import FieldExport from "./components/FieldExport.vue";
import { departmentListNoAuth } from "@/api/common" import { departmentListNoAuth } from "@/api/common"
export default { export default {
@ -570,6 +571,7 @@ export default {
data() { data() {
return { return {
isShowFieldExport: false, isShowFieldExport: false,
todoTotal: [], todoTotal: [],
isShowMultiDeal: false, isShowMultiDeal: false,
multiDealFlows: [], multiDealFlows: [],
@ -716,7 +718,6 @@ export default {
}; };
}, },
methods: { methods: {
changeDatePicker(e){ changeDatePicker(e){
console.log(e) console.log(e)
if(e){ if(e){

Loading…
Cancel
Save