提交

1

src/components/remote-search/index.vue

@@ -59,6 +59,7 @@ export default {
   async mounted() {
     // this.getList();
     //  (this.value)
+    this.selectWidt = this.width;
     this.getOptions(this.value || "");
 
   },

src/constant/index.js

@@ -464,9 +464,9 @@ export const feedbackTypeAll = {
 
 
 export const feedbackTypeDesc = {
-  PRICE: "价格原因",
-  TIME: "时间原因",
-  TEACHING: "教学不满意",
+  SICK: "生病",
+  SOMETHING: "有事",
+  NO_PARTICIPATE: "不想参加",
   OTHER: "其他"
 };
 

src/views/returnVisitManager/components/returnVisitList.vue

@@ -218,17 +218,16 @@
           <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=='小课回访'">{{
+          <descriptions-item label="家长反馈:"  v-if="activeRow.purpose == '考勤申诉'">{{
             activeRow.feedbackTypeDesc | feedbackTypeDescFilter
           }}</descriptions-item>
           <descriptions-item label="问题状态:">{{
             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=='小课回访'?'原因':'家长反馈'" :span="6">{{
+          <descriptions-item :label="(activeRow.type=='小课回访' ||  activeRow.purpose == '考勤申诉')?'原因':'家长反馈'" :span="6">{{
             activeRow.feedback
           }}</descriptions-item>
           <descriptions-item label="回访图片" :span="6">

src/views/studentManager/components/studentInfo.vue

@@ -71,8 +71,8 @@
           </el-form-item>
         </el-col>
         <el-col :xl="6" :lg="8" :md="8" :xs="12">
-          <el-form-item label="指导老师">
-            <el-input :value="studentForm.teacherName" disabled></el-input>
+          <el-form-item label="排课老师">
+            <el-input :value="studentForm.courseTeacherName" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xl="6" :lg="8" :md="8" :xs="12">

src/views/studentManager/components/studentVisit.vue

@@ -220,11 +220,12 @@
           <descriptions-item label="问题状态:">{{
             activeRow.probStatus ? "已解决" : "待跟进"
           }}</descriptions-item>
+
           <descriptions-item label="回访情况:" :span="6">{{
             activeRow.overview
           }}</descriptions-item>
           <descriptions-item
-            :label="activeRow.type == '小课回访' ? '原因' : '家长反馈'"
+            :label="(activeRow.type == '小课回访' ||  activeRow.purpose == '考勤申诉') ? '原因' : '家长反馈'"
             :span="6"
             >{{ activeRow.feedback }}</descriptions-item
           >

src/views/studentManager/studentList.vue

@@ -607,7 +607,7 @@
     </div>
     <el-dialog
       :title="maskName"
-      width="700px"
+      width="800px"
       label-position="right"
       class="studentInfo"
       @close="onMaskClose('studentForm')"
@@ -629,11 +629,12 @@
           :closable="false"
           style="margin-bottom: 15px"
         ></el-alert>
-        <el-form-item label="学生姓名" prop="name">
-          <el-input v-model.trim="studentForm.name"></el-input>
+        <el-form-item label="学生姓名" prop="name" >
+          <el-input v-model.trim="studentForm.name" stlye="width:202px"></el-input>
         </el-form-item>
-        <el-form-item label="学生性别" prop="sex">
+        <el-form-item label="学生性别" prop="sex" >
           <el-select
+          style="width: 202px!important"
             class="multiple"
             filterable
             v-model.trim="studentForm.sex"
@@ -647,7 +648,7 @@
         <el-form-item label="出生日期" prop="date">
           <el-date-picker
             v-model.trim="studentForm.date"
-            style="width: 185px"
+            style="width: 202px"
             value-format="yyyy-MM-dd"
             type="date"
             :picker-options="{
@@ -658,6 +659,7 @@
         </el-form-item>
         <el-form-item label="学生声部" prop="subjectIdList">
           <el-select
+          style="width: 202px!important"
             v-model.trim="studentForm.subjectIdList"
             filterable
             clearable
@@ -680,6 +682,7 @@
 
         <el-form-item label="家长姓名" prop="parseName">
           <el-input
+          style="width: 202px!important"
             v-model.trim="studentForm.parseName"
             :disabled="!isNew"
           ></el-input>
@@ -697,10 +700,11 @@
           ]"
         >
           <!--   @blur="checkPhone(studentForm.phone)" -->
-          <el-input :maxlength="11" v-model.trim="studentForm.phone"></el-input>
+          <el-input   style="width: 202px!important" :maxlength="11" v-model.trim="studentForm.phone"></el-input>
         </el-form-item>
         <el-form-item label="所属分部" prop="organId">
           <el-select
+          style="width: 202px!important"
             class="multiple"
             v-model.trim="studentForm.organId"
             filterable
@@ -718,6 +722,7 @@
         </el-form-item>
         <el-form-item prop="school" label="所属学校">
           <el-select
+          style="width: 202px!important"
             v-model.trim="studentForm.school"
             filterable
             clearable
@@ -735,6 +740,7 @@
         <el-form-item label="学员年级" prop="currentGradeNum">
           <el-select
             class="multiple"
+            style="width: 202px!important"
             v-model.trim="studentForm.currentGradeNum"
             clearable
             filterable
@@ -750,11 +756,12 @@
         </el-form-item>
         <el-form-item label="学员班级" prop="currentClass">
           <el-select
+          style="width: 202px!important"
             placeholder="班级"
             filterable
             clearable
             v-model.trim="studentForm.currentClass"
-            style="width: 185px !important"
+
           >
             <el-option label="1班" value="1班"></el-option>
             <el-option label="2班" value="2班"></el-option>
@@ -828,6 +835,7 @@
         ></el-alert>
         <el-form-item label="是否运营" prop="operatingTag" v-if="tenantId == 1">
           <el-select
+          style="width: 202px!important"
             class="multiple"
             v-model.trim="studentForm.operatingTag"
             clearable
@@ -838,6 +846,7 @@
         </el-form-item>
         <el-form-item label="是否服务" prop="serviceTag" v-if="tenantId == 1">
           <el-select
+          style="width: 202px!important"
             class="multiple"
             v-model.trim="studentForm.serviceTag"
             clearable
@@ -860,6 +869,7 @@
             </p>
           </template>
           <el-select
+          style="width: 202px!important"
             class="multiple"
             v-model.trim="studentForm.isNewUser"
             clearable
@@ -870,6 +880,7 @@
         </el-form-item>
         <el-form-item label="关心包" prop="carePackage">
           <el-select
+          style="width: 202px!important"
             class="multiple"
             v-model.trim="studentForm.carePackage"
             clearable
@@ -883,6 +894,7 @@
         </el-form-item>
         <el-form-item label="加油包" prop="comeOnPackage">
           <el-select
+          style="width: 202px!important"
             class="multiple"
             v-model.trim="studentForm.comeOnPackage"
             clearable
@@ -894,6 +906,15 @@
             <el-option disabled label="已使用" :value="2"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="courseTeacher" label="排课老师">
+            <remote-search
+            :width="202"
+              :commit="'setTeachers'"
+              v-model="studentForm.courseTeacher"
+              :isForzenWithQueryCondition="true"
+            />
+          </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="studentVisible = false">取 消</el-button>
@@ -1080,7 +1101,7 @@ export default {
         date: "",
         serviceTag: null,
         operatingTag: null,
-        teacherId: null,
+        courseTeacher: null,
         subjectIdList: null,
         isNewUser: 1,
         carePackage: 0,
@@ -1352,6 +1373,7 @@ export default {
             cooperationOrganId: studentForm.school,
             currentClass: studentForm.currentClass,
             currentGradeNum: studentForm.currentGradeNum,
+            courseTeacher:studentForm.courseTeacher
           };
           registerStudent(obj).then((res) => {
             if (res.code == 200) {
@@ -1386,6 +1408,7 @@ export default {
             cooperationOrganId: studentForm.school,
             currentClass: studentForm.currentClass,
             currentGradeNum: studentForm.currentGradeNum,
+            courseTeacher:studentForm.courseTeacher
           };
           updateStudent(obj).then((res) => {
             if (res.code == 200) {
@@ -1475,6 +1498,7 @@ export default {
           extSubjectIds: row.extSubjectIds || null,
           currentClass: row.currentClass || null,
           currentGradeNum: row.currentGradeNum || null,
+          courseTeacher:row.courseTeacher || null
         };
         this.studentUpdatePackage = {
           carePackage: row.carePackage,

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

@@ -149,13 +149,13 @@
       <el-form-item
         label="原因"
         prop="feedback"
-        :rules="[{ required: visitForm.feedbackTypeDesc=='其他'?true:false, message: '请输入家长反馈内容' }]"
-        v-if="visitForm.visitType[0] == '小课回访' || (visitForm.visitType[0]=='常规回访'&&visitForm.visitType[1]=='考勤申诉'&&visitForm.feedbackTypeDesc=='其他')"
+        :rules="[{ required: visitForm.feedbackTypeDesc=='OTHER'?true:false, message: '请输入家长反馈内容' }]"
+        v-if="visitForm.visitType[0] == '小课回访' || (visitForm.visitType[0]=='常规回访'&&visitForm.visitType[1]=='考勤申诉'&&visitForm.feedbackTypeDesc=='OTHER')"
       >
         <el-input
           type="textarea"
           v-model="visitForm.feedback"
-          style="width: 80% !important"
+          style="width: 80% !important" 
           placeholder="原因"
           :rows="3"
           maxlength="400"
@@ -216,7 +216,7 @@ export default {
     return {
       visitChiose,
       feedbackTypeList,
-      feedbackTypeDescList:[{label:'生病',value:'生病'},{label:'有事',value:'有事'},{label:'不想参加',value:'不想参加'},{label:'其他',value:'其他'}]
+      feedbackTypeDescList:[{label:'生病',value:'SICK'},{label:'有事',value:'SOMETHING'},{label:'不想参加',value:'NO_PARTICIPATE'},{label:'其他',value:'OTHER'}]
       ,
       visitForm: {
         musicGroupId: "",