From 87ee25bcc236b70b0d22b2ff121f9552959d4873 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 24 十一月 2023 13:04:57 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/quality/rawMaterial/index.vue |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index a547dd5..f9a611a 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -95,8 +95,8 @@
                 column: [
                     {
                         minWidth: '120',
-                        prop: 'code',
-                        label: '鍘熸潗鏂欑紪鐮�',
+                        prop: 'rawInsNo',
+                        label: '鍘熸潗鏂欐楠岀紪鍙�',
                         isTrue: true,
                         isSearch: true,
                         searchInfoType: 'text',
@@ -104,6 +104,14 @@
                     },
                     {
                         minWidth: '120',
+                        prop: 'code',
+                        label: '鍘熸潗鏂欑紪鐮�',
+                        isTrue: true,
+                        isSearch: true,
+                        searchInfoType: 'text'
+                    },
+                    {
+                        minWidth: '120',
                         prop: 'projectName',
                         label: '椤圭洰鍚嶇О',
                         isTrue: true,

--
Gitblit v1.9.3