dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11.20

Browse Source
This commit is contained in:
@QQNZX 2023-11-20 09:28:45 +08:00
parent 22ce14d906
commit a62eb32734
10 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -176,7 +176,7 @@
</el-radio-group>
</el-form-item>
<el-form-item label="会员等级" prop="region" v-if="form.groupOriented == '2' " >
<el-select v-model="form.membershipLevel" placeholder="请选择会员等级" >
<el-select v-model="form.membershipLevel" placeholder="会员等级" >
<el-option v-for="(item,index) in vipname" :key="index" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>

4
fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
View File

@ -321,8 +321,8 @@
placeholder="请选择活动结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="请选择会员等级" prop="dieselUserLevel" v-if="form.adaptUserType == 2" >
<el-select v-model="form.dieselUserLevel" multiple clearable placeholder="请选择会员等级">
<el-form-item label="会员等级" prop="dieselUserLevel" v-if="form.adaptUserType == 2" >
<el-select v-model="form.dieselUserLevel" multiple clearable placeholder="会员等级">
<el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" > </el-option>
</el-select>
</el-form-item>

4
fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
View File

@ -135,8 +135,8 @@
</el-checkbox-group>
</el-form-item>
<el-form-item label="请选择会员等级" prop="dieselUserLevel" >
<el-select v-model="form.dieselUserLevel" multiple clearable placeholder="请选择会员等级">
<el-form-item label="会员等级" prop="dieselUserLevel" >
<el-select v-model="form.dieselUserLevel" multiple clearable placeholder="会员等级">
<el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" > </el-option>
</el-select>
</el-form-item>

4
fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
View File

@ -141,8 +141,8 @@
<el-checkbox v-for="(item,index) in oillist" :label="item.id" :key="index">{{item.oilType}}{{item.oilName}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="请选择会员等级" prop="dieselUserLevel" >
<el-select v-model="form.dieselUserLevel" multiple clearable placeholder="请选择会员等级">
<el-form-item label="会员等级" prop="dieselUserLevel" >
<el-select v-model="form.dieselUserLevel" multiple clearable placeholder="会员等级">
<el-option :label="item.name" :value="item.id.toString()" v-for="(item,index) in userGradeList" :key="index" > </el-option>
</el-select>
</el-form-item>

20
fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
View File

@ -144,10 +144,6 @@
<!-- 添加或修改优惠券对话框 -->
<el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<!-- <el-form-item label="是否在线 0：在线 1： 下线" prop="isonline">-->
<!-- <el-input v-model="form.isonline" placeholder="请输入是否在线 0：在线 1： 下线" />-->
<!-- </el-form-item>-->
<el-form-item label="优惠券名称" prop="name">
<el-input v-model="form.name" placeholder="请输入优惠券名称" />
</el-form-item>
@ -186,7 +182,15 @@
</el-form-item>
<el-form-item label="生效日期" prop="timeType">
<el-radio-group v-model="form.timeType">
<el-radio label="0">领券后立即生效，有效期 <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityZero"><template slot="append">天</template></el-input></el-radio>
<!-- 0 -->
<el-radio label="0">
领券后立即生效，有效期
<el-input placeholder="有效天数" style="width: 200px" v-model="form.validityZero">
<template slot="append">天</template>
</el-input>
</el-radio>
<!-- 1 -->
<el-radio label="1">固定有效周期，固定开始日期 <el-date-picker
v-model="form.effectiveDate"
type="date"
@ -195,7 +199,11 @@
有效期
<el-input placeholder="有效天数" style="width: 200px" v-model="form.validityOne"><template slot="append">天</template></el-input>
</el-radio>
<el-radio label="2">领券后第 <el-input style="width: 200px" placeholder="1" v-model="form.validityDay"><template slot="append">天生效</template></el-input> 有效期 <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityTwo"><template slot="append">天</template></el-input></el-radio>
<!-- 2-->
<el-radio label="2">领券后第 <el-input style="width: 200px" placeholder="1" v-model="form.validityDay">
<template slot="append">天生效</template>
</el-input> 有效期 <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityTwo"><template slot="append">天</template></el-input>
</el-radio>
</el-radio-group>
</el-form-item>

2
fuintAdmin/src/views/member/index.vue
View File

@ -549,7 +549,7 @@ export default {
{ required: true, message: "会员名称不能为空", trigger: "blur" },
{ min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' }
],
gradeId: [{ required: true, message: "请选择会员等级", trigger: "blur" }],
gradeId: [{ required: true, message: "会员等级", trigger: "blur" }],
mobile: [
{ required: true, message: "请输入手机号", trigger: "blur" },
],

2
fuintAdmin/src/views/userGrade/index.vue
View File

@ -549,7 +549,7 @@ export default {
{ required: true, message: "请选择优惠类型", trigger: "blur" },
],
status: [
{ required: true, message: "请选择会员等级状态", trigger: "blur" },
{ required: true, message: "会员等级状态", trigger: "blur" },
],
discount: [
{ required: true, message: "请输入支付折扣", trigger: "blur" },

2
fuintCashier/src/renderer/views/cashier/components/memberList.vue
View File

@ -358,7 +358,7 @@ export default {
{ required: true, message: "会员名称不能为空", trigger: "blur" },
{ min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' }
],
gradeId: [{ required: true, message: "请选择会员等级", trigger: "blur" }]
gradeId: [{ required: true, message: "会员等级", trigger: "blur" }]
}
};
},

2
fuintCashierWeb/src/views/cashier/components/memberList.vue
View File

@ -358,7 +358,7 @@ export default {
{ required: true, message: "会员名称不能为空", trigger: "blur" },
{ min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' }
],
gradeId: [{ required: true, message: "请选择会员等级", trigger: "blur" }]
gradeId: [{ required: true, message: "会员等级", trigger: "blur" }]
}
};
},

2
fuintCashierWeb/src/views/cashier/vipComponents/vipList.vue
View File

@ -608,7 +608,7 @@
{ required: true, message: "会员名称不能为空", trigger: "blur" },
{ min: 2, max: 200, message: '会员名称长度必须介于2 和 100 之间', trigger: 'blur' }
],
gradeId: [{ required: true, message: "请选择会员等级", trigger: "blur" }],
gradeId: [{ required: true, message: "会员等级", trigger: "blur" }],
mobile: [
{ required: true, message: "请输入手机号", trigger: "blur" },
],