Commit 1bccc422 by 吕明尚

修改次卡配置

parent 8cd2a28a
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
<!-- <el-table-column label="用户ID" align="center" prop="consumerId" />--> <!-- <el-table-column label="用户ID" align="center" prop="consumerId" />-->
<!-- <el-table-column label="用户手机号" align="center" prop="phone" />--> <!-- <el-table-column label="用户手机号" align="center" prop="phone" />-->
<!-- <el-table-column label="套餐id" align="center" prop="packId" />--> <!-- <el-table-column label="套餐id" align="center" prop="packId" />-->
<el-table-column align="center" label="套餐名称" prop="packName"/> <el-table-column align="center" label="单次时长" prop="singleDuration"/>
<el-table-column align="center" label="套餐金额" prop="packPrice"/> <el-table-column align="center" label="单次金额" prop="singleAmount"/>
<el-table-column align="center" label="次卡有效期" prop="expirationDate"/> <el-table-column align="center" label="次卡有效期" prop="expirationDate"/>
<el-table-column align="center" label="次卡次数" prop="number"/> <el-table-column align="center" label="次卡次数" prop="number"/>
<!-- <el-table-column label="删除标记:1-删除,0-正常" align="center" prop="isDelete" />--> <!-- <el-table-column label="删除标记:1-删除,0-正常" align="center" prop="isDelete" />-->
......
...@@ -9,16 +9,23 @@ ...@@ -9,16 +9,23 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="所属套餐" prop="packId"> <el-form-item label="单次金额" prop="singleAmount">
<el-select v-model="queryParams.packId" clearable placeholder="请选择套餐"> <el-input
<el-option v-model="queryParams.singleAmount"
v-for="item in packList" clearable
:key="item.id" placeholder="请输入配置名称"
:label="item.name" @keyup.enter.native="handleQuery"
:value="item.id"> />
</el-option> </el-form-item>
</el-select> <el-form-item label="单次时长" prop="singleDuration">
<el-input
v-model="queryParams.singleDuration"
clearable
placeholder="请输入配置名称"
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="次卡金额" prop="secondaryCardAmount">--> <!-- <el-form-item label="次卡金额" prop="secondaryCardAmount">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.secondaryCardAmount"--> <!-- v-model="queryParams.secondaryCardAmount"-->
...@@ -121,8 +128,8 @@ ...@@ -121,8 +128,8 @@
<el-table-column align="center" label="配置名称" prop="name"/> <el-table-column align="center" label="配置名称" prop="name"/>
<el-table-column align="center" label="次卡金额" prop="secondaryCardAmount"/> <el-table-column align="center" label="次卡金额" prop="secondaryCardAmount"/>
<!-- <el-table-column label="套餐id" align="center" prop="packId" />--> <!-- <el-table-column label="套餐id" align="center" prop="packId" />-->
<el-table-column align="center" label="套餐名称" prop="packName"/> <el-table-column align="center" label="单次金额" prop="singleAmount"/>
<el-table-column align="center" label="套餐金额" prop="packPrice"/> <el-table-column align="center" label="单次时长" prop="singleDuration"/>
<el-table-column align="center" label="次卡有效期" prop="validityPeriod"/> <el-table-column align="center" label="次卡有效期" prop="validityPeriod"/>
<el-table-column align="center" label="次卡次数" prop="number"/> <el-table-column align="center" label="次卡次数" prop="number"/>
<!-- <el-table-column label="是否删除(0:否,1:是)" align="center" prop="isDelete" />--> <!-- <el-table-column label="是否删除(0:否,1:是)" align="center" prop="isDelete" />-->
...@@ -167,8 +174,13 @@ ...@@ -167,8 +174,13 @@
<el-input-number v-model="form.secondaryCardAmount" :max="999" :min="1"/> <el-input-number v-model="form.secondaryCardAmount" :max="999" :min="1"/>
<!-- <el-input v-model="form.secondaryCardAmount" placeholder="请输入次卡金额" />--> <!-- <el-input v-model="form.secondaryCardAmount" placeholder="请输入次卡金额" />-->
</el-form-item> </el-form-item>
<el-form-item label="套餐id" prop="packId"> <el-form-item label="单次时长" prop="singleDuration">
<el-input v-model="form.packId" placeholder="请输入套餐id"/> <el-input-number v-model="form.singleDuration" :max="999" :min="1"/>
<!-- <el-input v-model="form.validityPeriod" placeholder="请输入次卡有效期" />-->
</el-form-item>
<el-form-item label="单次金额" prop="singleAmount">
<el-input-number v-model="form.singleAmount" :max="999" :min="1"/>
<!-- <el-input v-model="form.validityPeriod" placeholder="请输入次卡有效期" />-->
</el-form-item> </el-form-item>
<el-form-item label="次卡有效期" prop="validityPeriod"> <el-form-item label="次卡有效期" prop="validityPeriod">
<el-input-number v-model="form.validityPeriod" :max="999" :min="1"/> <el-input-number v-model="form.validityPeriod" :max="999" :min="1"/>
...@@ -236,6 +248,8 @@ export default { ...@@ -236,6 +248,8 @@ export default {
validityPeriod: null, validityPeriod: null,
number: null, number: null,
isDelete: null, isDelete: null,
singleDuration: null,
singleAmount: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -244,9 +258,6 @@ export default { ...@@ -244,9 +258,6 @@ export default {
secondaryCardAmount: [ secondaryCardAmount: [
{required: true, message: "次卡金额不能为空", trigger: "blur"} {required: true, message: "次卡金额不能为空", trigger: "blur"}
], ],
packId: [
{required: true, message: "套餐id不能为空", trigger: "blur"}
],
number: [ number: [
{required: true, message: "次卡次数不能为空", trigger: "blur"} {required: true, message: "次卡次数不能为空", trigger: "blur"}
], ],
......
...@@ -135,8 +135,6 @@ ...@@ -135,8 +135,6 @@
<!-- <el-table-column label="套餐id" align="center" prop="packId" />--> <!-- <el-table-column label="套餐id" align="center" prop="packId" />-->
<el-table-column align="center" label="次卡名称" prop="confName"/> <el-table-column align="center" label="次卡名称" prop="confName"/>
<el-table-column align="center" label="次卡金额" prop="confAmount"/> <el-table-column align="center" label="次卡金额" prop="confAmount"/>
<el-table-column align="center" label="套餐名称" prop="packName"/>
<el-table-column align="center" label="套餐金额" prop="packPrice"/>
<el-table-column align="center" label="使用次数" prop="usageCount"/> <el-table-column align="center" label="使用次数" prop="usageCount"/>
<el-table-column align="center" label="剩余次数" prop="residueCount"/> <el-table-column align="center" label="剩余次数" prop="residueCount"/>
<!-- <el-table-column label="删除标记:1-删除,0-正常" align="center" prop="isDelete" />--> <!-- <el-table-column label="删除标记:1-删除,0-正常" align="center" prop="isDelete" />-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment