Browse Source

Merge branch '02/23reviewBUG' into jenkins

mo 2 năm trước cách đây
mục cha
commit
46a2228c8f

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/index.html


+ 1 - 1
dist/static/css/chunk-6762597f.fb8d5018.css → dist/static/css/chunk-e16e01e0.4b146bc7.css

@@ -1 +1 @@
-.btns[data-v-6d4a981c]{text-align:right}.files[data-v-6d4a981c]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-6d4a981c]{position:absolute;right:20px;bottom:10px}.gradual-item[data-v-6d4a981c]{background-color:#f8f8f8;margin-bottom:10px;padding:10px;border-radius:6px}.myCascader .el-radio{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input{visibility:hidden}.myCascader .el-cascader-node__postfix{top:10px}[data-v-551f7e0e] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-551f7e0e]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-551f7e0e] .el-dialog__body{padding:0}.iframe_back[data-v-551f7e0e]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-551f7e0e]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-551f7e0e]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}
+.btns[data-v-6d4a981c]{text-align:right}.files[data-v-6d4a981c]{background-color:#f8f8f8;padding:20px 0;padding-right:20px;margin-bottom:20px;border-radius:5px;position:relative}.files .file-remove[data-v-6d4a981c]{position:absolute;right:20px;bottom:10px}.gradual-item[data-v-6d4a981c]{background-color:#f8f8f8;margin-bottom:10px;padding:10px;border-radius:6px}.myCascader .el-radio{width:100%;height:100%;z-index:10;position:absolute;top:10px;right:10px}.myCascader .el-radio__input{visibility:hidden}.myCascader .el-cascader-node__postfix{top:10px}[data-v-255241d2] .el-dropdown{margin-right:10px;color:#14928a}.remark[data-v-255241d2]{display:inline;overflow:hidden;white-space:pre}.lookForm[data-v-255241d2] .el-dialog__body{padding:0}.iframe_back[data-v-255241d2]{width:195px;height:45px;position:absolute;bottom:50px;background:transparent;left:50%;z-index:99;margin-left:-100px}.iframe_help[data-v-255241d2]{position:absolute;background:transparent;width:50px;height:120px;top:50%;right:0;margin-top:-35px}.iframe_header_back[data-v-255241d2]{background:transparent;width:225px;height:50px;position:absolute;top:65px;left:20px}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/app.f6af015c.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/chunk-6762597f.6cb7670a.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/chunk-e16e01e0.3de83db1.js


+ 1 - 0
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 || "");
 
   },

+ 3 - 3
src/constant/index.js

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

+ 3 - 4
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">

+ 2 - 2
src/views/smallStudentManager/components/addVisit.vue

@@ -54,7 +54,7 @@
           >
         </el-radio-group>
       </el-form-item>
-          <el-form-item label="反馈详情" prop="feedbackTypeDesc" v-if="visitForm.feedbackType == 'THINKING' || visitForm.feedbackType == 'LOST'">
+          <!-- <el-form-item label="反馈详情" prop="feedbackTypeDesc" v-if="visitForm.feedbackType == 'THINKING' || visitForm.feedbackType == 'LOST'">
         <el-radio-group v-model="visitForm.feedbackTypeDesc">
           <el-radio-button
             :label="item.value"
@@ -63,7 +63,7 @@
             >{{ item.label }}</el-radio-button
           >
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="回访图片">
         <div   style="width: 80% !important">

+ 2 - 2
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">

+ 2 - 1
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
           >

+ 32 - 8
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,

+ 1 - 1
src/views/teamBuild/modals/visit.vue

@@ -132,4 +132,4 @@ export default {
     display: block;
     text-align: right;
 }
-</style>
+</style>

+ 30 - 12
src/views/withdrawal-application/modals/visit.vue

@@ -49,7 +49,7 @@
           :picker-options="pickerOptions"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="学员情况" prop="overview">
+      <el-form-item label="学员情况" prop="overview" v-if="!(visitForm.visitType[0]=='常规回访'&&visitForm.visitType[1]=='考勤申诉')">
         <el-input
           type="textarea"
           v-model="visitForm.overview"
@@ -63,7 +63,7 @@
       <el-form-item
         label="家长反馈"
         prop="feedback"
-        v-if="visitForm.visitType[0] != '小课回访'"
+        v-if="visitForm.visitType[0] != '小课回访'&&!(visitForm.visitType[0]=='常规回访'&&visitForm.visitType[1]=='考勤申诉')"
       >
         <el-input
           type="textarea"
@@ -75,11 +75,13 @@
           show-word-limit
         ></el-input>
       </el-form-item>
+
+
       <el-form-item
         label="学员状态"
         prop="feedbackType"
         v-if="visitForm.visitType[0] == '小课回访'"
-        :rules="[{ required: true, message: '选择家长反馈' }]"
+        :rules="[{ required: true, message: '选择学员状态' }]"
       >
         <el-radio-group
           v-model="visitForm.feedbackType"
@@ -97,6 +99,20 @@
           >
         </el-radio-group>
       </el-form-item>
+      <el-form-item
+        label="家长反馈"
+        prop="feedback"
+        v-if="(visitForm.visitType[0]=='常规回访'&&visitForm.visitType[1]=='考勤申诉')"
+      >
+      <el-radio-group v-model="visitForm.feedbackTypeDesc">
+          <el-radio-button
+            :label="item.value"
+            v-for="(item, index) in feedbackTypeDescList"
+            :key="index"
+            >{{ item.label }}</el-radio-button
+          >
+        </el-radio-group>
+      </el-form-item>
       <!-- <el-form-item
         label="反馈详情"
         prop="feedbackTypeDesc"
@@ -128,28 +144,29 @@
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item label="回访图片">
-        <div style="width: 80% !important">
-          <uploadImageList :uploaded="visitForm.attachments" />
-        </div>
-      </el-form-item>
+
       <!--   :rules="[{ required: true, message: '请输入家长反馈内容' }]" -->
       <el-form-item
         label="原因"
         prop="feedback"
-
-        v-if="visitForm.visitType[0] == '小课回访'"
+        :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"
           show-word-limit
         ></el-input>
       </el-form-item>
+      <el-form-item label="回访图片">
+        <div style="width: 80% !important">
+          <uploadImageList :uploaded="visitForm.attachments" />
+        </div>
+      </el-form-item>
     </el-form>
     <div
       slot="footer"
@@ -199,7 +216,8 @@ export default {
     return {
       visitChiose,
       feedbackTypeList,
-      feedbackTypeDescList,
+      feedbackTypeDescList:[{label:'生病',value:'SICK'},{label:'有事',value:'SOMETHING'},{label:'不想参加',value:'NO_PARTICIPATE'},{label:'其他',value:'OTHER'}]
+      ,
       visitForm: {
         musicGroupId: "",
         overview: "",

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác