From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/searchtoolbar.js | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/searchtoolbar.js b/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/searchtoolbar.js
index 87b3231..e1bcef9 100644
--- a/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/searchtoolbar.js
+++ b/zhengcaioa/zhengcaioa/wwwroot/js/plugins/search/searchtoolbar.js
@@ -243,11 +243,20 @@
console.log(start);
console.log(end);
if ($.trim(start) == "" || $.trim(end) == "") {
- console.log(start);
- msg.info(item.label + "鏃ユ湡蹇呴』閫夋嫨瀹屽杽");
- IsOk = false;
- //寮�濮嬬粨鏉熸棩鏈熷繀椤婚�夋嫨瀹屽杽
- return false; //瀹炵幇break鍔熻兘
+ if ($.trim(start) == "") {
+ $("#PBS" + itemname + "start").val($.trim(end));
+ start = end;
+ }
+ else if ($.trim(end) == "")
+ {
+ $("#PBS" + itemname + "end").val($.trim(start));
+ end = start;
+ }
+ //console.log(start);
+ //msg.info(item.label + "鏃ユ湡蹇呴』閫夋嫨瀹屽杽");
+ //IsOk = false;
+ ////寮�濮嬬粨鏉熸棩鏈熷繀椤婚�夋嫨瀹屽杽
+ //return false; //瀹炵幇break鍔熻兘
}
var s = new Date(start);
var e = new Date(end);
@@ -258,7 +267,7 @@
msg.info("寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�");
return false;
}
- jsonStr += ',"' + itemname + '":"' + start + '|' + end + '"';
+ jsonStr += ',"' + itemname + '":"' + $.trim(start) + '|' + $.trim(end) + '"';
// var stringJson = '{"' + itemname + '": "' + start + '|' + end + '"}';
// returnJson.push(JSON.parse(stringJson));
}
--
Gitblit v1.9.1