From ad2437550eb0c8f3c3c8736df1a38a713f920ec2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 10:13:40 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/finishedProductInspection/index.vue | 45 ++++++++++++++++++---------------------------
1 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index ac81d80..b5a6c5a 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -84,8 +84,16 @@
},
{
minWidth: '120',
- prop: 'orderNumber',
+ prop: 'productNo',
label: '鎶ュ伐鍗曞彿',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'text'
+ },
+ {
+ minWidth: '120',
+ prop: 'orderNumber',
+ label: '璁㈠崟鍙�',
isTrue: true,
isSearch: true,
searchInfoType: 'text'
@@ -119,7 +127,7 @@
{
minWidth: '120',
prop: 'materialCode',
- label: '浜у搧缂栫爜',
+ label: '浜у搧缂栧彿',
isTrue: true,
isSearch: true,
searchInfoType: 'text'
@@ -180,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',
@@ -222,12 +213,14 @@
watch:{
printFormData(newVal){
if(newVal){
- // console.log("pData鍙樺寲--",newVal);
this.printFormData = newVal
}
}
},
methods: {
+ downloadProReport(){
+ this.$message.info("寮�鍙戜腑...")
+ },
//鎵撳嵃鎸夐挳
printFun() {
const style = '@page {margin: 10mm 5mm; margin-bottom: 0;margin-top:0;} ' +'@media print {.title{font-size:30pt;font-weight: 400;font-family: 榛戜綋;!important;}' ;
@@ -257,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: '鍙栨秷',
--
Gitblit v1.9.3