Commit 5a0b5c91 authored by jingnan's avatar jingnan 👀

批量签审验收入库接受仓库查询去掉区域条件

parent ec9cf8e1
...@@ -1825,14 +1825,14 @@ export default { ...@@ -1825,14 +1825,14 @@ export default {
}, },
// 默认带出接收仓库 // 默认带出接收仓库
defaultStorage() { defaultStorage() {
let extDxProductAreaItem = [] // let extDxProductAreaItem = []
if (this.basicData.extDxProductAreaId) { // if (this.basicData.extDxProductAreaId) {
extDxProductAreaItem = [{ // extDxProductAreaItem = [{
'fieldName': 'source.extDxProductAreaId', // 'fieldName': 'source.extDxProductAreaId',
'operator': 'EQ', // 'operator': 'EQ',
'value': this.basicData.extDxProductAreaId || '' // 'value': this.basicData.extDxProductAreaId || ''
}] // }]
} // }
const params = { const params = {
'pageFrom': 1, 'pageFrom': 1,
'pageSize': 9999, 'pageSize': 9999,
...@@ -1843,13 +1843,13 @@ export default { ...@@ -1843,13 +1843,13 @@ export default {
'fieldName': 'targetId', 'fieldName': 'targetId',
'operator': 'EQ', 'operator': 'EQ',
'value': this.basicData.materialTypeId || '' 'value': this.basicData.materialTypeId || ''
}, }
// { // {
// 'fieldName': 'source.extDxProductAreaId', // 'fieldName': 'source.extDxProductAreaId',
// 'operator': 'EQ', // 'operator': 'EQ',
// 'value': this.basicData.extDxProductAreaId || '' // 'value': this.basicData.extDxProductAreaId || ''
// } // }
...extDxProductAreaItem // ...extDxProductAreaItem
], ],
'operator': 'AND' 'operator': 'AND'
} }
...@@ -1865,9 +1865,9 @@ export default { ...@@ -1865,9 +1865,9 @@ export default {
const STORAGE = this.formFileds[0].data.find( const STORAGE = this.formFileds[0].data.find(
(item) => item.key === 'storageZone' (item) => item.key === 'storageZone'
) )
if (!this.basicData.extDxProductAreaId) { // if (!this.basicData.extDxProductAreaId) {
res.items.content = res.items.content.filter(item => { return item.source }) res.items.content = res.items.content.filter(item => { return item.source })
} // }
STORAGE.component.options = res.items.content.map((item) => { STORAGE.component.options = res.items.content.map((item) => {
return { return {
label: item.source && item.source.extname, label: item.source && item.source.extname,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment