From 1789ce3650a2665b5abca7a3028611190d1983df Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 14 十二月 2023 09:45:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/quality/finishedProductInspection/index.vue | 51 ++++++++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue index afa576e..a009e25 100644 --- a/src/views/quality/finishedProductInspection/index.vue +++ b/src/views/quality/finishedProductInspection/index.vue @@ -84,6 +84,14 @@ }, { minWidth: '120', + prop: 'productNo', + label: '鎶ュ伐鍗曞彿', + isTrue: true, + isSearch: true, + searchInfoType: 'text' + }, + { + minWidth: '120', prop: 'orderNumber', label: '璁㈠崟鍙�', isTrue: true, @@ -107,6 +115,14 @@ isTrue: true, isSearch: true, searchInfoType: 'text', + }, + { + minWidth: '120', + prop: 'outBatchNo', + label: '鎵规鍙�', + isTrue: true, + isSearch: true, + searchInfoType: 'text' }, { minWidth: '120', @@ -172,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', @@ -214,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;}' ; @@ -249,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: '鍙栨秷', @@ -277,6 +276,8 @@ name: 'finishedProductForm', query: { id: row == null ? null : row.id, + }, + params: { resultVal: row == null ? null : row.result } }) -- Gitblit v1.9.3