From 3d321d82df16121e1c21fb2113757e5a16de54a2 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp' into phyzasrs-erp
---
src/main/webapp/static/js/order/order.js | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index f333b04..ba669b9 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -62,7 +62,6 @@
{field: 'tel', align: 'center',title: '浠撳簱', hide: true},
{field: 'operMemb', align: 'center',title: '鍑哄叆搴撶被鍒�', hide: true},
{field: 'salesman', align: 'center',title: '閮ㄩ棬', hide: true},
-
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
request: {
@@ -130,8 +129,8 @@
layer.open({
type: 1,
title: false,
- area: '1460px',
- offset: [top + 'px', (left - 900 + $a.outerWidth()) + 'px'],
+ area: '1100px',
+ offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
fixed: false,
@@ -166,7 +165,9 @@
//{field: 'manu', title: '琛屽彿'},
{field: 'threeCode', title: '閿�鍞崟鍙�'},
{field: 'deadTime', title: '鑷敱椤�'},
- {field: 'processSts$', title: '宸ュ簭'}
+ {field: 'processSts$', title: '宸ュ簭'},
+ {field: 'specs', title: '瑙勬牸'},
+ //{field: 'itemNum', title: '琛屽敮涓�鏍囪瘑'}
]],
request: {
pageName: 'curr',
@@ -192,7 +193,6 @@
});
}
});
-
// 鏄剧ず琛ㄥ崟寮圭獥
function showEditModel(expTpe) {
@@ -306,7 +306,6 @@
},
size: ''
};
-
if (!isExpAdd) {
$.ajax({
url: baseUrl+"/order/detl/all/auth?orderId=" + expTpe.id,
--
Gitblit v1.9.1