From 5710f6d9a5ac5998d8368bec99b41c58fa3c4ab2 Mon Sep 17 00:00:00 2001
From: 86134 <aa>
Date: 星期四, 09 十一月 2023 09:21:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/index.vue | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 3647ffc..7465498 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -12,6 +12,19 @@
<template #toolbar></template>
</ttable>
</basic-container>
+ <el-dialog
+ top="10vh"
+ title="鎵撳嵃棰勮"
+ :visible.sync="printDialogVisible"
+ width="65%">
+ <div style="width:100%;height: 60vh;overflow-y: scroll;">
+ <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="()=>{printDialogVisible = false;this.printFormData=null}">鍙� 娑�</el-button>
+ <el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
+ </span>
+ </el-dialog>
</div>
</div>
</template>
@@ -20,15 +33,20 @@
import ttable from '@/views/common/ztt-table.vue'
import * as fecha from 'element-ui/lib/utils/date'
import finishedProductInspectionAdd from './finishedProduct-form'
- import { page,deletePro,exportExaminationProducts } from '@/api/quality/finishedProduct'
+ import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
import { transform } from '@/util/fileTransform'
+ import printTemplate from './finishedProduct-print.vue'
+ import PrintJS from 'print-js'
export default {
components: {
finishedProductInspectionAdd,
- ttable
+ ttable,
+ printTemplate
},
data() {
return {
+ printFormData: null,
+ printDialogVisible: false,
result:[{label:'鍏ㄩ儴',value: ''},{label:'鍚堟牸',value: '1'},{label:'涓嶅悎鏍�',value: '0'}],
type: [1],
prelang: 'finishedProduct',
@@ -160,6 +178,7 @@
text: '鎵撳嵃',
type: 'text',
size: 'small',
+ fun: this.showPrint
},{
text: '浣滃簾',
type: 'text',
@@ -177,6 +196,27 @@
},
created() { },
methods: {
+ //鎵撳嵃鎸夐挳
+ printFun() {
+ this.printDialogVisible = false;
+ PrintJS({
+ printable: "printRaw",
+ type: "html",
+ maxWidth: 700,
+ style: '@page {margin: 0 5mm}',
+ targetStyles: ["*"],
+ ignoreElements: ["no-ignore"],
+ orientation: 'portrait'
+ });
+ },
+ showPrint(row){
+ queryById(row.id).then(res=>{
+ console.log(res);
+ this.printDialogVisible = true
+ }).catch(error=>{
+ console.log(error);
+ })
+ },
exportExcel(){
console.log("============");
let queryParam=this.$refs.finishedProduct.getQueryParam();
--
Gitblit v1.9.3