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/orderPakout/order.js | 85 +++++++++++++++++++++++++-----------------
1 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index bedb1f0..4f4ad51 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -43,12 +43,13 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
+ {field: 'itemName$', align: 'center', title: '鍑哄簱鍖哄煙', minWidth: 160, width: 160},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
]],
request: {
pageName: 'curr',
@@ -98,45 +99,33 @@
doModify(data.id, data.orderNo, 4);
} else if (layEvent === 'look') {
var $a = $(obj.tr).find('a[lay-event="look"]');
- 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+'/order/pakout/orderDetl/list/auth',
+ elem: '#itemTable',
+ headers: { token: localStorage.getItem('token') },
+ url: baseUrl + '/order/pakout/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: 'batch', title: '鎵瑰彿'},
- {field: 'anfme', title: '鏁伴噺'},
- {field: 'workQty', title: '浣滀笟鏁伴噺'},
- {field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
- // {field: 'unit', title: '鍗曚綅'},
- // {
- // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
- // return util.toDateString(d.createTime);
- // }, width: 180
- // },
- // {field: 'inQty', title: '宸插叆搴撻噺'},
- // {field: 'color', title: '棰滆壊'},
- {field: 'specs', 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',
@@ -173,6 +162,30 @@
success: function (layero, dIndex) {
$(layero).children('.layui-layer-content').css('overflow', 'visible');
var isExpAdd = !expTpe;
+ // 鍔犺浇鍖哄煙涓嬫媺鏁版嵁
+ $.ajax({
+ url: baseUrl + "/basAreas/list/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: { limit: 9999 },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var areaSelect = $(layero).find('select[name="itemName"]');
+ var html = '<option value="">璇烽�夋嫨鍖哄煙</option>';
+ var records = res.data.records || res.data;
+ for (var i = 0; i < records.length; i++) {
+ var selected = (expTpe && expTpe.itemName == records[i].id) ? ' selected' : '';
+ html += '<option value="' + records[i].id + '"' + selected + '>' + records[i].name + '</option>';
+ }
+ areaSelect.html(html);
+ form.render('select', 'editForm');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
// 鍥炴樉鏁版嵁
form.val('editForm', expTpe);
if (expTpe) {
@@ -204,6 +217,7 @@
orderId: Number(data.field.id),
docType: Number(data.field.docType),
orderNo: data.field.orderNo,
+ itemName: data.field.itemName ? Number(data.field.itemName) : null,
orderDetlPakoutList: nList
}),
contentType:'application/json;charset=UTF-8',
@@ -234,9 +248,10 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'matnr', title: '闆朵欢浠ｇ爜', width: 160},
+ {field: 'maktx', title: '闆朵欢鍚嶇О', width: 200},
+ // {field: 'batch', title: '鎵瑰彿', edit: true},
+ {field: 'standby1', title: '渚涘簲鍟嗕唬鐮�', edit: true},
{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},
--
Gitblit v1.9.1