From e34c002fefc989c22c69918319a55394e72e50d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 十二月 2023 09:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/webapp/static/js/picking/picking.js | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index 3ec3f59..553fb28 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -26,7 +26,7 @@
// {type: 'checkbox'}
{type: 'numbers'}
,{field: 'wrkNo', align: 'center',title: 'id', hide:true}
- ,{field: 'docNum',title: '鎷ｈ揣鍗曞彿' , templet: '#orderNoTpl'}
+ ,{field: 'docNum',title: '鎷ｈ揣鍗曞彿' }
,{align: 'center', title: '浜岀淮鐮�', toolbar: '#operate', width: 200 , hide:true}
,{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160}
,{field: 'status$', align: 'center',title: '鐘舵��'}
@@ -59,6 +59,14 @@
}
pageCurr=curr;
limit();
+
+ var index = -1;
+ $("[data-field='status$']").children().each(function () {
+ index++;
+ if ($(this).text() === '鏈嚭搴�') {
+ $('tr').eq(index).css("color", 'red');
+ }
+ });
}
});
@@ -97,18 +105,20 @@
type: 1,
title: false,
area: '1200px',
- offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
+ offset: [top + 'px', (left - 450 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
fixed: false,
content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
success: function (layero) {
table.render({
+ id:'lookSSXMTable',
elem: '#lookSSXMTable',
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/ManPakOut/list/auth',
where: {
- doc_num: data.docNum
+ doc_num: data.docNum,
+ uuid: data.uuid
},
page: true,
cellMinWidth: 100,
@@ -116,10 +126,15 @@
{type: 'numbers'}
,{field: 'id', align: 'center',title: 'id', hide:true}
,{field: 'docNum', align: 'center',title: '鎷ｈ揣鍗曞彿'}
+ ,{field: 'uuid', align: 'center',title: 'uuid'}
,{field: 'locNo', align: 'center',title: '搴撲綅'}
,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'owner$', align: 'center',title: '璐т富'}
+ ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��'}
+ ,{field: 'owner', align: 'center',title: '璐т富', hide:true}
+ ,{field: 'payment', align: 'center',title: '璐х墿褰㈡��', hide:true}
,{field: 'createTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
,{field: 'count', align: 'center',title: '瀹屾垚鏁�'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
@@ -141,8 +156,18 @@
response: {
statusCode: 200
},
- done: function () {
+ done: function (res) {
$(layero).find('.layui-table-view').css('margin', '0');
+
+ var index = -1;
+ $("[data-field='status$']").children().each(function () {
+ index++;
+ if ($(this).text() === '鏈嚭搴�') {
+ $('tr').eq(index).css("color", 'red');
+ }
+ });
+
+
},
size: ''
});
@@ -296,6 +321,8 @@
+
+
});
// 鍏抽棴鍔ㄤ綔
--
Gitblit v1.9.1