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/processInspect/index.vue |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index 2f8ca18..2fddf58 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -56,12 +56,28 @@
                     column: [
                         {
                             minWidth: '120',
-                            prop: 'orderNumber',
-                            label: '璁㈠崟缂栧彿',
+                            prop: 'proInsNo',
+                            label: '杩囩▼妫�楠岀紪鍙�',
                             isTrue: true,
                             isSearch: true,
                             searchInfoType: 'text',
                             render: { fun: this.addOrUpdateHandle }
+                        },
+                        {
+                            minWidth: '120',
+                            prop: 'orderNumber',
+                            label: '璁㈠崟缂栧彿',
+                            isTrue: true,
+                            isSearch: true,
+                            searchInfoType: 'text'
+                        },
+                        {
+                            minWidth: '120',
+                            prop: 'materialCode',
+                            label: '浜у搧缂栧彿',
+                            isTrue: true,
+                            isSearch: true,
+                            searchInfoType: 'text'
                         },
                         {
                             minWidth: '120',
@@ -152,10 +168,10 @@
                         type: 'primary',
                         fun: this.addOrUpdateHandle
                     },
-                    {
-                        text: '瀵煎嚭',
-                        fun: this.exportExcel
-                    }
+                    // {
+                    //     text: '瀵煎嚭',
+                    //     fun: this.exportExcel
+                    // }
                     ],
                     operator: [{
                         text: '浣滃簾',
@@ -177,7 +193,6 @@
             exportExcel(){
                 let queryParam=this.$refs.processInspect.getQueryParam();
                 delete queryParam.criteria
-                console.log(queryParam);
                 exportProcessInsProduct(queryParam).then((res)=>{
                     transform(res)
                 })
@@ -202,8 +217,9 @@
 			addOrUpdateHandle(row) {
 				this.$router.push({
 					name: 'processInspectForm',
-					query: { id: row == null ? null : row.id,resultVal : row == null ? null : row.result },
-				})
+					query: { id: row == null ? null : row.id },
+                    params: { resultVal : row == null ? null : row.result }
+                })
 			},
             formatResult(row, column, cellValue){
                 if(cellValue != undefined || cellValue != null){

--
Gitblit v1.9.3