From 4ad1f324ab1fd2b51504afc00b43b4ee40f029c2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 二月 2025 09:40:03 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/order/order.js |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index c00e96f..532fc96 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -245,10 +245,10 @@
                         cellMinWidth: 100,
                         cols: [[
                             {type: 'numbers'},
-                            {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+                            {field: 'matnr', title: '瑙勬牸', width: 160},
                             {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
                             {field: 'batch', title: '绠卞彿'},
-                            {field: 'anfme', title: '鏈ㄧ涓摐绠旀暟閲�'},
+                            {field: 'anfme', title: '鏁伴噺'},
                             // {field: 'workQty', title: '浣滀笟鏁伴噺'},
 
                             // {field: 'unit', title: '鍗曚綅'},
@@ -259,7 +259,7 @@
                             // },
                             // {field: 'inQty', title: '宸插叆搴撻噺'},
                             // {field: 'color', title: '棰滆壊'},
-                            {field: 'specs', title: '瑙勬牸'},
+                            {field: 'specs', title: '鎺ュご'},
                             {field: 'qty$', title: '鐘舵��', style: 'font-weight: bold'},
                             {field: 'source$', title: '鏄惁纭', style: 'font-weight: bold'}
                         ]],
@@ -359,10 +359,10 @@
                     cellMinWidth: 100,
                     cols: [[
                         {type: 'numbers', title: '#'},
-                        {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+                        {field: 'matnr', title: '瑙勬牸', width: 160},
                         {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
                         {field: 'batch', title: '绠卞彿', edit: true},
-                        {field: 'specs', title: '瑙勬牸'},
+                        {field: 'specs', title: '鎺ュご'},
                         {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
                         {field: 'workQty', title: '浣滀笟鏁伴噺',  minWidth: 100, width: 100},
                         // {field: 'unit', title: '鍗曚綅', width: 80},
@@ -709,12 +709,13 @@
                                     {field: 'title', title: '鍟嗗搧', align: 'center', width: 350},
                                     // {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
                                     {field: 'batch', title: '绠卞彿', align: 'center'},
-                                    {field: 'model', title: '鎵规', align: 'center'},
-                                    {field: 'specs', title: '瑙勬牸', align: 'center'},
-                                    {field: 'brand', title: '鏈ㄧ绫诲瀷', align: 'center'},
+                                    {field: 'model', title: '鍗峰彿', align: 'center', hide: false},
+                                    {field: 'specs', title: '鎺ュご', align: 'center'},
+                                    // {field: 'brand', title: '鏈ㄧ绫诲瀷', align: 'center'},
+                                    {field: 'brand$', title: '鏈ㄧ绫诲瀷', align: 'center'},
                                     {field: 'zpallet', title: '鎵樼洏鐮�', align: 'center'},
-                                    {field: 'anfme', title: '鏈ㄧ涓摐绠旀暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
-                                    {field: 'count', title: '鏈ㄧ涓摐绠旀暟閲�', align: 'center', width: 90, style: 'font-weight: bold'},
+                                    {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
+                                    {field: 'count', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
                                     {field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
                                     {field: 'tkType$', title: 'TK鏍囪', align: 'center', width: 100},
                                     // {field: 'staNos', align: 'center', title: '鍑哄簱绔�', merge: ['locNo'], templet: '#tbBasicTbStaNos'},

--
Gitblit v1.9.1