Commit bc619a43 authored by ganjingcun's avatar ganjingcun

new deck

parent c16b4950
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<el-form-item label="备选项" :label-width="formLabelWidth"> <el-form-item label="备选项" :label-width="formLabelWidth">
<el-checkbox v-model="checked">是否生成图片</el-checkbox> <el-checkbox v-model="checked">是否生成图片</el-checkbox>
<el-checkbox v-model="checked2">是否打印(会帮您调用打印程序)</el-checkbox>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -84,6 +85,7 @@ ...@@ -84,6 +85,7 @@
demo_url: "", demo_url: "",
demo1: [], demo1: [],
checked: false, checked: false,
checked2: false,
demo2: [] demo2: []
} }
}, },
...@@ -178,7 +180,8 @@ ...@@ -178,7 +180,8 @@
gameid: this.form.gameid, gameid: this.form.gameid,
date: date, date: date,
id: this.downloadPath.slice(7), id: this.downloadPath.slice(7),
img: this.checked img: this.checked,
print: this.checked2,
} }
var request = querystring.stringify(opt); var request = querystring.stringify(opt);
......
...@@ -31,6 +31,7 @@ const mutations = { ...@@ -31,6 +31,7 @@ const mutations = {
[types.GET_BILL_LIST] (state, {listData, pageTotal}) { [types.GET_BILL_LIST] (state, {listData, pageTotal}) {
for (var i in listData) { for (var i in listData) {
listData[i].amount = listData[i].amount.toFixed(2) listData[i].amount = listData[i].amount.toFixed(2)
} }
state.listData = listData state.listData = listData
state.pageTotal = pageTotal state.pageTotal = pageTotal
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -927,6 +927,7 @@ ...@@ -927,6 +927,7 @@
this.deck.event = getParameterByName('event'); this.deck.event = getParameterByName('event');
var gameid = getParameterByName('gameid'); var gameid = getParameterByName('gameid');
var img = getParameterByName('img'); var img = getParameterByName('img');
var print = getParameterByName('print');
if (gameid) { if (gameid) {
var gameid_arr = gameid.split(''); var gameid_arr = gameid.split('');
...@@ -996,7 +997,13 @@ ...@@ -996,7 +997,13 @@
link.href = dataUrl; link.href = dataUrl;
link.click(); link.click();
}); });
}, 1000) }, 100)
}
if (print && print === "true") {
setTimeout(function () {
window.print();
}, 500)
} }
}, (res) => { }, (res) => {
}) })
......
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