Explorar o código

修改缴费有效期验证方式

wolyshaw %!s(int64=4) %!d(string=hai) anos
pai
achega
1717ee88d4

+ 4 - 5
src/views/resetTeaming/components/resetPayList.vue

@@ -168,11 +168,10 @@
                           placeholder="有效期开始日期"></el-date-picker>
         </el-form-item>
         <el-form-item label="缴费有效期结束"
-                      :rules="[{ required: payForm.paymentPattern !== 2, message: '请设置缴费有效期结束日期',trigger: 'blur'}]"
+                      :rules="[{ required: true, message: '请设置缴费有效期结束日期',trigger: 'blur'}]"
                       prop="paymentValidEndDate">
           <el-date-picker v-model.trim="payForm.paymentValidEndDate"
                           type="date"
-                          :disabled="payForm.paymentPattern === 2"
                           :picker-options="beginDate(payForm.paymentValidStartDate)"
                           value-format="yyyy-MM-dd"
                           placeholder="有效期结束日期"></el-date-picker>
@@ -321,9 +320,9 @@ export default {
       })
     },
     paymentPatternChange (val) {
-      if (val === 2) {
-        this.payForm.paymentValidEndDate = null
-      }
+      // if (val === 2) {
+      //   this.payForm.paymentValidEndDate = null
+      // }
     },
     onCreateQRCode () { // 生成报名二维码
       this.qrcodeStatus = true

+ 6 - 6
src/views/teamBuild/components/teamBaseInfo.vue

@@ -164,12 +164,12 @@
                       prop="paymentValidEndDate"
                       :rules="[
             {
-              required: !(isNotEditing() || topFrom.paymentPattern === 2),
+              required: !(isNotEditing()),
               message: '请选择缴费有效期结束',
             },
           ]">
           <el-date-picker :disabled="
-              isNotEditing() || topFrom.paymentPattern === 2 || basdisabled || !topFrom.paymentValidStartDate
+              isNotEditing() || basdisabled || !topFrom.paymentValidStartDate
             "
                           v-model="topFrom.paymentValidEndDate"
                           :picker-options="beginDate(topFrom.paymentValidStartDate)"
@@ -728,10 +728,10 @@ export default {
       }
     },
     changePaymentPattern (val) {
-      if (val === 2) {
-        // this.topFrom.paymentValidStartDate = null
-        this.$set(this.topFrom, 'paymentValidEndDate', '')
-      }
+      // if (val === 2) {
+      //   // this.topFrom.paymentValidStartDate = null
+      //   this.$set(this.topFrom, 'paymentValidEndDate', '')
+      // }
     },
     beginDate (end) {
       return {