|
|
@@ -81,29 +81,13 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-col>
|
|
|
- <el-col
|
|
|
- :span="3"
|
|
|
- class="fr"
|
|
|
- style="width: 66px; padding: 0 0 0 10px"
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- :size="searchSize"
|
|
|
- @click="searchList"
|
|
|
- >
|
|
|
+ <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
|
|
|
+ <el-button type="primary" :size="searchSize" @click="searchList">
|
|
|
刷新
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
- <el-col
|
|
|
- :span="3"
|
|
|
- class="fr"
|
|
|
- style="width: 66px; padding: 0 0 0 10px"
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="warning"
|
|
|
- :size="searchSize"
|
|
|
- @click="restSearch"
|
|
|
- >
|
|
|
+ <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
|
|
|
+ <el-button type="warning" :size="searchSize" @click="restSearch">
|
|
|
重置
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
@@ -133,11 +117,7 @@
|
|
|
<el-option label="供应商名称" value="4" /> </el-select
|
|
|
></el-input>
|
|
|
</el-col>
|
|
|
- <el-col
|
|
|
- :span="3"
|
|
|
- class="fr"
|
|
|
- style="width: 66px; padding: 0 0 0 10px"
|
|
|
- >
|
|
|
+ <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
|
|
|
<el-button
|
|
|
type="success"
|
|
|
:size="searchSize"
|
|
|
@@ -168,8 +148,7 @@
|
|
|
:size="tablebtnSize"
|
|
|
:type="scope.row.good_type == '0' ? 'warning' : ''"
|
|
|
v-text="
|
|
|
- (options1.find((item) => item.id == scope.row.good_type) || {})
|
|
|
- .name || '--'
|
|
|
+ (options1.find((item) => item.id == scope.row.good_type) || {}).name || '--'
|
|
|
"
|
|
|
></el-tag>
|
|
|
</template>
|
|
|
@@ -324,13 +303,12 @@ export default {
|
|
|
this.parmValue.company = this.select === "3" ? this.sinput : "";
|
|
|
this.parmValue.supplier = this.select === "4" ? this.sinput : "";
|
|
|
this.parmValue.isonline = this.isonline || "";
|
|
|
- this.parmValue.is_stock = this.is_stock || "";
|
|
|
+ this.parmValue.is_stock = this.is_stock || "";
|
|
|
let model = JSON.parse(JSON.stringify(this.parmValue));
|
|
|
- model.cat_id =
|
|
|
- model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : "";
|
|
|
+ model.cat_id = model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : "";
|
|
|
model.brandid =
|
|
|
model.brandid.length > 0 ? model.brandid[model.brandid.length - 1] : "";
|
|
|
-
|
|
|
+
|
|
|
const res = await asyncRequest.list(model);
|
|
|
if (res && res.code === 0 && res.data) {
|
|
|
this.tableData = res.data.list;
|
|
|
@@ -387,5 +365,4 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
|
|
|
-<style>
|
|
|
-</style>
|
|
|
+<style></style>
|
