From 64dbf42de49ecc047f2fce08eba71e18401324d8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 28 二月 2024 16:27:27 +0800
Subject: [PATCH] 新增库存明细重量统计，完善出入库日志记录
---
src/main/webapp/static/js/order/order.js | 66 ++++++++++++++-------------------
1 files changed, 28 insertions(+), 38 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index f6a94a8..5af334f 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -47,6 +47,8 @@
{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: 'cstmrName', align: 'center',title: '瀹㈡埛鍚嶇О'},
+ {field: 'itemName', align: 'center',title: '璋冩嫧鍒�'},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{field: 'createBy$', align: 'center', title: '鎿嶄綔鍛�', minWidth: 160, width: 160},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 260}
@@ -152,6 +154,8 @@
var data = obj.data;
var layEvent = obj.event;
+
+
if (layEvent === 'edit') {
showEditModel(data);
} else if (layEvent === 'del') {
@@ -188,24 +192,22 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- // {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- //
- // {field: 'batch', title: '鎵瑰彿'},
- {field: 'batch', title: '鎵规'},
- {field: 'brand', title: '鐗屽彿'},
- {field: 'fingerMeltingMin', title: '鏈�灏忕啍鎸�'},
- {field: 'fingerMeltingMax', title: '鏈�澶х啍鎸�'},
- {field: 'fusingPointMin', title: '鏈�灏忕啍鐐�'},
- {field: 'fusingPointMax', title: '鏈�澶х啍鐐�'},
- {field: 'yellownessMin', title: '鏈�灏忛粍搴�'},
- {field: 'yellownessMax', title: '鏈�澶ч粍搴�'},
- {field: 'opacityMin', title: '鏈�灏忎笉閫忔槑搴�'},
- {field: 'opacityMax', title: '鏈�澶т笉閫忔槑搴�'},
+ {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: '瑙勬牸'},
]],
request: {
pageName: 'curr',
@@ -260,10 +262,6 @@
let nList = admin.util.deepClone(xxDataList);
console.log(nList);
for (let xi = 0; xi < nList.length; xi++) {
- if(!nList[xi].anfme){
- layer.msg('鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
- return false;
- }
if (nList[xi].anfme <= 0){
layer.msg('鏄庣粏鏁伴噺涓嶅悎娉�', {icon: 2});
return false;
@@ -286,6 +284,11 @@
orderId: Number(data.field.id),
docType: Number(data.field.docType),
orderNo: data.field.orderNo,
+ cstmr: data.field.cstmr,
+ cstmrName: data.field.cstmrName,
+ tel: data.field.tel,
+ number: data.field.number,
+ itemName: data.field.itemName,
orderDetlList: nList
}),
contentType:'application/json;charset=UTF-8',
@@ -316,24 +319,14 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- // {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- // {field: 'specs', title: '瑙勬牸'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
+ {field: 'specs', title: '瑙勬牸'},
{field: 'batch', title: '鎵规', edit: true},
- {field: 'brand', title: '鐗屽彿', edit: true},
- {field: 'fingerMeltingMin', title: '鏈�灏忕啍鎸�', edit: true},
- {field: 'fingerMeltingMax', title: '鏈�澶х啍鎸�', edit: true},
- {field: 'fusingPointMin', title: '鏈�灏忕啍鐐�', edit: true},
- {field: 'fusingPointMax', title: '鏈�澶х啍鐐�', edit: true},
- {field: 'yellownessMin', title: '鏈�灏忛粍搴�', edit: true},
- {field: 'yellownessMax', title: '鏈�澶ч粍搴�', edit: true},
- {field: 'opacityMin', title: '鏈�灏忎笉閫忔槑搴�', edit: true},
- {field: 'opacityMax', title: '鏈�澶т笉閫忔槑搴�', edit: true},
-
- {field: 'anfme', title: '閲嶉噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
// {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
- {field: 'qty', title: '浣滀笟閲嶉噺', minWidth: 100, width: 100},
+ {field: 'qty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
@@ -435,7 +428,7 @@
}
}
data[obj.field] = obj.value;
- insTbSSXM.reloadData({data: xxDataList,scrollPos: true});
+ insTbSSXM.reloadData({data: xxDataList,scrollPos: true});
});
$('#matAddBtnComment').click(function () {
@@ -444,9 +437,6 @@
// 鏄剧ず娣诲姞鏄庣粏琛ㄥ崟寮圭獥
function showEditModel2(exp) {
- xxDataList.push({});
- insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
- return;
admin.open({
type: 1,
offset: '150px',
--
Gitblit v1.9.1