|
@@ -156,7 +156,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="缴费有效期结束"
|
|
|
prop="paymentValidEndDate"
|
|
|
- :rules="[{ required: !(teamStatus =='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit'), message: '请选择缴费有效期结束'},]">
|
|
|
+ :rules="[{ required: !(teamStatus =='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit' || topFrom.paymentPattern === 2), message: '请选择缴费有效期结束'},]">
|
|
|
<el-date-picker :disabled="teamStatus ==='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit' || topFrom.paymentPattern === 2"
|
|
|
v-model="topFrom.paymentValidEndDate"
|
|
|
:picker-options="beginDate(topFrom.paymentValidStartDate)"
|
|
@@ -1084,8 +1084,8 @@ export default {
|
|
|
enrollClasses: this.topFrom.startClass.join(","),
|
|
|
name: this.topFrom.name,
|
|
|
paymentPattern: this.topFrom.paymentPattern,
|
|
|
- paymentValidStartDate: this.topFrom.paymentValidStartDate,
|
|
|
- paymentValidEndDate: this.topFrom.paymentValidEndDate,
|
|
|
+ paymentValidStartDate: this.topFrom.paymentValidStartDate ? dayjs(this.topFrom.paymentValidStartDate).format('YYYY-MM-DD') : this.topFrom.paymentValidStartDate,
|
|
|
+ paymentValidEndDate: this.topFrom.paymentValidEndDate ? dayjs(this.topFrom.paymentValidEndDate).format('YYYY-MM-DD') : this.topFrom.paymentValidEndDate,
|
|
|
organId: this.topFrom.section,
|
|
|
// paymentMonths:obj.months 有待确认
|
|
|
schoolId: this.topFrom.address,
|
|
@@ -1324,4 +1324,4 @@ export default {
|
|
|
display: inline-block;
|
|
|
width: 180px;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|