浏览代码

查找定位,可根据台账数量查找

MaiXinRong 3 年之前
父节点
当前提交
bb5d7e6615
共有 5 个文件被更改,包括 12 次插入8 次删除
  1. 1 1
      app/public/js/ledger_bwtz.js
  2. 10 4
      app/public/js/shares/cs_tools.js
  3. 0 1
      app/public/js/sr_detail.js
  4. 0 1
      app/public/js/stage.js
  5. 1 1
      app/public/js/stage_bwtz.js

+ 1 - 1
app/public/js/ledger_bwtz.js

@@ -183,7 +183,7 @@ $(document).ready(() => {
                     xmjSearch = $.billsSearch({
                         selector: '#search',
                         searchSpread: xmjSpread,
-                        searchRangeStr: '项目节编号/名称',
+                        searchRangeStr: '项目节编号/名称/台账数量',
                         resultSpreadSetting: {
                             cols: [
                                 {title: '项目节编号', field: 'code', hAlign: 0, width: 120, formatter: '@', readOnly: true},

+ 10 - 4
app/public/js/shares/cs_tools.js

@@ -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);

+ 0 - 1
app/public/js/sr_detail.js

@@ -1044,7 +1044,6 @@ $(document).ready(() => {
                 searchLedger = $.billsSearch({
                     selector: '#search',
                     searchSpread: slSpread,
-                    searchRangeStr: '项目节编号/名称',
                     searchOver: true,
                     searchEmpty: true,
                     resultSpreadSetting: {

+ 0 - 1
app/public/js/stage.js

@@ -3748,7 +3748,6 @@ $(document).ready(() => {
                 searchLedger = $.billsSearch({
                     selector: '#search',
                     searchSpread: slSpread,
-                    searchRangeStr: '项目节编号/名称',
                     searchOver: true,
                     searchEmpty: true,
                     resultSpreadSetting: {

+ 1 - 1
app/public/js/stage_bwtz.js

@@ -191,7 +191,7 @@ $(document).ready(() => {
                     xmjSearch = $.billsSearch({
                         selector: '#search',
                         searchSpread: xmjSpread,
-                        searchRangeStr: '项目节编号/名称',
+                        searchRangeStr: '项目节编号/名称/台账数量',
                         searchOver: true,
                         searchEmpty: true,
                         resultSpreadSetting: {