diff --git a/src/option/distribution/zeroAdditionalRecording.js b/src/option/distribution/zeroAdditionalRecording.js index 43c84df0..ce653360 100644 --- a/src/option/distribution/zeroAdditionalRecording.js +++ b/src/option/distribution/zeroAdditionalRecording.js @@ -28,7 +28,7 @@ export const oldColumnList = [ { prop: 'orderCode', label: '合同号', - type: 2, + type: 1, values: '', width: '150', checkarr: [], @@ -209,7 +209,7 @@ export const newColumnList = [ { prop: 'orderCode', label: '合同号', - type: 2, + type: 1, values: '', width: '150', checkarr: [], diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue index 99bae0fa..5ddb332a 100644 --- a/src/views/distribution/artery/zeroAdditionalRecording.vue +++ b/src/views/distribution/artery/zeroAdditionalRecording.vue @@ -9,7 +9,12 @@
运单池
- + - + 调度池
- -
- - - - - -
+ + + + + + + + + + 搜 索 + 重置 +
@@ -261,7 +263,7 @@ import { postDeleteZeroSuppleById, postFindNextNodeList, } from '@/api/distribution/zeroAdditionalRecording'; -import { downloadXls, setNodeHeight, debounce, deepClone } from '@/utils/util'; +import { downloadXls, setNodeHeight, debounce, deepClone, getObjType } from '@/utils/util'; import { oldColumnList, newColumnList } from '@/option/distribution/zeroAdditionalRecording'; import { ElMessage } from 'element-plus'; import { useRoute, useRouter } from 'vue-router'; @@ -510,13 +512,29 @@ const handleFilterData = () => { let _flag = true; for (let key in details.newQuery) { - if (!details.newQuery[key].test(value[key])) _flag = false; if (!_flag) break; + const _value = value[key]; + if (!_value) continue; + if (getObjType(_value) === 'array') { + let _isFlag = false; + for (let index = 0; index < _value.length; index++) { + const item = _value[index]; + + if (!details.newQuery[key].test(value[key])) continue; + _isFlag = true; + break; + } + + _flag = _isFlag; + } else { + if (!details.newQuery[key].test(value[key])) _flag = false; + } } if (!_flag) continue; for (let key in details.newTimeQuery) { + if (!_flag) break; const item = details.newTimeQuery[key]; if (!item) continue; @@ -527,8 +545,6 @@ const handleFilterData = () => { if (_time !== _time) _flag = false; else if (_time < _startTime || _time > _endTime) _flag = false; - - if (!_flag) break; } if (_flag) _filterArr.push(value); } @@ -536,14 +552,22 @@ const handleFilterData = () => { details.renderData = _filterArr; }; +const handleNewSearch = () => { + newInputsc(details.form.orderCodes, { prop: 'orderCode' }); +}; + /** 表格表头输入框搜索 */ const newInputsc = (value, { prop }) => { - // 动态设置正则 - const reg = new RegExp('^' + value); + if (value) { + const _arr = (value + '').split(','); - details.newQuery[prop] = reg; + // 动态设置正则 + const reg = new RegExp('^' + value); - if (value === '') delete details.newQuery[prop]; + details.newQuery[prop] = _arr.map(val => new RegExp('^' + value)); + } else { + delete details.newQuery[prop]; + } handleFilterData(); }; @@ -872,4 +896,8 @@ watch( font-weight: bold; color: var(--el-color-primary); } + +.header_search > div { + width: 50%; +}