From d52b5d11199cc6b7cec42deb82c831a4ed15a3b4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 14:56:58 +0800
Subject: [PATCH] 仓库： 显示在库信息，入库完成后显示成功入库的包数 订单出库页面显示剩余待检包数 (PDA) 未查询到的提示改为显示物料实际状态 拣货单已完成，单据未完成 ✔ 单据数量字段显示变更 ✔ 拣货单按实际操作时间降序排序 ✔ 拣货单明细导出 ✔ 拣货单显示创建时间与操作时间 ✔
---
src/main/webapp/static/js/cool.js | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/static/js/cool.js b/src/main/webapp/static/js/cool.js
index 511bbd9..e3ae972 100644
--- a/src/main/webapp/static/js/cool.js
+++ b/src/main/webapp/static/js/cool.js
@@ -40,6 +40,9 @@
if(type){
inputDomVal = inputDomVal + "," + type;
}
+ if(getForeignKeyQuery(val) === 'orderDetlQuery'){
+ inputDomVal = inputDomVal + "," + $('#orderNo').val();
+ }
//debugger;
selectDom.length = 0;
var defaultOption = new Option("鍙栨秷閫夋嫨", "");
@@ -61,6 +64,9 @@
option.addr = list[i].addr;
option.phone = list[i].phone;
option.customer = list[i].customer;
+ option.allocate = list[i].allocate;
+ option.weight = list[i].weight;
+ option.type = list[i].type;
selectDom.options[i+1] = option;
}
selectDom.style.display='block';
@@ -99,18 +105,23 @@
} else {
cacd.val(selectOptionDom.html());
realDom.val(selectOptionDom.attr("title"));
- if(selectOptionDom[0].phone){
- $('#phone').val(selectOptionDom[0].phone);
+ if(selectOptionDom[0].type === "docType"){
+ $('#weight').val("");
+ $('#maktxV').val("");
}
- if(selectOptionDom[0].addr){
- $('#addr').val(selectOptionDom[0].addr);
+ if(selectOptionDom[0].type === "order" || selectOptionDom[0].type === "locOwner"){
+ $('#allocate').val(selectOptionDom[0].allocate ? selectOptionDom[0].allocate : "");
+ $('#customer').val(selectOptionDom[0].customer ? selectOptionDom[0].customer : "");
+ $('#phone').val(selectOptionDom[0].phone ? selectOptionDom[0].phone : "");
+ $('#addr').val(selectOptionDom[0].addr ? selectOptionDom[0].addr : "");
}
- if(selectOptionDom[0].customer){
- $('#customerR').val(selectOptionDom[0].customer);
+ if(selectOptionDom[0].type === "returned"){
+ $('#customer').val(selectOptionDom[0].customer ? selectOptionDom[0].customer : "");
tableReload();
+ }
- }else {
- $('#customerR').val("");
+ if(selectOptionDom[0].type === "orderDetl"){
+ $('#weight').val(selectOptionDom[0].weight);
}
}
inputDom.val("");
@@ -138,7 +149,7 @@
{field: 'id', title: 'id', hide:true},
{field: 'batch', title: '鎵瑰彿'},
{field: 'packageNo', title: '鍖呭彿'},
- {field: 'orderWeight', title: '閲嶉噺'}
+ {field: 'orderWeight', title: '閲嶉噺',edit:true}
]],
request: {
--
Gitblit v1.9.1