03/03 14:24

11

src/App.vue

@@ -294,4 +294,12 @@ input[type="number"] {
   color: #333;
   opacity: 1;
 }
+// 取消双击选中文字
+div{
+    -moz-user-select:none;/*火狐*/
+    -webkit-user-select:none;/*webkit浏览器*/
+    -ms-user-select:none;/*IE10*/
+    -khtml-user-select:none;/*早期浏览器*/
+      user-select:none;
+}
 </style>

src/views/accompanyManager/accompanys.vue

@@ -4,15 +4,19 @@
       <el-page-header @back="goBack" :content="name"></el-page-header>
     </h2>
     <!--   v-permission="'vipGroupManage/updateVipBaseInfo'" -->
-    <div
-      class="newBand"
-      @click="resetTeachers"
-      v-permission="'courseSchedule/practiceGroupTeacherAdjust'"
-    >修改老师</div>
+    <div class="wrap">
+      <div
+        class="newBand"
+        @click="resetTeachers"
+        v-permission="'courseSchedule/practiceGroupTeacherAdjust'"
+      >修改老师</div>
+      <!-- <div class="newBand" @click="adjustment">批量调整</div> -->
+    </div>
+
     <div class="tableWrap">
       <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <!-- @selection-change="handleSelectionChange" -->
-        <!-- <el-table-column type="selection" :selectable="isDisabled" width="55"></el-table-column> -->
+        <el-table-column type="selection" :selectable="isDisabled" width="55"></el-table-column>
         <el-table-column label="课程编号" align="center" prop="id"></el-table-column>
         <el-table-column label="课程名称" align="center" prop="name"></el-table-column>
         <el-table-column label="主教老师" align="center" prop="teacherName"></el-table-column>
@@ -32,6 +36,9 @@
             <div>{{ scope.row.classDate | formatTimer}}</div>
           </template>
         </el-table-column>
+             <el-table-column label="是否点名" align="center" prop="status">
+          <template slot-scope="scope">{{ scope.row.isCallNames ? '是' : '否' }}</template>
+        </el-table-column>
         <el-table-column label="课程状态" align="center" prop="status">
           <template slot-scope="scope">
             <div>{{ scope.row.status | coursesStatus }}</div>
@@ -49,7 +56,7 @@
             <div>{{scope.row.schoolName?scope.row.schoolName:'网络教室'}}</div>
           </template>
         </el-table-column>-->
-        <el-table-column label="操作">
+        <el-table-column label="操作" width="180px">
           <template slot-scope="scope">
             <div>
               <el-button
@@ -91,7 +98,7 @@
             v-model.trim="maskForm.date"
             style="width:200px!important;"
             type="date"
-             :picker-options="courseOption"
+            :picker-options="courseOption"
             value-format="yyyy-MM-dd"
             placeholder="选择日期"
           ></el-date-picker>
@@ -101,7 +108,6 @@
             placeholder="起始时间"
             style="width:200px!important;"
             v-model.trim="startTime"
-            
             :picker-options="{
                             start: '08:30',
                             step: '00:30',
@@ -174,6 +180,86 @@
         <el-button type="primary" @click="subresetTeacher">确 定</el-button>
       </div>
     </el-dialog>
+     <!-- <el-dialog title="批量调整" width="800px" :visible.sync="adjustmentVisible">
+      <el-form
+        :model="adjustmentForm"
+        label-position="right"
+        label-width="120px"
+        ref="adjustmentForm"
+        :rules="adjustmentRules"
+        :inline="true"
+      >
+        <el-form-item label="已选择课时数" v-if="!isaddCourse">
+          <el-input disabled v-model.trim="adjustmentForm.count"></el-input>
+        </el-form-item>
+        <el-form-item label="添加课时数" prop="addCount" v-if="isaddCourse">
+          <el-input type="number" @mousewheel.native.prevent v-model.trim="adjustmentForm.addCount"></el-input>
+        </el-form-item>
+        <br />
+        <el-form-item label="单课费用" prop="fee" v-if="isaddCourse">
+          <el-input v-model.trim="adjustmentForm.fee"></el-input>
+        </el-form-item>
+        <br />
+        <el-form-item label="排课起始时间" prop="courseTime">
+          <el-date-picker
+            v-model.trim="adjustmentForm.courseTime"
+            :picker-options="pickerOptions"
+            style="width:200px!important;"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+          ></el-date-picker>
+          <el-checkbox style="margin-left:10px;" v-model.trim="adjustmentForm.checked">是否跳过节假日</el-checkbox>
+        </el-form-item>
+      </el-form>
+      <div class="WeekWrap">
+        <h3 style="margin-bottom:20px;">
+          循环次数
+          <el-button type="text" style="margin-left:10px;" @click="addWeek">添加</el-button>
+        </h3>
+        <div class="countWrap" style="margin-bottom:10px;">
+          <div
+            class="countItem"
+            style="margin-bottom:20px;"
+            v-for="(item,index) in weekList"
+            :key="index"
+          >
+            <span>循环周期:</span>
+            <el-select v-model.trim="item.dayOfWeek" filterable clearable>
+              <el-option
+                v-for="(item,index) in weekDateList"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+            <span style="margin-left:10px;">开始时间</span>
+            <el-time-select
+              style="margin-left:10px;"
+              placeholder
+              v-model.trim="item.startClassTime"
+              :picker-options="{
+                               start: '04:30',
+                               step: '00:05',
+                               end: '23:55'
+            }"
+            ></el-time-select>
+            <el-button
+              style="margin-left:10px;"
+              type="danger"
+              @click="removeWeek(item)"
+              icon="el-icon-delete"
+              circle
+            ></el-button>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="adjustmentVisible = false">取 消</el-button>
+        <el-button type="primary" v-if="!isaddCourse" @click="submitAdjustment">确 定</el-button>
+        <el-button type="primary" v-if="isaddCourse" @click="addCourseSubmit">确 定</el-button>
+      </div>
+    </el-dialog> -->
   </div>
 </template>
 <script>
@@ -192,6 +278,7 @@ export default {
   },
   data() {
     return {
+      adjustmentVisible:false,
       isMultiple: true,
       name: "网管课程组",
       courseVisible: false,
@@ -230,8 +317,8 @@ export default {
       teacherForm: {
         teacher: null
       },
-      courseOption:null,
-      coursesExpireDate:null
+      courseOption: null,
+      coursesExpireDate: null
     };
   },
   created() {
@@ -401,16 +488,42 @@ export default {
       return {
         disabledDate: time => {
           // if (self.leftForm.courseStart) {
-            // let date = new Date(self.leftForm.courseStart.replace(/-/, "/"));
-            // coursesExpireDate
-            let date = new Date(this.coursesExpireDate.replace(/-/, "/"))
-            
-            return time.getTime() > date.getTime();
+          // let date = new Date(self.leftForm.courseStart.replace(/-/, "/"));
+          // coursesExpireDate
+          let date = new Date(this.coursesExpireDate.replace(/-/, "/"));
+
+          return time.getTime() > date.getTime();
           // }
           // return;
         }
       };
+    },
+    // 是否允许批量调整
+     isDisabled(row, index) {
+       // || !row.isCallNames
+      if (row.isSettlement ) {
+        return false;
+      } else {
+        return true;
+      }
+    },
+    adjustment(){
+      if (this.adjustmentForm.count <= 0) {
+        this.$message.error("请至少勾选一节课");
+      } else {
+        this.adjustmentVisible = true;
+      }
     }
   }
 };
-</script>
+</script>
+<style lang="scss" scoped>
+  .wrap {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    div {
+      margin-right: 20px;
+    }
+  }
+</style>

src/views/vipClass/vipReset.vue

@@ -672,6 +672,7 @@ export default {
           obj.courseTimes = this.weekList;
           obj.holiday = this.adjustmentForm.checked;
           obj.teachMode = this.adjustmentForm.courseType || null;
+          obj.groupType = 'VIP';
           console.log(obj);
           obj.vipGroupId = this.vipid;
           vipCourseAdjust(obj).then(res => {