|
@@ -11,7 +11,7 @@
|
|
|
|
|
|
</div>
|
|
|
<div style='width:40%;margin-right:10px;'>
|
|
|
- <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" :value="searchType"
|
|
|
+ <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange"
|
|
|
style="margin: 0 10px">
|
|
|
<el-option key="全部仓库" label="全部仓库" value="" style="color: #8890b1" />
|
|
|
<el-option v-for="item in warehouseList" :key="'cangku' + item.warehouseName" :label="item.warehouseName"
|
|
@@ -1764,18 +1764,21 @@ export default {
|
|
|
if(array[i].surplusWeight <=0){
|
|
|
continue
|
|
|
}
|
|
|
- arr.push(array[i])
|
|
|
- if (arr3.length == 0) {
|
|
|
- arr3.push(array[i])
|
|
|
- } else {
|
|
|
- var arr2 = arr3.filter((item) => { return item.warehouseName == array[i].warehouseName })
|
|
|
- if (arr2.length == 0) {
|
|
|
+ // if(){
|
|
|
+ arr.push(array[i])
|
|
|
+ if (arr3.length == 0) {
|
|
|
arr3.push(array[i])
|
|
|
- }
|
|
|
+ } else {
|
|
|
+ var arr2 = arr3.filter((item) => { return item.warehouseName == array[i].warehouseName })
|
|
|
+ if (arr2.length == 0) {
|
|
|
+ arr3.push(array[i])
|
|
|
+ }
|
|
|
+ // }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
currectData = arr
|
|
|
+ console.log(currectData,2111111)
|
|
|
if (currectData.length == 0) {
|
|
|
this.$message({
|
|
|
message: '请选择一条数据!',
|