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/adjustOrder/adjustOrder.js | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/static/js/adjustOrder/adjustOrder.js b/src/main/webapp/static/js/adjustOrder/adjustOrder.js
index 70ba874..a5936e9 100644
--- a/src/main/webapp/static/js/adjustOrder/adjustOrder.js
+++ b/src/main/webapp/static/js/adjustOrder/adjustOrder.js
@@ -107,24 +107,22 @@
var offset = $a.offset();
var top = offset.top;
var left = offset.left;
- layer.open({
+ admin.open({
type: 1,
- title: false,
- area: '1000px',
- offset: [top + 'px', (left - 700 + $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+'/checkOrderDetl/list/auth',
+ elem: '#itemTable',
+ headers: { token: localStorage.getItem('token') },
+ url: baseUrl + '/checkOrderDetl/list/auth',
where: {
order_id: data.id
},
page: true,
+ height: '450px;',
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
@@ -134,14 +132,6 @@
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '鎵瑰彿'},
{field: 'diffQty', 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: '瑙勬牸'},
{field: 'status$', title: '鐘舵��'}
]],
@@ -160,10 +150,7 @@
response: {
statusCode: 200
},
- done: (res) => {
- if(res.code == 403){
- window.top.location.href = baseUrl+"/";
- }
+ done: function () {
$(layero).find('.layui-table-view').css('margin', '0');
},
size: ''
--
Gitblit v1.9.1