|
@@ -111,16 +111,15 @@
|
|
|
></el-input>
|
|
></el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
|
|
- <el-form-item label="质检状态">
|
|
|
|
|
|
|
+ <el-col v-if="dimension != 2" :span="6">
|
|
|
|
|
+ <el-form-item label="质检结果">
|
|
|
<el-select
|
|
<el-select
|
|
|
- v-if="dimension != 3 || dimension != 4"
|
|
|
|
|
clearable
|
|
clearable
|
|
|
- v-model="searchForm.qualityStatus"
|
|
|
|
|
- placeholder="请选择质检状态"
|
|
|
|
|
|
|
+ v-model="searchForm.qualityResult"
|
|
|
|
|
+ placeholder="请选择质检结果"
|
|
|
>
|
|
>
|
|
|
<el-option
|
|
<el-option
|
|
|
- v-for="item in qualityStatusOption"
|
|
|
|
|
|
|
+ v-for="item in qualityResultOption"
|
|
|
:label="item.label"
|
|
:label="item.label"
|
|
|
:value="item.value"
|
|
:value="item.value"
|
|
|
:key="item.value"
|
|
:key="item.value"
|
|
@@ -400,7 +399,7 @@
|
|
|
batchNo: '',
|
|
batchNo: '',
|
|
|
engrave: '',
|
|
engrave: '',
|
|
|
barcodes: '',
|
|
barcodes: '',
|
|
|
- qualityStatus: ''
|
|
|
|
|
|
|
+ qualityResult: ''
|
|
|
},
|
|
},
|
|
|
selectionList: [],
|
|
selectionList: [],
|
|
|
materialType: '',
|
|
materialType: '',
|
|
@@ -630,7 +629,7 @@
|
|
|
this.searchForm.batchNo = '';
|
|
this.searchForm.batchNo = '';
|
|
|
this.searchForm.engrave = '';
|
|
this.searchForm.engrave = '';
|
|
|
this.searchForm.barcodes = '';
|
|
this.searchForm.barcodes = '';
|
|
|
- this.searchForm.qualityStatus = '';
|
|
|
|
|
|
|
+ this.searchForm.qualityResult = '';
|
|
|
this.doSearch();
|
|
this.doSearch();
|
|
|
},
|
|
},
|
|
|
doSearch() {
|
|
doSearch() {
|