1

dist/static/css/chunk-27d213b0.5fb79823.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-3ca14b0f.11615c1d.css
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-11567c78]{font-size:14px}.btnList[data-v-11567c78]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-11567c78]{margin-right:15px}
+=======
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-7a08b034]{font-size:14px}.btnList[data-v-7a08b034]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-7a08b034]{margin-right:15px}
+>>>>>>> master:dist/static/css/chunk-27d213b0.5fb79823.css

dist/static/css/chunk-3ca14b0f.11615c1d.css

@@ -1 +1,5 @@
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-11567c78]{font-size:14px}.btnList[data-v-11567c78]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-11567c78]{margin-right:15px}
+<<<<<<< HEAD:dist/static/css/chunk-3ca14b0f.11615c1d.css
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-11567c78]{font-size:14px}.btnList[data-v-11567c78]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-11567c78]{margin-right:15px}
+=======
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.select[data-v-7a08b034]{font-size:14px}.btnList[data-v-7a08b034]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-7a08b034]{margin-right:15px}
+>>>>>>> master:dist/static/css/chunk-27d213b0.5fb79823.css

dist/static/css/chunk-8c6aab84.f036280d.css

@@ -0,0 +1 @@
+[data-v-2c4330b1] .dialog-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}

src/views/resetTeaming/components/resetPayList.vue

@@ -202,17 +202,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>
@@ -499,9 +492,9 @@ export default {
       });
     },
     paymentPatternChange (val) {
-      if (val === 2) {
-        this.payForm.paymentValidEndDate = null;
-      }
+      // if (val === 2) {
+      //   this.payForm.paymentValidEndDate = null
+      // }
     },
     onCreateQRCode (row) { // 生成报名二维码
       this.qrcodeStatus = true

src/views/teamBuild/components/teamBaseInfo.vue

@@ -161,12 +161,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)"
@@ -663,10 +663,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 {