提交测试

1

src/views/accompanyManager/accompanys.vue

@@ -4,9 +4,9 @@
       <h2>
         <el-page-header @back="goBack" :content="name"></el-page-header>
       </h2>
-      <p style="margin-bottom: 10px; margin-left: 30px">
+      <!-- <p style="margin-bottom: 10px; margin-left: 30px">
         课程有效期:{{ timers }}
-      </p>
+      </p> -->
     </div>
 
     <!--   v-permission="'vipGroupManage/updateVipBaseInfo'" -->
@@ -39,7 +39,7 @@
         批量调整
       </div>
 
-      <div
+      <!-- <div
         class="newBand"
         v-permission="'courseSchedule/updateCoursesExpireDate'"
         @click="onUpdateCourse(1)"
@@ -52,7 +52,7 @@
         @click="onUpdateCourse(2)"
       >
         有效期调整
-      </div>
+      </div> -->
     </div>
 
     <div class="tableWrap">
@@ -216,7 +216,7 @@
                   :page-sizes="rules.page_size"
                   @pagination="getList" /> 乔乔说后台没有分页所以一口气都展示-->
     </div>
-    <el-dialog
+    <!-- <el-dialog
       :title="updateCourseStatus == 2 ? '有效期调整' : '有效期调整(高权限)'"
       width="400px"
       :before-close="expireClose"
@@ -259,7 +259,7 @@
         <el-button @click="expireVisible = false">取 消</el-button>
         <el-button type="primary" @click="submitExpireDate">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
     <el-dialog
       title="补考勤"
       width="400px"
@@ -608,21 +608,21 @@
         >
           <template slot-scope="scope">
             <el-button
-              
+
               @click="onChangeRollCall('TRUANT', scope.row)"
               type="primary"
               round
               >未到</el-button
             >
             <el-button
-              
+
               @click="onChangeRollCall('LEAVE', scope.row)"
               type="warning"
               round
               >请假</el-button
             >
             <el-button
-              
+
               @click="onChangeRollCall('NORMAL', scope.row)"
               type="success"
               round
@@ -1231,16 +1231,21 @@ export default {
           // coursesExpireDate
           let dayjs = this.$helpers.dayjs;
           let nowDate = dayjs(new Date()).valueOf() - 24 * 60 * 60 * 1000;
-          let coursesStartDate = dayjs(
-            this.expireForm.coursesStartDate
-          ).valueOf();
-          let coursesExpireDate = dayjs(
-            this.expireForm.coursesExpireDate
-          ).valueOf();
-          let startTime =
-            coursesStartDate - nowDate > 0 ? coursesStartDate : nowDate;
+
+          // let coursesStartDate = dayjs(
+          //   this.expireForm.coursesStartDate
+          // ).valueOf();
+          // let coursesExpireDate = dayjs(
+          //   this.expireForm.coursesExpireDate
+          // ).valueOf();
+          // let startTime =
+          //   coursesStartDate - nowDate > 0 ? coursesStartDate : nowDate;
+          // || time.getTime() > coursesExpireDate
+
+
+            let startTime = nowDate
           return (
-            time.getTime() < startTime || time.getTime() > coursesExpireDate
+            time.getTime() < startTime
           );
           // }
           // return;

src/views/businessManager/shopManager/shopOperation.vue

@@ -174,11 +174,11 @@
           class="alert"
           type="info"
         />
-        <el-form-item label="学员可见分部" prop="studentShowOrganId">
+        <el-form-item label="学生端APP销售分部" prop="studentShowOrganId">
           <select-all
             v-model.trim="form.studentShowOrganId"
             filterable
-            placeholder="请选择所属分部"
+            placeholder="请选择分部"
             style="width: 400px !important"
             multiple
             :disabled="pageDisabled"
@@ -192,11 +192,11 @@
             ></el-option>
           </select-all>
         </el-form-item>
-        <el-form-item label="管理端可见分部" prop="educationShowOrganId">
+        <el-form-item label="管理端APP销售分部" prop="educationShowOrganId">
           <select-all
             v-model.trim="form.educationShowOrganId"
             filterable
-            placeholder="请选择所属分部"
+            placeholder="请选择分部"
             style="width: 400px !important"
             multiple
             :disabled="pageDisabled "
@@ -210,11 +210,11 @@
             ></el-option>
           </select-all>
         </el-form-item>
-        <el-form-item label="课程&AMR可见分部" prop="courseFeeShowOrganId">
+        <el-form-item label="课程收费乐团销售分部" prop="courseFeeShowOrganId">
           <select-all
             v-model.trim="form.courseFeeShowOrganId"
             filterable
-            placeholder="请选择课程&AMR可见分部"
+            placeholder="请选择分部"
             style="width: 400px !important"
             multiple
             :disabled="pageDisabled"
@@ -228,11 +228,11 @@
             ></el-option>
           </select-all>
         </el-form-item>
-        <el-form-item label="会员收费团可见分部" prop="memberFeeShowOrganId">
+        <el-form-item label="会乐收费乐团销售分部" prop="memberFeeShowOrganId">
           <select-all
             v-model.trim="form.memberFeeShowOrganId"
             filterable
-            placeholder="请选择所属分部"
+            placeholder="请选择分部"
             style="width: 400px !important"
             multiple
             :disabled="pageDisabled"
@@ -246,7 +246,7 @@
             ></el-option>
           </select-all>
         </el-form-item>
-        <el-form-item label="参与置换可见分部" prop="replacementShowOrganId">
+        <el-form-item label="乐器置换销售分部" prop="replacementShowOrganId">
           <select-all
             v-model.trim="form.replacementShowOrganId"
             filterable

src/views/categroyManager/specialSetup/discountManage.vue

@@ -3,7 +3,7 @@
     <!-- <h2>折扣设置</h2> -->
     <div class="m-core">
       <save-form :inline="true"
-      
+
                @submit="search"
                @reset="onReSet"
                :saveKey="'discountManage'"
@@ -14,7 +14,7 @@
                      placeholder="请选择声部组合"
                      clearable>
             <el-option-group v-for="group in subjectList"
-                             :key="group.label"
+                             :key="group.id"
                              :label="group.label">
               <el-option v-for="item in group.options"
                          :key="item.value"
@@ -44,14 +44,14 @@
       </save-form>
       <el-button
        type="primary"
-       
+
        style="margin-bottom:20px;"
            v-permission="'chargeTypeSubjectMapper/insert'"
            @click="createVisible = true">添加</el-button>
       <!-- 列表 -->
       <div class="tableWrap">
         <el-table :data='tableList'
-        
+
                   :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column align='center'
                            prop="chargeTypeId"
@@ -120,7 +120,7 @@
                      placeholder="请选择声部组合"
                      clearable>
             <el-option-group v-for="group in subjectList"
-                             :key="group.label"
+                             :key="group.id"
                              :label="group.label">
               <el-option v-for="item in group.options"
                          :key="item.value"
@@ -152,7 +152,7 @@
     </el-dialog>
     <el-dialog :visible.sync="createVisible"
                title="添加商品折扣"
-               width="400px">
+               width="500px">
       <createDiscount @close="createVisible = false"
                       @submited="getList"
                       :typesList="typesList"
@@ -349,14 +349,15 @@ export default {
                 })
               })
             }
-
             tempArray[index] = {
               label: item.name,
+              id:item.id,
               options: subject
             }
           })
           this.subjectListById = subjectListById
           this.subjectList = tempArray
+
         }
       })
     }

src/views/categroyManager/specialSetup/modals/create-discount.vue

@@ -12,7 +12,7 @@
                    placeholder="请选择声部组合"
                    clearable>
           <el-option-group v-for="group in subjectList"
-                           :key="group.label"
+                           :key="group.id"
                            :label="group.label">
             <el-option v-for="item in group.options"
                        :key="item.value"
@@ -24,7 +24,7 @@
       </el-form-item>
       <el-form-item v-for="item in typesList"
                     :key="item.value"
-                    :label="item.label + '模式折扣(%)'"
+                    :label="item.label + '折扣(%)'"
                     :prop="`types.${item.value}`"
                     :label-width="formLabelWidth"
                     :rules="[
@@ -34,7 +34,7 @@
         <el-input v-model.trim="form.types[item.value]"
                   autocomplete="off"
                   type="number"
-                  placeholder="请输入折扣 0%-100%"
+                  placeholder="请输入折扣"
                   controls-position="right"
                   class="number-input"
                   min="0"

src/views/resetTeaming/modals/review-detail.vue

@@ -67,10 +67,10 @@
       :closable="false"
       class="alert"
       type="info"
-      v-if="course"
+      v-if="course && course.length > 0"
     >
     </el-alert>
-    <descriptions :column="3" v-if="course && course.length > 0">
+    <descriptions :column="3" v-if="course && course.length > 0&&course[0].name">
       <descriptions-item :span="2" label="收费标准：" v-if="course[0].name">{{
         course[0].name
       }}</descriptions-item>
@@ -268,7 +268,7 @@
     <el-table
       :data="activity"
       stripe
-      v-if="repair&&repair.calenderId"
+      v-if="activity&&activity.length>0"
       style="width: 100%; margin-top: 10px"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >