From 4c2ac1e9f5fee2eeb7f1c97ccd7b0532ca144232 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 04 十一月 2024 10:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/webapp/static/js/order/order.js | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index f6e6b01..7b6cbb3 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -48,6 +48,7 @@
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'shipName', align: 'center',title: '鍒跺崟浜�'},
+ {field: 'itemName', align: 'center',title: '浠撳簱'},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
@@ -105,7 +106,7 @@
layer.open({
type: 1,
title: false,
- area: '820px',
+ area: '1000px',
offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -125,7 +126,7 @@
{type: 'numbers'},
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'specs', title: '瑙勬牸'},
+ {field: 'specs', title: '瑙勬牸', width: 160},
{field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
--
Gitblit v1.9.1