lion 2 years ago
parent 76d41022b2
commit 8c9dac453b

@ -34,6 +34,7 @@
"view-design": "^4.7.0", "view-design": "^4.7.0",
"vue": "2.6.10", "vue": "2.6.10",
"vue-count-to": "^1.0.13", "vue-count-to": "^1.0.13",
"vue-print-nb-jeecg": "^1.0.12",
"vue-router": "3.0.6", "vue-router": "3.0.6",
"vuedraggable": "^2.24.3", "vuedraggable": "^2.24.3",
"vuex": "3.1.0", "vuex": "3.1.0",

@ -81,7 +81,8 @@ import myMap from "@/components/XyMap"
Vue.component('my-map',myMap) Vue.component('my-map',myMap)
import afTableColumn from 'af-table-column' import afTableColumn from 'af-table-column'
Vue.component('af-table-column',afTableColumn) Vue.component('af-table-column',afTableColumn)
import Print from 'vue-print-nb-jeecg'
Vue.use(Print)
Vue.prototype.$integrateData = (target,value) => { Vue.prototype.$integrateData = (target,value) => {
for(let i in target){ for(let i in target){
if(target.hasOwnProperty(i) && value.hasOwnProperty(i)){ if(target.hasOwnProperty(i) && value.hasOwnProperty(i)){

@ -4,6 +4,7 @@
<div>当前登录人{{user.name}}</div> <div>当前登录人{{user.name}}</div>
<div class="chart-title"> <div class="chart-title">
<!-- <span>出入库统计</span> --> <!-- <span>出入库统计</span> -->
<!-- <el-select placeholder="请选择仓库" style="margin-right:10px"></el-select> -->
<el-date-picker @change="changeDate" v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" <el-date-picker @change="changeDate" v-model="dateRange" value-format="yyyy-MM-dd" type="daterange"
:picker-options="pickerOptions" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
align="right"> align="right">

@ -1,6 +1,6 @@
<template> <template>
<div class="printwrap"> <div class="printwrap">
<Modal v-model="isShow" width='70' title="打印" @on-ok='handlePrint'> <Modal v-model="isShow" width='70' title="打印">
<div id='printmodal' class='print' v-if="chukuType==='领用'"> <div id='printmodal' class='print' v-if="chukuType==='领用'">
<div class='printtitle'>苏州市河道管理处物资领用审批表</div> <div class='printtitle'>苏州市河道管理处物资领用审批表</div>
<div class="printtop"> <div class="printtop">
@ -85,7 +85,11 @@
</tr> </tr>
</table> </table>
</div> </div>
<template v-slot:footer>
<Button type="" style='margin-left:5px;margin-bottom:5px;' @click="isShow=false"></Button>
<Button v-if="chukuType==''" type="primary" v-print="'#printmodal'" style='margin-left:5px;margin-bottom:5px;'>打印</Button>
<Button v-if="chukuType==''" type="primary" v-print="'#printmodal1'" style='margin-left:5px;margin-bottom:5px;'>打印</Button>
</template>
</Modal> </Modal>
</div> </div>
</template> </template>
@ -132,6 +136,7 @@
this.mingxiList = res.id_outbounds_items_outbounds_id_relation this.mingxiList = res.id_outbounds_items_outbounds_id_relation
}, },
handlePrint() { handlePrint() {
console.log("123")
if(this.chukuType=='领用'){ if(this.chukuType=='领用'){
this.$Print('#printmodal'); this.$Print('#printmodal');
}else if(this.chukuType=='处置'){ }else if(this.chukuType=='处置'){
@ -161,7 +166,15 @@
} }
</script> </script>
<style scoped> <style scoped>
@media print {
@page {
size: auto;
}
body, html,div{
height: auto!important;
}
}
.print {} .print {}
.printtitle { .printtitle {

Loading…
Cancel
Save