From e06313b6dba4774aef0924f342f13e8433f8d6f6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 01 十二月 2023 15:32:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/quality/processInspect/index.vue |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index b1b35e5..952ef6c 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -25,7 +25,7 @@
 	export default {
 		components: {
 			processInspectForm,
-            ttable
+            ttable,
 		},
 		data() {
 			return {
@@ -56,8 +56,8 @@
                     column: [
                         {
                             minWidth: '120',
-                            prop: 'orderNumber',
-                            label: '璁㈠崟缂栧彿',
+                            prop: 'proInsNo',
+                            label: '杩囩▼妫�楠岀紪鍙�',
                             isTrue: true,
                             isSearch: true,
                             searchInfoType: 'text',
@@ -65,6 +65,14 @@
                         },
                         {
                             minWidth: '120',
+                            prop: 'orderNumber',
+                            label: '璁㈠崟缂栧彿',
+                            isTrue: true,
+                            isSearch: true,
+                            searchInfoType: 'text'
+                        },
+                        {
+                            minWidth: '120',
                             prop: 'material',
                             label: '浜у搧鍚嶇О',
                             isTrue: true,

--
Gitblit v1.9.3