From 11b91a53371953c684c1f966c8cb5834fb46a4ef Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 22 四月 2025 12:55:18 +0800
Subject: [PATCH] Revert "推送数据同步延长定时任务推送间隔"
---
src/main/webapp/static/js/cool.js | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/static/js/cool.js b/src/main/webapp/static/js/cool.js
index 511bbd9..41fcca4 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,31 @@
} 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);
+ // 鏍规嵁鐗屽彿閫夋嫨杩涜杩囨护
+ checkData = firstData.filter(item => item.brand === $('#maktxV').val())
+ var allWeight = 0;
+ for (var i in checkData){
+ allWeight += (checkData[i].weightAnfme - checkData[i].qtyAnfme)
+ }
+ // 鏍规嵁鐗屽彿閲嶆柊娓叉煋
+ $('#qtyWeight').val(allWeight);
}
}
inputDom.val("");
@@ -138,7 +157,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