From 5fcfed0c9e6dac85f680c705c9b20abad79e1324 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期二, 19 十二月 2023 17:33:05 +0800
Subject: [PATCH] modified: src/const/website.js new file: src/page/PackingLedgerDetails/index.vue modified: src/router/page/index.js modified: src/views/plan/manufacturingorder/index.vue modified: src/views/quality/Packaging_ledger/index.vue modified: vue.config.js
---
src/views/quality/finishedProductInspection/index.vue | 84 +++++++++++++++++++++--------------------
1 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 4eb4799..b5a6c5a 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -37,6 +37,7 @@
import { transform } from '@/util/fileTransform'
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',
@@ -101,8 +118,16 @@
},
{
minWidth: '120',
+ prop: 'outBatchNo',
+ label: '鎵规鍙�',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
prop: 'materialCode',
- label: '浜у搧缂栫爜',
+ label: '浜у搧缂栧彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text'
@@ -163,30 +188,13 @@
},
],
toolbar: [
- {
- text: '鏂板',
- type: 'primary',
- fun: this.addOrUpdateHandle
- },
- {
- text: '瀵煎嚭',
- type: 'primary',
- fun: this.exportExcel
- }
+ {
+ text: '涓嬭浇妫�楠屾姤鍛�',
+ type: 'primary',
+ fun: this.downloadProReport
+ }
],
operator: [{
- text: '鎵撳嵃',
- type: 'text',
- size: 'small',
- fun: this.showPrint,
- show: {
- val: [
- '1',
- '0'
- ],
- key: 'result'
- }
- },{
text: '浣滃簾',
type: 'text',
size: 'small',
@@ -205,31 +213,25 @@
watch:{
printFormData(newVal){
if(newVal){
- // console.log("pData鍙樺寲--",newVal);
this.printFormData = newVal
}
}
},
methods: {
- closedown(){
- // this.printFormData = []
- this.printDialogVisible = false;
+ downloadProReport(){
+ this.$message.info("寮�鍙戜腑...")
},
//鎵撳嵃鎸夐挳
printFun() {
- const printSettings = {
- paper: {
- width: 827, // A4绾哥殑瀹藉害锛堝崟浣嶏細鍍忕礌锛�
- height: 595, // A4绾哥殑楂樺害锛堝崟浣嶏細鍍忕礌锛�
- orientation: 'portrait', // 绔栧悜鎵撳嵃
- }}
-
+ 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: 1000,
- printSettings,
- style: '@page {margin: 2.0mm 2.0mm;size:A4;}',
+ scanStyles: false,
+ maxWidth: 1200,
+ header: "浜у搧妫�娴嬫姤鍛�",
+ style:style,
+ css:'./title.css',
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
orientation: 'portrait'
@@ -248,13 +250,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: '鍙栨秷',
@@ -276,6 +276,8 @@
name: 'finishedProductForm',
query: {
id: row == null ? null : row.id,
+ },
+ params: {
resultVal: row == null ? null : row.result
}
})
--
Gitblit v1.9.3