11

11

src/views/teamBuild/components/teamBaseInfo.vue

@@ -126,45 +126,42 @@
                           }"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
-        <el-form-item
-                      label="缴费方式"
+        <el-form-item label="缴费方式"
                       prop="paymentPattern"
                       @change="changePaymentPattern"
-                      :rules="[{ required: true, message: '请选择缴费方式'},]">
-                      <el-select placeholder="缴费方式"
-                                  :disabled="teamStatus ==='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit'"
-                                  clearable
-                                  filterable
-                                  v-model.trim="topFrom.paymentPattern">
-                                  <el-option :value="0"
-                                              label="按月"></el-option>
-                                  <el-option :value="1"
-                                              label="按季"></el-option>
-                                  <el-option :value="2"
-                                              label="一次性"></el-option>
-                      </el-select>
+                      :rules="[{ required: !(teamStatus =='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit'), message: '请选择缴费方式'},]">
+          <el-select placeholder="缴费方式"
+                     :disabled="teamStatus ==='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit'"
+                     clearable
+                     filterable
+                     v-model.trim="topFrom.paymentPattern">
+            <el-option :value="0"
+                       label="按月"></el-option>
+            <el-option :value="1"
+                       label="按季"></el-option>
+            <el-option :value="2"
+                       label="一次性"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="缴费有效期开始"
                       prop="paymentValidStartDate"
-                      :rules="[{ required: true, message: '请选择缴费有效期开始'},]">
-                      <el-date-picker
-                        :disabled="teamStatus ==='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit'"
-                        v-model="topFrom.paymentValidStartDate"
-                        placeholder="开始日期"
-                        :picker-options="{
+                      :rules="[{ required: !(teamStatus =='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit'), message: '请选择缴费有效期开始'},]">
+          <el-date-picker :disabled="teamStatus ==='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit'"
+                          v-model="topFrom.paymentValidStartDate"
+                          placeholder="开始日期"
+                          :picker-options="{
                           firstDayOfWeek:1
                         }">
-                      </el-date-picker>
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="缴费有效期结束"
                       prop="paymentValidEndDate"
-                      :rules="[{ required: true, message: '请选择缴费有效期结束'},]">
-                      <el-date-picker
-                        :disabled="teamStatus ==='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit' || topFrom.paymentPattern === 2"
-                        v-model="topFrom.paymentValidEndDate"
-                        :picker-options="beginDate(topFrom.paymentValidStartDate)"
-                        placeholder="结束日期">
-                      </el-date-picker>
+                      :rules="[{ required: !(teamStatus =='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit'), message: '请选择缴费有效期结束'},]">
+          <el-date-picker :disabled="teamStatus ==='resetTeam' || teamStatus === 'teamDraft' || teamStatus === 'teamAudit' || topFrom.paymentPattern === 2"
+                          v-model="topFrom.paymentValidEndDate"
+                          :picker-options="beginDate(topFrom.paymentValidStartDate)"
+                          placeholder="结束日期">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="招生年级"
                       prop="startClass"
@@ -633,7 +630,7 @@ export default {
     changeFeeType (val) {
       console.log(val == "ONLINE")
     },
-    changePaymentPattern(val) {
+    changePaymentPattern (val) {
       if (val === 2) {
         this.topFrom.paymentValidEndDate = null
       }
@@ -1169,18 +1166,6 @@ export default {
 }
 </script>
 <style lang="scss" >
-/deep/.el-date-editor {
-  width: 180px !important;
-}
-/deep/.el-checkbox {
-  margin-left: 15px !important;
-}
-/deep/.el-input {
-  position: relative;
-  font-size: 14px;
-  display: inline-block;
-  width: 180px;
-}
 .base-container {
   overflow: auto;
   // display: flex;
@@ -1326,3 +1311,17 @@ export default {
   }
 }
 </style>
+<style lang="scss" scoped>
+/deep/.el-date-editor {
+  width: 180px !important;
+}
+/deep/.el-checkbox {
+  margin-left: 15px !important;
+}
+/deep/.el-input {
+  position: relative;
+  font-size: 14px;
+  display: inline-block;
+  width: 180px;
+}
+</style>

src/views/teamBuild/components/teamSoundMoney.vue

@@ -1877,12 +1877,6 @@ export default {
       let coursePrice = Number(mgs)
       let csi = this.checkfor;
       let newStudent = this.newStudentfor
-      const sbaseInfo = newStudent.baseInfo
-      if (sbaseInfo.ischeck && sbaseInfo.isStatus) {
-        const value = Number(parseFloat(sbaseInfo.nowValue ? sbaseInfo.nowValue : 0))
-        marketPrice += value;
-        amount += Number(parseFloat(sbaseInfo.value ? sbaseInfo.value : 0))
-      }
       // 加上判断是否有课程信息
       const sbaseInfo = newStudent.baseInfo
       if (sbaseInfo.ischeck && sbaseInfo.isStatus) {
@@ -1892,9 +1886,7 @@ export default {
       }
       if (mgs) {
         // console.log(csi)
-        // amount += parseFloat(mgs);s
-
-
+        // amount += parseFloat(mgs);
         const allInfo = csi.allInfo
         if (allInfo.ischeck) {
           const value = Number(parseFloat(allInfo.value ? allInfo.value : 0))