|
@@ -367,7 +367,8 @@
|
|
|
|
|
|
<el-dialog title="开始缴费"
|
|
|
:visible.sync="paymentStatus"
|
|
|
- width="400px">
|
|
|
+ width="400px"
|
|
|
+ destroy-on-close>
|
|
|
<el-form ref="paymentForm"
|
|
|
class="paymentForm"
|
|
|
:model="paymentForm"
|
|
@@ -378,9 +379,7 @@
|
|
|
<el-date-picker v-model.trim="paymentForm.paymentExpireDate"
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
- :picker-options="{
|
|
|
- firstDayOfWeek:1
|
|
|
- }"
|
|
|
+ :picker-options="payDate()"
|
|
|
style="width: 100%"
|
|
|
placeholder="选择日期">
|
|
|
</el-date-picker>
|
|
@@ -706,7 +705,7 @@ export default {
|
|
|
if (this.$route.query.rules) {
|
|
|
this.Frules = this.$route.query.rules
|
|
|
}
|
|
|
- this.pickerOptions = this.beginDate();
|
|
|
+ this.pickerOptions = this.beginDate(new Date());
|
|
|
getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.applyExpireDate = res.data.musicGroup.applyExpireDate;
|
|
@@ -745,6 +744,8 @@ export default {
|
|
|
getTeamBaseInfo({ musicGroupId: this.id }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.applyExpireDate = res.data.musicGroup.applyExpireDate;
|
|
|
+ this.paymentExpireDate = res.data.musicGroup.paymentExpireDate;
|
|
|
+
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -798,6 +799,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
this.status = 'PAY'
|
|
|
+ this.paymentExpireDate = this.paymentForm.paymentExpireDate;
|
|
|
this.getList();
|
|
|
}
|
|
|
})
|
|
@@ -1216,12 +1218,12 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- beginDate () {
|
|
|
+ beginDate (date) {
|
|
|
let self = this;
|
|
|
return {
|
|
|
firstDayOfWeek: 1,
|
|
|
disabledDate (time) {
|
|
|
- return time.getTime() >= new Date().getTime(); //开始时间不选时,结束时间最大值小于等于当天
|
|
|
+ return time.getTime() >= date.getTime(); //开始时间不选时,结束时间最大值小于等于当天
|
|
|
}
|
|
|
};
|
|
|
},
|
|
@@ -1239,7 +1241,6 @@ export default {
|
|
|
},
|
|
|
applyDate () {
|
|
|
let self = this
|
|
|
-
|
|
|
return {
|
|
|
firstDayOfWeek: 1,
|
|
|
disabledDate (time) {
|
|
@@ -1252,6 +1253,20 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ payDate () {
|
|
|
+ let self = this
|
|
|
+ return {
|
|
|
+ firstDayOfWeek: 1,
|
|
|
+ disabledDate (time) {
|
|
|
+ if (self.applyExpireDate) {
|
|
|
+ return time.getTime() <= new Date(self.applyExpireDate.replace(/-/g, "/")).getTime()
|
|
|
+ } else {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
},
|
|
|
watch: {
|
|
|
orderVisible (val) {
|