From 32700bf6d8abe8935e3dad6433584ac7cf03f87c Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期一, 30 八月 2021 08:40:03 +0800
Subject: [PATCH] 1.0.4
---
src/main/webapp/static/js/waitMatin/waitMatin.js | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/static/js/waitMatin/waitMatin.js b/src/main/webapp/static/js/waitMatin/waitMatin.js
index 0c9fd90..4cce435 100644
--- a/src/main/webapp/static/js/waitMatin/waitMatin.js
+++ b/src/main/webapp/static/js/waitMatin/waitMatin.js
@@ -73,7 +73,7 @@
layer.open({
type: 1,
title: false,
- area: '630px',
+ area: '800px',
offset: [top + 'px', (left - 530 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -98,7 +98,10 @@
field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
return util.toDateString(d.createTime);
}, width: 180
- }
+ },
+ {field: 'outqty', title: '宸插嚭搴撻噺'},
+ {field: 'color', title: '棰滆壊'},
+ {field: 'specs', title: '瑙勬牸'}
]],
request: {
pageName: 'curr',
@@ -131,7 +134,7 @@
type: 1,
title: (expTpe ? '淇敼' : '娣诲姞') + '鍗曟嵁',
content: $('#editDialog').html(),
- area: '700px',
+ area: '1300px',
success: function (layero, dIndex) {
$(layero).children('.layui-layer-content').css('overflow', 'visible');
var isExpAdd = !expTpe;
@@ -156,6 +159,11 @@
billType: data.field.billType,
matNo: nList[xi].matNo,
matName: nList[xi].matName,
+ color: nList[xi].color,
+ size: nList[xi].size,
+ specs: nList[xi].specs,
+ memo: nList[xi].memo,
+ unit: nList[xi].unit,
qty: nList[xi].qty,
})
}
@@ -199,6 +207,11 @@
{type: 'numbers'},
{field: 'matNo', title: '鐗╂枡缂栫爜'},
{field: 'matName', title: '鐗╂枡鍚嶇О', width: 160},
+ {field: 'specs', title: '瑙勬牸', width: 160},
+ {field: 'color', title: '棰滆壊', width: 160},
+ {field: 'size', title: '灏哄', width: 160},
+ {field: 'unit', title: '鍗曚綅', width: 160},
+ {field: 'memo', title: '澶囨敞' , edit: true, width: 160},
{field: 'qty', title: '淇敼鏁伴噺', style: 'color: blue;font-weight: bold', edit: true, minWidth: 100, width: 100},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
]],
@@ -250,19 +263,29 @@
});
// 鏁伴噺淇敼
table.on('edit(formSSXMTable)', function (obj) {
- let count = Number(obj.value);
- if (isNaN(count)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- } else {
- if (count > 0) {
- for (var i=0;i<xxDataList.length;i++){
- if (xxDataList[i]["matNo"] === obj.data.matNo){
- xxDataList[i]["qty"] = count;
- break;
- }
+ if (obj.field=='memo'){
+ let vle = obj.value;
+ for (var i=0;i<xxDataList.length;i++) {
+ if (xxDataList[i]["matNo"] === obj.data.matNo) {
+ xxDataList[i]["memo"] = vle;
+ break;
}
+ }
+ }else if (obj.field=='qty'){
+ let vle = Number(obj.value);
+ if (isNaN(vle)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�");
+ if (vle > 0) {
+ for (var i=0;i<xxDataList.length;i++) {
+ if (xxDataList[i]["matNo"] === obj.data.matNo) {
+ xxDataList[i]["qty"] = vle;
+ break;
+ }
+ }
+ } else {
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�");
+ }
}
}
insTbSSXM.reload({data: xxDataList});
@@ -306,6 +329,11 @@
xxDataList.push({
matNo: mat.matNo,
matName: mat.matName,
+ color:mat.color,
+ size:mat.size,
+ specs:mat.specs,
+ memo: mat.memo,
+ unit: mat.unit,
qty: 0.0
});
insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
--
Gitblit v1.9.1