Merge branch '02/23reviewBUG' into jenkins

src/views/studentManager/components/studentVisit.vue

@@ -199,36 +199,21 @@
           <descriptions-item label="回访目的:">{{
             activeRow.purpose
           }}</descriptions-item>
-          <descriptions-item
-            label="家长反馈:"
-            v-if="activeRow.type == '小课回访'"
-            >{{
-              activeRow.feedbackType | feedbackTypeFilter
-            }}</descriptions-item
-          >
-          <descriptions-item
-            label="反馈详情:"
-            v-if="
-              (activeRow.feedbackType == 'THINKING' ||
-                activeRow.feedbackType == 'LOST') &&
-              activeRow.type == '小课回访'
-            "
-            >{{
-              activeRow.feedbackTypeDesc | feedbackTypeDescFilter
-            }}</descriptions-item
-          >
+          <descriptions-item label="家长反馈:" v-if="activeRow.type=='小课回访'">{{
+            activeRow.feedbackType | feedbackTypeFilter
+          }}</descriptions-item>
+          <descriptions-item label="家长反馈:"  v-if="activeRow.purpose == '考勤申诉'">{{
+            activeRow.feedbackTypeDesc | feedbackTypeDescFilter
+          }}</descriptions-item>
           <descriptions-item label="问题状态:">{{
-            activeRow.probStatus ? "已解决" : "待跟进"
+            activeRow.probStatus?'已解决':'待跟进'
           }}</descriptions-item>
-
-          <descriptions-item label="回访情况:" :span="6">{{
+          <descriptions-item label="回访情况:" :span="6" v-if="activeRow.purpose != '考勤申诉'">{{
             activeRow.overview
           }}</descriptions-item>
-          <descriptions-item
-            :label="(activeRow.type == '小课回访' ||  activeRow.purpose == '考勤申诉') ? '原因' : '家长反馈'"
-            :span="6"
-            >{{ activeRow.feedback }}</descriptions-item
-          >
+          <descriptions-item :label="(activeRow.type=='小课回访' ||  activeRow.purpose == '考勤申诉')?'原因':'家长反馈'" :span="6">{{
+            activeRow.feedback
+          }}</descriptions-item>
           <descriptions-item label="回访图片" :span="6">
             <div class="list" v-if="imageList.length > 0">
               <div v-for="item in imageList" :key="item.url" class="item">

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

@@ -101,8 +101,9 @@
       </el-form-item>
       <el-form-item
         label="家长反馈"
-        prop="feedbackTypeDesc"
+        prop="changeFeedbackTypeDesc"
         v-if="(visitForm.visitType[0]=='常规回访'&&visitForm.visitType[1]=='考勤申诉')"
+        :rules="[{ required: true, message: '选择家长反馈' }]"
       >
       <el-radio-group v-model="visitForm.feedbackTypeDesc" @change="changeFeedbackTypeDesc">
           <el-radio-button