09/01 13:57

111

dist/static/css/chunk-0d8dec77.1e472b33.css → dist/static/css/chunk-75e41d60.37a98bf6.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.msg[data-v-4d934b1f]{min-width:120px}.label[data-v-4d934b1f]{width:520px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.msg[data-v-4f0fadd0]{min-width:120px}.label[data-v-4f0fadd0]{width:520px}

src/utils/searchArray.js

@@ -130,7 +130,7 @@ const practiceGroupType = [
 ]
 const visitChiose = [
   { value: '课程推荐', label: '课程推荐', children: [{ value: '新课推荐', label: '新课推荐' }, { value: '续费提醒', label: '续费提醒' }] },
-  { value: '常规回访', label: '常规回访', children: [{ value: '课后及作业回访', label: '课后及作业回访' }, { value: '联系及乐团表现', label: '联系及乐团表现' }] },
+  { value: '常规回访', label: '常规回访', children: [{ value: '课后及作业回访', label: '课后及作业回访' }, { value: '练习及乐团表现', label: '练习及乐团表现' }] },
   { value: '其它', label: '其它', children: [{ value: '其它', label: '其它' }] }
 ]
 export {

src/views/returnVisitManager/returnVisitList.vue

@@ -47,6 +47,7 @@
                           style="width:420px;"
                           type="daterange"
                           value-format="yyyy-MM-dd"
+                          @change="changeTimer"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期"
@@ -217,6 +218,8 @@ export default {
       this.getList()
     },
     onReSet () {
+      this.type = []
+      this.timer = []
       this.searchForm = {
         teacher: '',
         organId: '',
@@ -228,10 +231,7 @@ export default {
     },
     getList () {
       // cleanDeep
-      if (this.timer && this.timer.length > 0) {
-        this.searchForm.startTime = this.timer[0];
-        this.searchForm.endTime = this.timer[1];
-      }
+
       this.searchForm.page = this.rules.page;
       this.searchForm.rows = this.rules.limit
       getVisitList(cleanDeep(this.searchForm)).then(res => {
@@ -244,6 +244,15 @@ export default {
     lookDetail (row) {
       this.activeRow = row;
       this.detailVisible = true;
+    },
+    changeTimer (val) {
+      if (val && val.length > 0) {
+        this.searchForm.startTime = this.timer[0];
+        this.searchForm.endTime = this.timer[1];
+      } else {
+        this.searchForm.startTime = null;
+        this.searchForm.endTime = null;
+      }
     }
   },
   watch: {

src/views/teamDetail/components/studentList.vue

@@ -211,52 +211,21 @@
                          width="250px;"
                          label="操作">
           <template slot-scope="scope">
-            <div v-if="scope.row.studentStatus != 'QUIT'">
-              <!-- <el-popover placement="top"
-                          v-model.trim="scope.row.typeVisible">
-                <el-input v-model.trim="remark"
-                          placeholder="请输入退团原因"></el-input>
-
-                <el-button type="text"
-                           slot='reference'
-                           class='chiose'>
-                  退团
-                </el-button>
-                <div style="text-align: right; margin-top: 20px">
-                  <el-button size="mini"
-                             type="text"
-                             @click="scope.row.typeVisible  = false">取消</el-button>
-                  <el-button type="primary"
-                             size="mini"
-                             @click="chioseType(scope.row)">确定</el-button>
-                </div>
-              </el-popover>-->
+            <div>
 
               <el-button type="text"
-                         v-if="permission('studentManage/queryStudentClassGroup')"
+                         v-if="permission('studentManage/queryStudentClassGroup')&&scope.row.studentStatus != 'QUIT'"
                          @click="lookClass(scope.row)">查看班级</el-button>
-              <!-- <el-button type="text"
-                         v-if="!scope.row.isLock && permission('studentManage/updateStudentFeeIsLock')"
-                         @click="lockStudent(scope.row)">锁定</el-button>
-              <el-button v-if="scope.row.isLock && permission('studentManage/updateStudentFeeIsLock')"
-                         type="text"
-              @click="lockStudent(scope.row)">解锁</el-button>-->
-              <!-- <el-button type="text"
-                         v-if="permission('studentManage/updateStudentFee')"
-              @click="resetPay(scope.row)">修改缴费</el-button>-->
+
               <el-button type="text"
-                         v-if="permission('musicGroupQuit/directQuitMusicGroup')"
+                         v-if="permission('musicGroupQuit/directQuitMusicGroup')&&scope.row.studentStatus != 'QUIT'"
                          @click="quieTeamMask(scope.row)">退团</el-button>
+
               <el-button type="text"
                          v-if="permission('visit/add')"
                          @click="addVisit(scope.row)">新增回访</el-button>
-
-              <!-- <el-button type="text" @click="lookClass(scope.row)">查看班级</el-button>
-              <el-button type="text" v-if="!scope.row.isLock" @click="lockStudent(scope.row)">锁定</el-button>
-              <el-button v-else type="text" @click="lockStudent(scope.row)">解锁</el-button>
-              <el-button type="text" @click="resetPay(scope.row)">修改缴费</el-button>
-              <el-button type="text" @click="quieTeamMask(scope.row)">退团</el-button>-->
             </div>
+
           </template>
         </el-table-column>
       </el-table>