|
|
@@ -41,6 +41,38 @@
|
|
|
>
|
|
|
</el-input>
|
|
|
</el-col>
|
|
|
+ <el-col v-if="dimension == 2" :span="4">
|
|
|
+ <el-input
|
|
|
+ v-model="batchNo"
|
|
|
+ clearable
|
|
|
+ placeholder="批次号"
|
|
|
+ @keyup.enter.native="handleSearch"
|
|
|
+ ></el-input>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-input
|
|
|
+ v-model="colorKey"
|
|
|
+ clearable
|
|
|
+ placeholder="颜色"
|
|
|
+ @keyup.enter.native="handleSearch"
|
|
|
+ ></el-input>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-input
|
|
|
+ v-model="modelKey"
|
|
|
+ clearable
|
|
|
+ placeholder="机型"
|
|
|
+ @keyup.enter.native="handleSearch"
|
|
|
+ ></el-input>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="4">
|
|
|
+ <el-input
|
|
|
+ v-model="warehouseName"
|
|
|
+ clearable
|
|
|
+ placeholder="仓库"
|
|
|
+ @keyup.enter.native="handleSearch"
|
|
|
+ ></el-input>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
<div class="flex_info">
|
|
|
@@ -226,6 +258,10 @@
|
|
|
}
|
|
|
},
|
|
|
deep: true
|
|
|
+ },
|
|
|
+ dimension() {
|
|
|
+ this.resetSearchFields();
|
|
|
+ this.pages.pageNum = 1;
|
|
|
}
|
|
|
},
|
|
|
components: { AssetTree },
|
|
|
@@ -234,6 +270,10 @@
|
|
|
factoryList: [],
|
|
|
factoryId: '',
|
|
|
value: '',
|
|
|
+ batchNo: '',
|
|
|
+ colorKey: '',
|
|
|
+ modelKey: '',
|
|
|
+ warehouseName: '',
|
|
|
treeType: '',
|
|
|
treeList: [],
|
|
|
tableData: [],
|
|
|
@@ -281,6 +321,12 @@
|
|
|
this.pages.pageNum = 1;
|
|
|
this.initData();
|
|
|
},
|
|
|
+ resetSearchFields() {
|
|
|
+ this.batchNo = '';
|
|
|
+ this.colorKey = '';
|
|
|
+ this.modelKey = '';
|
|
|
+ this.warehouseName = '';
|
|
|
+ },
|
|
|
onConfirm() {
|
|
|
this.$emit('selectTableData', [...this.multipleSelection]);
|
|
|
this.closeWindows();
|
|
|
@@ -307,6 +353,7 @@
|
|
|
},
|
|
|
closeWindows() {
|
|
|
this.multipleSelection = [];
|
|
|
+ this.resetSearchFields();
|
|
|
this.$emit('update:loadTree', false);
|
|
|
this.$emit('update:visibleDialog', false);
|
|
|
this.pages.pageNum = 1;
|
|
|
@@ -326,9 +373,15 @@
|
|
|
const params = {
|
|
|
...this.pages,
|
|
|
keyWord: this.value,
|
|
|
+ colorKey: this.colorKey,
|
|
|
+ modelKey: this.modelKey,
|
|
|
+ warehouseName: this.warehouseName,
|
|
|
warehouseId: this.warehouseId,
|
|
|
categoryLevelId: this.classificationId
|
|
|
};
|
|
|
+ if (this.dimension == 2) {
|
|
|
+ params.batchNo = this.batchNo;
|
|
|
+ }
|
|
|
let res = null;
|
|
|
if (this.dimension == 1) {
|
|
|
res = await getProductList(params);
|
