|
@@ -45,6 +45,22 @@
|
|
|
<el-option label="否" :value="0" />
|
|
<el-option label="否" :value="0" />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
+ <el-form-item label="种类" prop="productKind">
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="queryParams.productKind"
|
|
|
|
|
+ placeholder="请选择种类"
|
|
|
|
|
+ clearable
|
|
|
|
|
+ multiple
|
|
|
|
|
+ size="small"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in productKindOptions"
|
|
|
|
|
+ :key="item.dictValue"
|
|
|
|
|
+ :label="item.dictLabel"
|
|
|
|
|
+ :value="item.dictValue"
|
|
|
|
|
+ />
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
@@ -106,6 +122,11 @@
|
|
|
<el-table-column label="token" align="center" prop="token" />
|
|
<el-table-column label="token" align="center" prop="token" />
|
|
|
<el-table-column label="aesKey" align="center" prop="aesKey" />
|
|
<el-table-column label="aesKey" align="center" prop="aesKey" />
|
|
|
<el-table-column label="msgDataFormat" align="center" prop="msgDataFormat" />
|
|
<el-table-column label="msgDataFormat" align="center" prop="msgDataFormat" />
|
|
|
|
|
+ <el-table-column label="种类" align="center" prop="productKind" width="100px">
|
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
|
+ {{ getProductKindLabel(scope.row.productKind) }}
|
|
|
|
|
+ </template>
|
|
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="状态" align="center" prop="status" width="100px">
|
|
<el-table-column label="状态" align="center" prop="status" width="100px">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<el-tag
|
|
<el-tag
|
|
@@ -150,6 +171,22 @@
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
|
|
|
<el-form-item label="名称" prop="name">
|
|
<el-form-item label="名称" prop="name">
|
|
|
<el-input v-model="form.name" placeholder="请输入名称" />
|
|
<el-input v-model="form.name" placeholder="请输入名称" />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ <el-form-item label="种类" prop="productKind">
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="form.productKind"
|
|
|
|
|
+ placeholder="未配置时可能加载不出商品"
|
|
|
|
|
+ style="width: 220px"
|
|
|
|
|
+ clearable
|
|
|
|
|
+ size="small"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in productKindOptions"
|
|
|
|
|
+ :key="item.dictValue"
|
|
|
|
|
+ :label="item.dictLabel"
|
|
|
|
|
+ :value="item.dictValue"
|
|
|
|
|
+ />
|
|
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item label="状态" prop="status">
|
|
<el-form-item label="状态" prop="status">
|
|
|
<el-select
|
|
<el-select
|
|
@@ -219,13 +256,15 @@ export default {
|
|
|
companySearchLoading: false,
|
|
companySearchLoading: false,
|
|
|
companyOptions: [],
|
|
companyOptions: [],
|
|
|
formatterCompanyOptions: [],
|
|
formatterCompanyOptions: [],
|
|
|
|
|
+ productKindOptions: [],
|
|
|
queryParams: {
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
|
name: null,
|
|
name: null,
|
|
|
appid: null,
|
|
appid: null,
|
|
|
status: null,
|
|
status: null,
|
|
|
- specialMini: null
|
|
|
|
|
|
|
+ specialMini: null,
|
|
|
|
|
+ productKind: []
|
|
|
},
|
|
},
|
|
|
showSearch: true,
|
|
showSearch: true,
|
|
|
single: true,
|
|
single: true,
|
|
@@ -303,6 +342,10 @@ export default {
|
|
|
listClass: 'primary'}
|
|
listClass: 'primary'}
|
|
|
})
|
|
})
|
|
|
});
|
|
});
|
|
|
|
|
+
|
|
|
|
|
+ this.getDicts("product_kind").then((response) => {
|
|
|
|
|
+ this.productKindOptions = response.data;
|
|
|
|
|
+ });
|
|
|
//初始化formatterCompanyOptions
|
|
//初始化formatterCompanyOptions
|
|
|
// allList().then(e => {
|
|
// allList().then(e => {
|
|
|
// this.formatterCompanyOptions = e.rows;
|
|
// this.formatterCompanyOptions = e.rows;
|
|
@@ -336,7 +379,13 @@ export default {
|
|
|
|
|
|
|
|
getList() {
|
|
getList() {
|
|
|
this.loading = true;
|
|
this.loading = true;
|
|
|
- list(this.queryParams).then(response => {
|
|
|
|
|
|
|
+ const params = {
|
|
|
|
|
+ ...this.queryParams,
|
|
|
|
|
+ productKind: Array.isArray(this.queryParams.productKind) && this.queryParams.productKind.length > 0
|
|
|
|
|
+ ? this.queryParams.productKind.join(',')
|
|
|
|
|
+ : null
|
|
|
|
|
+ };
|
|
|
|
|
+ list(params).then(response => {
|
|
|
this.list = response.rows;
|
|
this.list = response.rows;
|
|
|
this.total = response.total;
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
this.loading = false;
|
|
@@ -450,6 +499,10 @@ export default {
|
|
|
2: '封禁'
|
|
2: '封禁'
|
|
|
};
|
|
};
|
|
|
return statusMap[status] || '未知';
|
|
return statusMap[status] || '未知';
|
|
|
|
|
+ },
|
|
|
|
|
+ getProductKindLabel(kind) {
|
|
|
|
|
+ const item = this.productKindOptions.find(opt => opt.dictValue === kind);
|
|
|
|
|
+ return item ? item.dictLabel : (kind || '');
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
}
|
|
}
|