|
@@ -482,7 +482,7 @@ const showSelectTab = function(select, spread, afterShow) {
|
|
|
};
|
|
|
$.billsSearch = function (setting) {
|
|
|
if (!setting.selector || !setting.searchSpread || !setting.resultSpreadSetting) return;
|
|
|
- if (!setting.searchRangeStr) setting.searchRangeStr = '项目节编号/清单编号/名称';
|
|
|
+ if (!setting.searchRangeStr) setting.searchRangeStr = '项目节编号/清单编号/名称/台账数量';
|
|
|
const resultId = setting.id + '-search-result';
|
|
|
const obj = $(setting.selector);
|
|
|
let filter = [];
|
|
@@ -526,12 +526,15 @@ const showSelectTab = function(select, spread, afterShow) {
|
|
|
};
|
|
|
const searchBills = function () {
|
|
|
const keyword = $('#searchKeyword', obj).val();
|
|
|
+ const keyNum = _.toNumber(keyword);
|
|
|
searchResult = [];
|
|
|
const sortData = SpreadJsObj.getSortData(searchSheet);
|
|
|
for (const node of sortData) {
|
|
|
if ((node.code && node.code.indexOf(keyword) > -1) ||
|
|
|
- node.b_code && node.b_code.indexOf(keyword) > -1 ||
|
|
|
- node.name && node.name.indexOf(keyword) > -1) {
|
|
|
+ (node.b_code && node.b_code.indexOf(keyword) > -1) ||
|
|
|
+ (node.name && node.name.indexOf(keyword) > -1) ||
|
|
|
+ (!_.isNaN(keyNum) && checkZero(ZhCalc.sub(keyNum, node.quantity)))
|
|
|
+ ) {
|
|
|
const data = JSON.parse(JSON.stringify(node));
|
|
|
data.visible = true;
|
|
|
searchResult.push(data);
|
|
@@ -545,6 +548,7 @@ const showSelectTab = function(select, spread, afterShow) {
|
|
|
};
|
|
|
const searchCustom = function (key) {
|
|
|
const keyword = $('#searchKeyword', obj).val();
|
|
|
+ const keyNum = _.toNumber(keyword);
|
|
|
const checkFun = getCheckFun(key);
|
|
|
searchResult = [];
|
|
|
const sortData = SpreadJsObj.getSortData(searchSheet);
|
|
@@ -554,7 +558,9 @@ const showSelectTab = function(select, spread, afterShow) {
|
|
|
if (!keyword ||
|
|
|
(node.code && node.code.indexOf(keyword) > -1) ||
|
|
|
(node.b_code && node.b_code.indexOf(keyword) > -1) ||
|
|
|
- (node.name && node.name.indexOf(keyword) > -1)) {
|
|
|
+ (node.name && node.name.indexOf(keyword) > -1)
|
|
|
+ (!_.isNaN(keyNum) && checkZero(ZhCalc.sub(keyNum, node.quantity)))
|
|
|
+ ) {
|
|
|
const data = JSON.parse(JSON.stringify(node));
|
|
|
data.visible = true;
|
|
|
searchResult.push(data);
|