From 7cf2e143941e1548cc468992ada42106a27805a1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 09 十二月 2025 19:22:40 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/webapp/static/js/order/order.js | 48 ++++++++++++++++++++----------------------------
1 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 6345ea7..940bfa4 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -101,42 +101,34 @@
var offset = $a.offset();
var top = offset.top;
var left = offset.left;
- layer.open({
+
+ admin.open({
type: 1,
- title: false,
- area: '820px',
- offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
- shade: .01,
- shadeClose: true,
- fixed: false,
- content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
- success: function (layero) {
+ title: '鍗曟嵁鏄庣粏',
+ height: '450px',
+ content: $('#orderItem').html(),
+ area: '78%',
+ success: function (layero, dIndex) {
table.render({
- elem: '#lookSSXMTable',
- headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/orderDetl/list/auth',
+ elem: '#itemTable',
+ headers: { token: localStorage.getItem('token') },
+ url: baseUrl + '/orderDetl/list/auth',
where: {
order_id: data.id
},
page: true,
+ height: '450px;',
cellMinWidth: 100,
cols: [[
- {type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'specs', title: '瑙勬牸'},
- {field: 'batch', title: '鎵瑰彿'},
- {field: 'anfme', title: '寰呭畬缁撴暟閲�'},
- {field: 'qty', title: '寰呬笂鎶ユ暟閲�', style: 'font-weight: bold'},
- {field: 'workQty', title: '宸蹭笂鎶ユ暟閲�'},
- // {field: 'unit', title: '鍗曚綅'},
- // {
- // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
- // return util.toDateString(d.createTime);
- // }, width: 180
- // },
- // {field: 'inQty', title: '宸插叆搴撻噺'},
- // {field: 'color', title: '棰滆壊'}
+ { type: 'numbers' },
+ { field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160 },
+ { field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160 },
+ { field: 'standby1', title: '渚涘簲鍟嗙紪鐮�', width: 160 },
+ { field: 'batch', title: '鎵瑰彿' },
+ { field: 'anfme', title: '寰呭畬缁撴暟閲�' },
+ { field: 'workQty', title: '寰呬笂鎶ユ暟閲�' },
+ { field: 'qty', title: '宸插畬缁撴暟閲�', style: 'font-weight: bold' },
+ { field: 'specs', title: '瑙勬牸' }
]],
request: {
pageName: 'curr',
--
Gitblit v1.9.1