11/16 16:54

11

src/views/businessManager/shopManager/shopList.vue

@@ -53,6 +53,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
+          <el-select v-model.trim="searchForm.status"
+                     clearable
+                     placeholder="是否是上架">
+            <el-option label="是"
+                       value="1"></el-option>
+            <el-option label="否"
+                       value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
           <el-select v-model.trim="searchForm.groupGoods"
                      clearable
                      placeholder="是否是组合商品">
@@ -476,7 +486,8 @@ export default {
         type: null,
         goodsCategoryId: null,
         startTime: null,
-        endTime: null
+        endTime: null,
+        status: null
       },
       headers: {
         Authorization: getToken()

src/views/categroyManager/insideSetting/branchManager.vue

@@ -9,6 +9,10 @@
                class="searchForm"
                v-model.trim="searchForm">
         <el-form-item>
+          <el-input v-model="searchForm.search"
+                    placeholder="请输入合作单位名称"></el-input>
+        </el-form-item>
+        <el-form-item>
           <el-select v-model.trim="searchForm.organId"
                      placeholder="请选择分部"
                      filterable
@@ -174,10 +178,14 @@
           <el-input v-model.trim="form.mobileNo"
                     autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="是否全职资源" prop="fullJobResource" :label-width="formLabelWidth">
+        <el-form-item label="是否全职资源"
+                      prop="fullJobResource"
+                      :label-width="formLabelWidth">
           <el-select v-model.trim="form.fullJobResource">
-              <el-option label="是" :value="1"></el-option>
-              <el-option label="否" :value="0"></el-option>
+            <el-option label="是"
+                       :value="1"></el-option>
+            <el-option label="否"
+                       :value="0"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -217,7 +225,8 @@ export default {
     return {
       searchForm: {
         organId: null,
-        isEnable: null
+        isEnable: null,
+        search: null
       },
       searchLsit: [],
       tableList: [],

src/views/teamBuild/signupList.vue

@@ -215,10 +215,10 @@
                 <el-button type='text'
                            v-permission="'musicGroupQuit/directQuitMusicGroup2'"
                            v-show='scope.row.paymentStatus==2'
-                           @click='quitTeam(scope.row)'>退团</el-button>
+                           @click='quitTeam(scope.row)'>退团退费</el-button>
                 <el-button type="text"
                            v-show="permission('musicGroupQuit/directQuitMusicGroup3')&&scope.row.paymentStatus==2"
-                           @click="quieTeams(scope.row)">退团不退费</el-button>
+                           @click="quieTeams(scope.row)">退团</el-button>
                 <el-button type="text"
                            v-show="permission('visit/add')"
                            @click="addVisit(scope.row)">新增回访</el-button>
@@ -457,7 +457,8 @@
           <el-radio v-model.trim="quitForm.isRefundTeachingAssistantsFee"
                     :label="false">否</el-radio>
         </el-form-item>
-        <el-form-item label="退团原因">
+        <el-form-item label="退团原因"
+                      prop="reason">
           <el-input type="textarea"
                     v-model.trim="quitForm.reason"></el-input>
         </el-form-item>
@@ -649,7 +650,8 @@ export default {
         ],
         isRefundTeachingAssistantsFee: [
           { required: true, message: "选择是否退还教辅费用" }
-        ]
+        ],
+        reason: [{ required: true, message: "请填写退团退费原因" }]
       },
       Fsearch: null,
       Frules: null,

src/views/teamDetail/components/studentList.vue

@@ -219,10 +219,10 @@
 
               <el-button type="text"
                          v-if="permission('musicGroupQuit/directQuitMusicGroup')&&scope.row.studentStatus != 'QUIT'"
-                         @click="quieTeamMask(scope.row)">退团</el-button>
+                         @click="quieTeamMask(scope.row)">退团退费</el-button>
               <el-button type="text"
                          v-if="permission('musicGroupQuit/directQuitMusicGroup1')&&scope.row.studentStatus != 'QUIT'"
-                         @click="quieTeam(scope.row)">退团不退费</el-button>
+                         @click="quieTeam(scope.row)">退团</el-button>
 
               <el-button type="text"
                          v-if="permission('visit/add')"
@@ -535,7 +535,8 @@
           <el-radio v-model.trim="quitForm.isRefundTeachingAssistantsFee"
                     :label="false">否</el-radio>
         </el-form-item>
-        <el-form-item label="退团原因">
+        <el-form-item label="退团原因"
+                      prop="reason">
           <el-input type="textarea"
                     v-model.trim="quitForm.reason"></el-input>
         </el-form-item>
@@ -794,7 +795,8 @@ export default {
         ],
         isRefundTeachingAssistantsFee: [
           { required: true, message: "选择是否退还教辅费用" }
-        ]
+        ],
+        reason: [{ required: true, message: "请填写退团退费原因" }]
       },
       maskRules: {
         studentName: [{ required: true, message: "请输入学生姓名" }],

src/views/teamDetail/teamCourseList.vue

@@ -226,9 +226,16 @@
             <template slot-scope="scope">{{ scope.row.isCallNames ? '是' : '否' }}</template>
           </el-table-column>
           <el-table-column align="center"
+                           width="150px"
                            prop="teacherName"
                            label="指导老师"
-                           fixed="right"></el-table-column>
+                           fixed="right">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.teacherName}}({{scope.row.actualTeacherId}})
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            label="详情"
                            fixed="right"

src/views/vipClass/vipList.vue

@@ -542,9 +542,11 @@ export default {
       let userId = row.userId; // 课程组上指导老师
       let rules = JSON.stringify(this.rules);
       let searchForm = JSON.stringify(this.searchForm);
+      let name = row.name;
+      let endTimeStr = row.coursesExpireDate
       this.$router.push({
         path: "/business/vipReset",
-        query: { id, educationalTeacherId, organId, userId, rules, searchForm }
+        query: { id, educationalTeacherId, organId, userId, rules, searchForm, name, endTimeStr }
       });
     },
     // 删除VIP

src/views/vipClass/vipReset.vue

@@ -2,12 +2,12 @@
   <div class="m-container">
     <h2>
       <el-page-header @back="goBack"
-                      content="VIP修改"></el-page-header>
+                      :content="name"></el-page-header>
     </h2>
     <div class="vipwrap">
-      <div class="newBand"
+      <!-- <div class="newBand"
            v-permission="'vipGroupManage/appendVipGroupCourseSchedules'"
-           @click="addCourse">VIP加课</div>
+           @click="addCourse">VIP加课</div> -->
       <div class="newBand"
            v-permission="'courseSchedule/vipCourseAdjust'"
            @click="adjustment">批量调整</div>
@@ -130,9 +130,7 @@
                       prop="date">
           <el-date-picker v-model.trim="maskForm.date"
                           type="date"
-                          :picker-options="{
-                              firstDayOfWeek:1
-                            }"
+                          :picker-options="coursesDate(this.endTime)"
                           value-format="yyyy-MM-dd"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
@@ -307,7 +305,7 @@
         <el-form-item label="排课起始时间"
                       prop="courseTime">
           <el-date-picker v-model.trim="adjustmentForm.courseTime"
-                          :picker-options="pickerOptions"
+                          :picker-options="pickerOptions(this.endTime)"
                           style="width:200px!important;"
                           type="date"
                           value-format="yyyy-MM-dd"
@@ -467,12 +465,7 @@ export default {
   },
   data () {
     return {
-      pickerOptions: {
-        firstDayOfWeek: 1,
-        disabledDate (time) {
-          return time.getTime() + 86400000 <= new Date().getTime();
-        }
-      },
+
       addrVisible: false,
       adjustmentVisible: false,
       addCourseVisible: false,
@@ -553,6 +546,8 @@ export default {
       startTime: "",
       chioseVipList: [],
       organList: [],
+      name: '',
+      endTime: ''
     };
   },
   created () { },
@@ -569,6 +564,8 @@ export default {
       this.vipid = this.$route.query.id;
       let query = this.$route.query
       let addrForm = this.addrForm
+      this.name = this.$route.query.name;
+      this.endTime = this.$route.query.endTimeStr
       if (query.educationalTeacherId) {
         addrForm.educationalTeacherId = Number(query.educationalTeacherId);
       } else {
@@ -987,6 +984,25 @@ export default {
           this.$set(item, 'startClassTime', '')
         }
       })
+    },
+    coursesDate (dateStr) {
+      let self = this;
+      return {
+        firstDayOfWeek: 1,
+        disabledDate: time => {
+          let date = new Date(dateStr.replace(/-/, "/"));
+          return time.getTime() > date.getTime();
+        }
+      };
+    },
+    pickerOptions (dateStr) {
+      return {
+        firstDayOfWeek: 1,
+        disabledDate (time) {
+          let date = new Date(dateStr.replace(/-/, "/"));
+          return time.getTime() + 86400000 <= new Date().getTime() || time.getTime() > date.getTime();
+        }
+      }
     }
   },
   watch: {
@@ -1003,7 +1019,7 @@ export default {
         }
         this.weekList = [];
         this.$refs['tableList'].clearSelection();
-        this.$refs["adjustmentForm"].resetFields();
+        this.$refs.adjustmentForm.resetFields();
 
         this.addWeek();
       }