吴树波 1 týždeň pred
rodič
commit
33abee5c6f

+ 29 - 29
src/views/course/userCoursePeriod/index.vue

@@ -289,28 +289,6 @@
           >
           </el-date-picker>
         </el-form-item>
-
-<!--        <el-form-item label="看课时间" prop="timeRange">-->
-<!--          <el-time-picker-->
-<!--            is-range-->
-<!--            v-model="form.timeRange"-->
-<!--            @input="$forceUpdate()"-->
-<!--            range-separator="至"-->
-<!--            start-placeholder="开始时间"-->
-<!--            value-format="HH:mm:ss"-->
-<!--            end-placeholder="结束时间"-->
-<!--            placeholder="选择时间范围">-->
-<!--          </el-time-picker>-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="领取红包时间" prop="lastJoinTime">-->
-<!--          <el-time-picker-->
-<!--            v-model="form.lastJoinTime"-->
-<!--            :selectableRange="form.lastJoinTime"-->
-<!--            value-format="HH:mm:ss"-->
-<!--            placeholder="选择时间范围">-->
-<!--          </el-time-picker>-->
-<!--          <p style="color: red;margin: 0;font-size: 12px">超过领取红包时间,只允许看课,不允许领取红包</p>-->
-<!--        </el-form-item>-->
       </el-form>
       <div class="drawer-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -380,6 +358,29 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="看课时间" prop="timeRange">
+          <el-time-picker
+            is-range
+            v-model="course.form.timeRange"
+            :picker-options="{
+              selectableRange: '00:00:00 - 23:59:59'
+            }"
+            range-separator="至"
+            start-placeholder="开始时间"
+            value-format="HH:mm:ss"
+            format="HH:mm:ss"
+            end-placeholder="结束时间">
+          </el-time-picker>
+        </el-form-item>
+        <el-form-item label="领取红包时间" prop="lastJoinTime">
+          <el-time-picker
+            v-model="course.form.joinTime"
+            value-format="HH:mm:ss"
+            format="HH:mm:ss"
+            placeholder="选择时间范围">
+          </el-time-picker>
+          <p style="color: red;margin: 0;font-size: 12px">超过领取红包时间,只允许看课,不允许领取红包</p>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitCourseForm">确 定</el-button>
@@ -402,12 +403,8 @@
         <el-form-item label="领取红包时间" prop="lastJoinTime">
           <el-time-picker
             v-model="updateCourse.form.joinTime"
-            :selectableRange="updateCourse.form.timeRange"
             value-format="HH:mm:ss"
             format="HH:mm:ss"
-            :picker-options="{
-              selectableRange: updateCourse.form.timeRange || '00:00:00 - 23:59:59'
-            }"
             placeholder="选择时间范围">
           </el-time-picker>
           <p style="color: red;margin: 0;font-size: 12px">超过领取红包时间,只允许看课,不允许领取红包</p>
@@ -559,6 +556,7 @@ import { courseList,videoList } from '@/api/course/courseRedPacketLog'
 import RedPacket from './redPacket.vue'
 import BatchRedPacket from './batchRedPacket.vue'
 import CourseStatistics from './statistics.vue'
+import Da from "element-ui/src/locale/lang/da";
 
 export default {
   name: "Period",
@@ -1191,8 +1189,6 @@ export default {
       if(type == 1){
         this.form.periodStartingTime = this.form.dateRange[0];
         this.form.periodEndTime = this.form.dateRange[1];
-
-
          // 转换为天数
         let days = this.getDiff(this.form.periodStartingTime, this.form.periodEndTime);
         for (let i = 0; i < days; i++) {
@@ -1250,6 +1246,8 @@ export default {
       this.course.form = {
         periodId: this.course.queryParams.periodId,
         courseId: null,
+        timeRange: null,
+        joinTime: null,
         videoIds: []
       };
       // 重置表单
@@ -1263,7 +1261,7 @@ export default {
       this.updateCourse.open = true;
       this.updateCourse.form = {
         ids: this.updateCourse.ids,
-        timeRange: [], // 初始化timeRange
+        timeRange: null, // 初始化timeRange
         joinTime: null // 初始化joinTime
       };
     },
@@ -1272,6 +1270,8 @@ export default {
       this.course.form = {
         periodId: null,
         courseId: null,
+        timeRange: null,
+        joinTime: null,
         videoIds: []
       };
       // 重置表单

+ 14 - 3
src/views/qw/sopTemp/index.vue

@@ -239,7 +239,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="课程" prop="courseId" v-if="form.sendType == 5 && !form.id">
+        <el-form-item label="课程" prop="courseId" v-if="form.sendType == 11 && !form.id">
           <el-select v-model="form.courseId" placeholder="请选择课程" style=" margin-right: 10px;" size="mini"
                      filterable>
             <el-option
@@ -250,16 +250,26 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="发课时间" prop="time" v-if="form.sendType == 11 && !form.id">
+          <el-time-picker
+            class="custom-input"
+            v-model="form.time"
+            value-format="HH:mm"
+            format="HH:mm"
+            placeholder="时间"
+            style="width: 100px;height: 20px;margin-left: 10px;margin-top: 10px">
+          </el-time-picker>
+        </el-form-item>
         <el-form-item label="间隔天数" prop="gap">
           <el-input-number v-model="form.gap" :min="1" label="间隔天数"></el-input-number>
         </el-form-item>
         <el-form-item label="排序" prop="sort">
           <el-input-number v-model="form.sort" :min="0" label="排序"></el-input-number>
         </el-form-item>
-        <el-form-item label="每天发送次数" prop="num" v-if="form.sendType == 5 && !form.id">
+        <el-form-item label="每天发送次数" prop="num" v-if="form.sendType == 11 && !form.id">
           <el-input-number v-model="form.num" :min="1" label="每天发送次数" @change="sendNumChange"></el-input-number>
         </el-form-item>
-        <el-form-item label="发送时间" v-if="form.sendType == 5 && !form.id">
+        <el-form-item label="发送时间" v-if="form.sendType == 11 && !form.id">
           <el-time-picker
             v-for="item in form.timeList"
             class="custom-input"
@@ -451,6 +461,7 @@ export default {
     reset() {
       this.form = {
         gap: 1,
+        time: null,
         sendType: this.sendType,
         sort: 0,
         num: 1,

+ 15 - 15
src/views/qw/sopTemp/updateSopTemp.vue

@@ -51,8 +51,8 @@
                         <el-input :disabled="formType == 3" v-model="item.name"
                                   placeholder="内容名称,仅内部可见"/>
                       </el-form-item>
-                      <el-form-item label="课程" v-if="form.sendType == 5 && item.content && item.content.length > 0" required>
-                        <el-select :disabled="(formType == 3 || form.sendType == 5) && item.id != null" v-model="item.content[0].courseId"
+                      <el-form-item label="课程" v-if="form.sendType == 11 && item.content && item.content.length > 0" required>
+                        <el-select :disabled="(formType == 3 || form.sendType == 11) && item.id != null" v-model="item.content[0].courseId"
                                    placeholder="请选择课程" style=" margin-right: 10px;" size="mini" remote
                                    filterable
                                    @change="courseChangeUpdate(item.content[0], index, 0)">
@@ -63,7 +63,7 @@
                             :value="parseInt(dict.dictValue)"
                           />
                         </el-select>
-                        <el-select :disabled="(formType == 3 || form.sendType == 5) && item.id != null" v-model="item.content[0].videoId"
+                        <el-select :disabled="(formType == 3 || form.sendType == 11) && item.id != null" v-model="item.content[0].videoId"
                                    placeholder="请选择小节" size="mini" style=" margin-right: 10px;" remote
                                    filterable
                                    @change="videoIdChange(item.content[0],index,0)">
@@ -141,7 +141,7 @@
                                   </el-radio-group>
                                 </el-form-item>
                                 <el-form-item label="课程" v-if="content.type == 2 && form.sendType != 5" required>
-                                  <el-select :disabled="formType == 3 || form.sendType == 5" v-model="content.courseId"
+                                  <el-select :disabled="formType == 3 || form.sendType == 11" v-model="content.courseId"
                                              placeholder="请选择课程" style=" margin-right: 10px;" size="mini" remote
                                              filterable
                                              @change="courseChangeUpdate(content,index,contentIndex)">
@@ -152,7 +152,7 @@
                                       :value="parseInt(dict.dictValue)"
                                     />
                                   </el-select>
-                                  <el-select :disabled="formType == 3 || form.sendType == 5" v-model="content.videoId"
+                                  <el-select :disabled="formType == 3 || form.sendType == 11" v-model="content.videoId"
                                              placeholder="请选择小节" size="mini" style=" margin-right: 10px;" remote
                                              filterable
                                              @change="videoIdChange(content,index,contentIndex)">
@@ -272,9 +272,9 @@
                                               </el-radio>
                                             </el-radio-group>
                                           </div>
-                                          <div v-if="form.sendType == 5">
+                                          <div v-if="form.sendType == 11">
                                             <el-radio-group v-model="setList.contentType"
-                                                            :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)"
+                                                            :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)"
                                                             @change="handleContentTypeChange(content,index,contentIndex,setIndex, item, 'contentType', $event)">
                                               <el-radio
                                                 :key="item.dictValue"
@@ -312,20 +312,20 @@
                                             v-if="setList.contentType == 3  || (setList.contentType == 9 && content.type==2 )">
                                             <el-card class="box-card">
                                               <el-form-item label="链接标题:" label-width="100px" required>
-                                                <el-input :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)" v-model="setList.linkTitle"
+                                                <el-input :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)" v-model="setList.linkTitle"
                                                           @change="updateAll(setIndex, item, 'linkTitle', $event)"
                                                           placeholder="请输入链接标题"
                                                           style="width: 90%;"/>
                                               </el-form-item>
                                               <el-form-item label="链接描述:" label-width="100px" required>
-                                                <el-input :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)" type="textarea" :rows="3"
+                                                <el-input :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)" type="textarea" :rows="3"
                                                           v-model="setList.linkDescribe"
                                                           @change="updateAll(setIndex, item, 'linkDescribe', $event)"
                                                           placeholder="请输入链接描述"
                                                           style="width: 90%;margin-top: 1%;"/>
                                               </el-form-item>
                                               <el-form-item label="链接封面:" label-width="100px" required>
-                                                <ImageUpload :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)" v-model="setList.linkImageUrl"
+                                                <ImageUpload :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)" v-model="setList.linkImageUrl"
                                                              type="image" :num="1"
                                                              @input="updateAll(setIndex, item, 'linkImageUrl', $event)"
                                                              :file-size="2" :width="150" :height="150"
@@ -352,7 +352,7 @@
                                             <el-card class="box-card">
                                               <el-form-item label="标题" prop="miniprogramTitle">
                                                 <el-input v-model="setList.miniprogramTitle"
-                                                          :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)"
+                                                          :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)"
                                                           @change="updateAll(setIndex, item, 'miniprogramTitle', $event)"
                                                           placeholder="请输入小程序消息标题,最长为64字节" :rows="2"
                                                           maxlength="64" type="textarea"
@@ -361,7 +361,7 @@
                                               <el-form-item label="封面" prop="miniprogramPicUrl">
                                                 <ImageUpload v-if="content.isOfficial !== '1'"
                                                              @change="updateAll(setIndex, item, 'miniprogramPicUrl', $event)"
-                                                             :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)"
+                                                             :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)"
                                                              v-model="setList.miniprogramPicUrl" type="image" :num="10"
                                                              :width="150" :height="150"/>
                                               </el-form-item>
@@ -519,7 +519,7 @@
                                                       v-if="content.type == 2 && setList.isBindUrl == '1' && setList.contentType != 2  && setList.contentType != 5  && setList.contentType != 6 && setList.contentType != 8 && setList.contentType != 9 && setList.contentType != 10  ">
                                           <el-row>
                                             <el-input type="number" v-model="setList.expiresDays"
-                                                      :disabled="formType == 3 || (form.sendType == 5 && contentIndex != 0 && setIndex == 0)"
+                                                      :disabled="formType == 3 || (form.sendType == 11 && contentIndex != 0 && setIndex == 0)"
                                                       @change="updateAll(setIndex, item, 'expiresDays', $event)"
                                                       style="width: 200px">
                                               <template slot="append">天</template>
@@ -566,7 +566,7 @@
                                     <el-col :span="1" :offset="1">
                                       <i class="el-icon-delete" @click="delSetList(index,contentIndex,setIndex)"
                                          style="margin-top: 20px;"
-                                         v-if="content.setting.length>1 && formType != 3 && !(form.sendType == 5 && setIndex == 0)"></i>
+                                         v-if="content.setting.length>1 && formType != 3 && !(form.sendType == 11 && setIndex == 0)"></i>
                                     </el-col>
                                   </el-row>
                                 </div>
@@ -1729,7 +1729,7 @@ export default {
 
     },
     updateAll(setIndex, list, fieldName, newVal) {
-      if(this.form.sendType == 5 && setIndex == 0) {
+      if(this.form.sendType == 11 && setIndex == 0) {
         console.info("更新数据", newVal)
         for (let index in list.content) {
           this.$set(list.content[index].setting[0], fieldName, newVal);