Commit be35de58 by qiaoyanqi

bug修改

parent e3dc1da8
......@@ -6,28 +6,23 @@ export default {
if (param.name.split('_action_gams')) {
actionName = param.name.split('_action_gams')[1];
}
let flag =
GMS.queryObject && GMS.queryObject.isReadOnly
? true
: compareData(GMS.oldBillData, bill.getBuillData());
if (flag) {
this.getOtherPage(actionName);
} else {
GMS.$hideContainer.$Modal.confirm({
title: "信息提示",
content: "信息发生变化,确认切换?",
onOk: () => {
if (Object.keys(param.param).length > 0) {
this.getOtherPage(actionName);
}
},
onCancel: () => {
GMS.$hideContainer.$Message["info"]({
content: "已取消",
});
},
});
}
let flag = compareData(GMS.oldBillData, bill.getBuillData());
if (flag) {
this.getOtherPage(actionName);
} else {
GMS.$hideContainer.$Modal.confirm({
title: "信息提示",
content: "信息发生变化,确认切换?",
onOk: () => {
this.getOtherPage(actionName);
},
onCancel: () => {
GMS.$hideContainer.$Message["info"]({
content: "已取消",
});
},
});
}
},
async getOtherPage(action) {
let page = GMS.queryObject.currentDataQueryConditionSet.page;
......@@ -56,7 +51,7 @@ export default {
} else if (action == "last") {
GMS.queryObject.index = data.data.count - 1;
}
let state = GMS.queryObject.isReadOnly?'readOnly':'';
let state = 'readOnly';
if (
window.osConfig.appOpenMode &&
window.osConfig.appOpenMode == "apploader"
......
<template>
<div>
<Modal v-model="modalShow" title="打印" @on-ok="printAsync">
<Modal v-model="modalShow" title="打印">
<span>打印模板</span>
<Select v-model="printTemplate" clearable>
<Option
......@@ -10,6 +10,10 @@
>{{ item.title }}</Option
>
</Select>
<div slot="footer">
<Button @click="modalShow = false">取消</Button>
<Button @click="printAsync" type="primary">确定</Button>
</div>
</Modal>
</div>
</template>
......@@ -41,6 +45,10 @@ export default {
},
methods: {
printAsync() {
if(!this.printTemplate){
GMS.$hideContainer.$Message.info('请选择打印模板');
return;
}
//打印接口
return new Promise((resolve, reject) => {
// let url=`/gms/bill/print/${this.billDefineName}/${this.billId}/${this.printTemplate}`;
......@@ -61,6 +69,7 @@ export default {
let href = window.URL.createObjectURL(blob); //创建下载的链接
downloadElement.href = href;
window.open(href)
this.modalShow = false;
// let routeData = GMS.routerManager.getRouter().resolve({
// path: "/showPrint",
// query: { src: href },
......
{
"name": "@rbc/runner-bill-form",
"version": "0.0.1",
"version": "0.0.2",
"scripts": {
"build": "vue-cli-service build",
"build-dev": "vue-cli-service build --mode development",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment