Browse Source

05/28 17:13

111
mo 5 years ago
parent
commit
260fa38e8a

+ 2 - 2
src/views/resetTeaming/components/resetPayList.vue

@@ -327,9 +327,9 @@ export default {
       return {
         disabledDate (time) {
           if (self.payForm.startPaymentDate) {
-            return new Date(self.payForm.startPaymentDate).getTime() > time.getTime()
+            return new Date(self.payForm.startPaymentDate).getTime() - 86400000 >= time.getTime()
           } else {
-            return time.getTime() >= Date.now()
+            return time.getTime() + 86400000 < Date.now()
             //开始时间不选时,结束时间最大值小于等于当天
           }
         }

+ 6 - 5
src/views/resetTeaming/index.vue

@@ -21,16 +21,17 @@
                      name="2">
           <resetSound v-if="activeIndex == 2" />
         </el-tab-pane>
-        <el-tab-pane label="缴费设置"
-                     v-if="permission('/resetTeaming/resetPayList')"
-                     name="3">
-          <resetPayList v-if="activeIndex == 3" />
-        </el-tab-pane>
         <el-tab-pane label="学员缴费设置"
                      v-if="permission('/resetTeaming/studentPayBase')"
                      name="4">
           <studentPayBase v-if="activeIndex == 4" />
         </el-tab-pane>
+        <el-tab-pane label="缴费设置"
+                     v-if="permission('/resetTeaming/resetPayList')"
+                     name="3">
+          <resetPayList v-if="activeIndex == 3" />
+        </el-tab-pane>
+
         <el-tab-pane label="班级调整"
                      v-if="permission('/resetTeaming/resetClass')"
                      name="5">

+ 1 - 2
src/views/teamBuild/components/teamBaseInfo.vue

@@ -92,8 +92,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="维修技师"
-                      prop="repairUserId"
-                      :rules="[{ required: true, message: '维修技师不能为空'},]">
+                      prop="repairUserId">
           <el-select v-model.trim="topFrom.repairUserId"
                      :disabled="!topFrom.section"
                      filterable