From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/finishedProductInspection/index.vue | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 3206e04..595bedd 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -16,12 +16,12 @@
top="10vh"
title="鎵撳嵃棰勮"
:visible.sync="printDialogVisible"
- width="65%">
+ width="70%">
<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 @click="()=>{printDialogVisible = false;printFormData=null}">鍙� 娑�</el-button>
<el-button type="primary" @click="printFun()">鎵� 鍗�</el-button>
</span>
</el-dialog>
@@ -35,8 +35,9 @@
import finishedProductInspectionAdd from './finishedProduct-form'
import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
import { transform } from '@/util/fileTransform'
- import printTemplate from './finishedProduct-print.vue'
+ import printTemplate from './finishedProducter-print.vue'
import PrintJS from 'print-js'
+ import { title } from 'process'
export default {
components: {
finishedProductInspectionAdd,
@@ -72,14 +73,30 @@
data: [],
// 鏍囬
column: [
+ {
+ minWidth: '120',
+ prop: 'finInsNo',
+ label: '浜у搧妫�楠岀紪鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text',
+ render: { fun: this.addOrUpdateHandle }
+ },
+ {
+ minWidth: '120',
+ prop: 'productNo',
+ label: '鎶ュ伐鍗曞彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
{
minWidth: '120',
prop: 'orderNumber',
label: '璁㈠崟鍙�',
isTrue: true,
isSearch: true,
- searchInfoType: 'text',
- render: { fun: this.addOrUpdateHandle }
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -98,6 +115,14 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
+ },
+ {
+ minWidth: '120',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -163,11 +188,11 @@
},
],
toolbar: [
- {
+ /* {
text: '鏂板',
type: 'primary',
fun: this.addOrUpdateHandle
- },
+ }, */
{
text: '瀵煎嚭',
type: 'primary',
@@ -210,48 +235,40 @@
}
},
methods: {
- //鏌ョ湅鎶ュ憡鎸夐挳
- // showPrint(row){
- // queryById(row.id).then(res=>{
- // console.log(res);
- // this.printFormData = res.data.data
- // this.printDialogVisible = true
- // })
- // .catch(error=>{
- // console.log(error);
- // })
- // },
//鎵撳嵃鎸夐挳
printFun() {
- this.printDialogVisible = false;
+ const style = '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} ' +'@media print {.title{font-size:30pt;font-weight: 400;font-family: 榛戜綋;!important;}' ;
PrintJS({
printable: "printRaw",
type: "html",
- maxWidth: 700,
- style: '@page {margin: 0 5mm}',
+ scanStyles: false,
+ maxWidth: 1200,
+ header: "浜у搧妫�娴嬫姤鍛�",
+ style:style,
+ css:'./title.css',
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
orientation: 'portrait'
});
},
+ //鏌ョ湅鎶ュ憡鎸夐挳
showPrint(row){
queryById(row.id).then(res=>{
this.printFormData = res.data.data
+ this.printFormData.createTime = row.createTime
+ this.printFormData.updateTime = row.updateTime
this.printDialogVisible = true
}).catch(error=>{
- console.log(error);
})
},
exportExcel(){
let queryParam=this.$refs.finishedProduct.getQueryParam();
delete queryParam.criteria
- console.log(queryParam);
exportExaminationProducts(queryParam).then((res)=>{
transform(res)
})
},
deleteHandle(row){
- console.log(row.id)
this.$confirm('纭鍒犻櫎璇ユ暟鎹悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -273,6 +290,8 @@
name: 'finishedProductForm',
query: {
id: row == null ? null : row.id,
+ },
+ params: {
resultVal: row == null ? null : row.result
}
})
--
Gitblit v1.9.3