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 | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 85b7514..595bedd 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -37,7 +37,7 @@
import { transform } from '@/util/fileTransform'
import printTemplate from './finishedProducter-print.vue'
import PrintJS from 'print-js'
-import { title } from 'process'
+ import { title } from 'process'
export default {
components: {
finishedProductInspectionAdd,
@@ -73,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',
@@ -99,6 +115,14 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text',
+ },
+ {
+ minWidth: '120',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
},
{
minWidth: '120',
@@ -164,11 +188,11 @@
},
],
toolbar: [
- {
+ /* {
text: '鏂板',
type: 'primary',
fun: this.addOrUpdateHandle
- },
+ }, */
{
text: '瀵煎嚭',
type: 'primary',
@@ -206,7 +230,6 @@
watch:{
printFormData(newVal){
if(newVal){
- // console.log("pData鍙樺寲--",newVal);
this.printFormData = newVal
}
}
@@ -218,10 +241,11 @@
PrintJS({
printable: "printRaw",
type: "html",
- maxWidth: 1000,
- // header: "浜у搧妫�娴嬫姤鍛�",
+ scanStyles: false,
+ maxWidth: 1200,
+ header: "浜у搧妫�娴嬫姤鍛�",
style:style,
- // scanStyles: false,
+ css:'./title.css',
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
orientation: 'portrait'
@@ -240,13 +264,11 @@
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: '鍙栨秷',
@@ -268,6 +290,8 @@
name: 'finishedProductForm',
query: {
id: row == null ? null : row.id,
+ },
+ params: {
resultVal: row == null ? null : row.result
}
})
--
Gitblit v1.9.3