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

bug

Browse Source
This commit is contained in:
cun-nan 2024-03-11 11:36:07 +08:00
parent 4233e5bdf1
commit 4dbf96ae32
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,7 +246,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.memberDayType=='1'" prop="monthDay"> <el-form-item v-if="form.memberDayType=='1'" prop="monthDay">
<el-checkbox-group v-model="monthDay" @change="changeMonth"> <el-checkbox-group v-model="monthDay" @change="changeMonth">
<el-checkbox v-for="item in 31" :key="item" :label="item">{{item}}日</el-checkbox> <el-checkbox v-for="item in 31" :key="item" :label="item+''">{{item}}日</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item v-if="form.memberDayType=='2'" prop="weekDay"> <el-form-item v-if="form.memberDayType=='2'" prop="weekDay">

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

@ -234,7 +234,7 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.memberDayType=='1'" prop="monthDay"> <el-form-item v-if="form.memberDayType=='1'" prop="monthDay">
<el-checkbox-group v-model="monthDay"> <el-checkbox-group v-model="monthDay">
<el-checkbox v-for="item in 31" :key="item" :label="item">{{item}}日</el-checkbox> <el-checkbox v-for="item in 31" :key="item" :label="item+''">{{item}}日</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item v-if="form.memberDayType=='2'" prop="weekDay"> <el-form-item v-if="form.memberDayType=='2'" prop="weekDay">
@ -392,6 +392,9 @@ export default {
naturalUserLevel:[ naturalUserLevel:[
{ required: true, message: '不能为空', trigger: 'change' } { required: true, message: '不能为空', trigger: 'change' }
], ],
memberDayType:[
{ required: true, message: '不能为空', trigger: 'change' }
],
participationCondition:[ participationCondition:[
{ required: true, message: '不能为空', trigger: 'change' } { required: true, message: '不能为空', trigger: 'change' }
], ],
@ -424,7 +427,6 @@ export default {
}, },
getoilName(){ getoilName(){
getoilName().then(res=>{ getoilName().then(res=>{
console.log(res)
this.oillist = res.data this.oillist = res.data
}) })
@ -533,20 +535,19 @@ export default {
this.reset(); this.reset();
const id = row.id || this.ids const id = row.id || this.ids
getActiveFullminus(id).then(response => { getActiveFullminus(id).then(response => {
console.log(response)
this.form = response.data; this.form = response.data;
if (response.data.activeDiscountChildList && response.data.activeDiscountChildList.length>0){ if (response.data.activeDiscountChildList && response.data.activeDiscountChildList.length>0){
this.activeDiscountChildList = response.data.activeDiscountChildList this.activeDiscountChildList = response.data.activeDiscountChildList
}else { }else {
this.activeDiscountChildList = [ {amount:'',deductionAmount:''}, ] this.activeDiscountChildList = [ {amount:'',deductionAmount:''}, ]
} }
if (this.form.monthDay){ if (response.data.monthDay){
this.monthDay = this.form.monthDay.split(",") this.monthDay = response.data.monthDay.split(",")
}else { }else {
this.monthDay = [] this.monthDay = []
} }
if (this.form.weekDay){ if (response.data.weekDay){
this.weekDay = this.form.weekDay.split(",") this.weekDay = response.data.weekDay.split(",")
}else { }else {
this.weekDay = [] this.weekDay = []
} }