Merge branch 'master' into 03/03GRADE

dist/static/css/chunk-03221830.e48265c1.css

@@ -0,0 +1 @@
+.visitBtnWrap[data-v-5287c0d8]{position:absolute;right:90px;top:82px;z-index:20}

dist/static/css/chunk-45c832ba.66148cbf.css

@@ -1 +0,0 @@
-.visitBtnWrap[data-v-bba67e46]{position:absolute;right:90px;top:82px;z-index:20}

src/utils/searchArray.js

@@ -162,6 +162,14 @@ export const visitChiose = [
   { value: '常规回访', label: '常规回访', children: [{ value: '课后及作业回访', label: '课后及作业回访' }, { value: '练习及乐团表现', label: '练习及乐团表现' }] },
   { value: '其它', label: '其它', children: [{ value: '其它', label: '其它' }] }
 ]
+export const visitChiose1 = [
+  { value: '课程推荐', label: '课程推荐', children: [{ value: '新课推荐', label: '新课推荐' }, { value: '续费提醒', label: '续费提醒' }] },
+  { value: '常规回访', label: '常规回访', children: [{ value: '课后及作业回访', label: '课后及作业回访' }, { value: '练习及乐团表现', label: '练习及乐团表现' },{
+    label:'考勤申诉',
+    value:'考勤申诉'
+   }] },
+  { value: '其它', label: '其它', children: [{ value: '其它', label: '其它' }] }
+]
 
 // 交易状态
 export const paymentChannelStatus = [

src/views/teamDetail/componentCourse/studentRollCall.vue

@@ -96,6 +96,7 @@
         :username="detail.username"
         @close="visitVisible = false"
         @submited="getList"
+        :isMainGo="isMainGo"
       />
     </el-dialog>
   </div>
@@ -106,7 +107,7 @@ import pagination from '@/components/Pagination/index'
 import { permission } from '@/utils/directivePage'
 import visit from '@/views/withdrawal-application/modals/visit'
 export default {
-  props: ['courseScheduleId'],
+  props: ['courseScheduleId','isMainGo'],
   components: { pagination, visit },
   data () {
     return {

src/views/teamDetail/teamCourseList.vue

@@ -2,7 +2,7 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      课表列表 <filter-search @reload="reloadSearch" :keys="['searchType']" :moreKeys="['start', 'end', 'organId']"/>
+      课表列表 <filter-search ref='filterSearch' @reload="reloadSearch" :keys="['searchType']" :moreKeys="['start', 'end', 'organId']"/>
     </h2>
     <div class="m-core">
       <!-- 搜索类型 -->
@@ -525,7 +525,7 @@
         <el-tab-pane label="学员列表" name="first">
           <div v-if="activeName == 'first'">
             <!-- studentRollCall  -->
-            <studentRollCall :courseScheduleId="maskForm.id"></studentRollCall>
+            <studentRollCall :courseScheduleId="maskForm.id" :isMainGo='isMainGo'></studentRollCall>
           </div>
         </el-tab-pane>
         <!-- <el-tab-pane label="GPS定位"
@@ -672,7 +672,8 @@ export default {
       id: null,
       show: false,
       compoundList: [],
-      deleteList:[]
+      deleteList:[],
+      isMainGo:false
     };
   },
   components: {
@@ -689,6 +690,7 @@ export default {
   },
   created(){
       this.searchForm.timer = [nowTime, nowTime]
+
   },
   computed: {
     workTypeOptions() {
@@ -697,6 +699,7 @@ export default {
     mergeCourseTypeOptions() {
       return objectToOptions(mergeCourseType);
     },
+
   },
   mounted() {
     const { query } = this.$route
@@ -897,6 +900,8 @@ export default {
             this.maskForm.id = row.id;
             this.activeName = "first";
             this.classVisible = true;
+            this.isMainGo = this.$refs.filterSearch?.show
+            console.log(this.isMainGo)
           }
         }
       );

src/views/withdrawal-application/modals/visit.vue

@@ -16,6 +16,7 @@
       </el-form-item>
       <el-form-item label="回访类型" prop="visitType">
         <el-cascader
+        :disabled='isMainGo'
           expand-trigger="hover"
           clearable
           style="width: 80% !important"
@@ -87,12 +88,12 @@
 </template>
 <script>
 import cleanDeep from "clean-deep";
-import { visitChiose } from "@/utils/searchArray";
+import { visitChiose,visitChiose1 } from "@/utils/searchArray";
 import { addVisit } from "@/views/returnVisitManager/api";
 import record from './record'
 import studentWork from './studentWork'
 export default {
-  props: ["detail", "username"],
+  props: ["detail", "username",'isMainGo'],
   components:{record,studentWork},
   data() {
     return {
@@ -118,6 +119,14 @@ export default {
       workVisible:false
     };
   },
+  mounted(){
+    if(this.isMainGo){
+     this.visitChiose = visitChiose1
+    this.$set(this.visitForm,'visitType',['常规回访','考勤申诉'])
+    }else{
+      this.visitChiose = visitChiose
+    }
+  },
   computed: {
     userName() {
       return this.username || this.detail.user?.username || this.detail.realName || this.detail.userName || this.detail.studentName
@@ -128,7 +137,6 @@ export default {
   },
   methods: {
     submitAddVisit() {
-
       this.$refs.visitForm.validate((res) => {
         if (res) {
           const { visitType, ...rest } = this.visitForm;