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 |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index fdc05d8..2fddf58 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -20,11 +20,12 @@
     import ttable from '@/views/common/ztt-table.vue'
     import * as fecha from 'element-ui/lib/utils/date'
 	import processInspectForm from './processInspect-form'
-    import { page,deleteById } from '@/api/quality/processInspect'
+    import { transform } from '@/util/fileTransform'
+    import { page,deleteById,exportProcessInsProduct } from '@/api/quality/processInspect'
 	export default {
 		components: {
 			processInspectForm,
-            ttable
+            ttable,
 		},
 		data() {
 			return {
@@ -55,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',
@@ -151,9 +168,10 @@
                         type: 'primary',
                         fun: this.addOrUpdateHandle
                     },
-                    {
-                        text: '瀵煎嚭',
-                    }
+                    // {
+                    //     text: '瀵煎嚭',
+                    //     fun: this.exportExcel
+                    // }
                     ],
                     operator: [{
                         text: '浣滃簾',
@@ -172,6 +190,13 @@
 		},
 		created() { },
 		methods: {
+            exportExcel(){
+                let queryParam=this.$refs.processInspect.getQueryParam();
+                delete queryParam.criteria
+                exportProcessInsProduct(queryParam).then((res)=>{
+                    transform(res)
+                })
+            },
 			deleteHandle(row){
 				this.$confirm('纭鍒犻櫎璇ユ暟鎹悧锛�', '鎻愮ず', {
 				confirmButtonText: '纭畾',
@@ -192,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