Merge branch 'Nov16thResetMusic' of http://git.dayaedu.com/molingzhide/dy-admin-manager into Nov16thResetMusic

src/views/resetTeaming/components/resetPayList.vue

@@ -38,10 +38,18 @@
       <el-table style="width: 100%"
                 :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
                 :data="tableList">
-        <el-table-column align="center"
-                         prop="batchNo"
-                         width="200"
-                         label="缴费批次"></el-table-column>
+        <el-table-column
+          align="center"
+          prop="batchNo"
+          width="200"
+          label="缴费批次"
+        >
+        <template slot-scope="scope">
+            <div>
+              <copy-text>{{ scope.row.batchNo }}</copy-text>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column align="center"
                          prop="paymentType"
                          label="缴费类型">
@@ -108,7 +116,7 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         min-width="160px">
+                         min-width="200px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
@@ -117,10 +125,10 @@
               <!-- <el-button type="text"
                          @click="lookDetail(scope.row)"
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button> -->
-              <!-- <el-button type="text"
+              <el-button type="text"
                          @click="openChioseStudent(scope.row)"
                          v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT'"
-                         v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button> -->
+                         v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
               <el-button type="text"
                          v-if="teamStatus && scope.row.auditStatus === 'REJECT'"
                          v-permission="'musicGroupPaymentCalender/update'"
@@ -652,7 +660,7 @@ export default {
           this.$refs.setStudentFee.clearTable();
           this.payVisible = false;
           this.chioseStudentVisible = false;
-          this.$refs.payItems?.getList()
+          // this.$refs.payItems?.getList()
           this.getList();
 
         }

src/views/resetTeaming/components/resetPayListSchool.vue

@@ -38,10 +38,18 @@
       <el-table style="width: 100%"
                 :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
                 :data="tableList">
-        <el-table-column align="center"
-                         prop="batchNo"
-                         width="200"
-                         label="缴费批次"></el-table-column>
+        <el-table-column
+          align="center"
+          prop="batchNo"
+          width="200"
+          label="缴费批次"
+        >
+        <template slot-scope="scope">
+            <div>
+              <copy-text>{{ scope.row.batchNo }}</copy-text>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column align="center"
                          prop="paymentType"
                          label="缴费类型">
@@ -108,7 +116,7 @@
         </el-table-column>
         <el-table-column label="操作"
                          fixed="right"
-                         min-width="160px">
+                         min-width="200px">
           <template slot-scope="scope">
             <div>
               <el-button type="text"
@@ -117,10 +125,10 @@
               <!-- <el-button type="text"
                          @click="lookDetail(scope.row)"
                          v-permission="'musicGroupPaymentCalender/auditListDetail'">查看</el-button> -->
-              <!-- <el-button type="text"
+              <el-button type="text"
                          @click="openChioseStudent(scope.row)"
                          v-if="scope.row.status != 'REJECT' && scope.row.status != 'AUDITING'&&teamStatus && scope.row.paymentType != 'MUSIC_APPLY' && scope.row.paymentType != 'ADD_STUDENT'"
-                         v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button> -->
+                         v-permission="'musicGroupPaymentCalenderDetail/batchAdd'">添加学员</el-button>
               <el-button type="text"
                          v-if="teamStatus && scope.row.auditStatus === 'REJECT'"
                          v-permission="'musicGroupPaymentCalender/update'"
@@ -638,7 +646,7 @@ export default {
           this.payVisible = false;
           this.chioseStudentVisible = false;
           this.getList();
-          this.$refs.payItems?.getList()
+          // this.$refs.payItems?.getList()
         }
       });
     },

src/views/resetTeaming/components/studentPayBase.vue

@@ -10,6 +10,7 @@
       <el-form-item>
         <el-input v-model.trim="searchForm.search"
                   @keyup.enter.native="search"
+                  clearable
                   placeholder='学生编号'></el-input>
       </el-form-item>
       <el-form-item>
@@ -39,6 +40,7 @@
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}"
                 :data="tableList"
                 ref='multipleTable'
+                max-height="300"
                 @selection-change="handleSelectionChange">
         <el-table-column type="selection"
                          width="55">
@@ -128,7 +130,7 @@ import { findSound, getMusicGroupStudentFee, resetMusicGroupStudentFee, queryCan
 
 export default {
   components: { pagination },
-  props: ['clearStduent', 'musicGroupPaymentCalenderId'],
+  props: ['clearStduent', 'musicGroupPaymentCalenderId', 'batchNo'],
   data () {
     return {
       searchForm: {
@@ -196,7 +198,7 @@ export default {
       this.searchForm.musicGroupId = this.teamid;
       queryCanAddStudent({
         ...this.searchForm,
-        musicGroupPaymentCalenderId: this.musicGroupPaymentCalenderId,
+        batchNo: this.batchNo,
       }).then(res => {
         if (res.code == 200) {
           // this.rules.total = res.data.total;
@@ -286,7 +288,7 @@ export default {
 </script>
 <style lang='scss' scoped>
 .tableWrap {
-  height: 300px;
+  // height: 300px;
   overflow: auto;
 }
 </style>

src/views/resetTeaming/modals/pay-items.vue

@@ -3,16 +3,28 @@
     <el-table :data="list" :header-cell-style="{ background: '#EDEEF0', color: '#444' }">
       <el-table-column
         align="center"
-        prop="batchNo"
-        width="200"
-        label="缴费批次"
-      ></el-table-column>
-      <el-table-column
-        align="center"
         prop="id"
         width="120"
         label="缴费单号"
-      ></el-table-column>
+      >
+      <template slot-scope="scope">
+          <div>
+            <copy-text>{{ scope.row.id }}</copy-text>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="batchNo"
+        width="200"
+        label="缴费批次"
+      >
+      <template slot-scope="scope">
+          <div>
+            <copy-text>{{ scope.row.batchNo }}</copy-text>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="paymentType" label="缴费类型">
         <template slot-scope="scope">
           <div>
@@ -71,7 +83,7 @@
               v-permission="'musicGroupPaymentCalender/auditListDetail'"
               >查看</el-button
             >
-            <el-button
+            <!-- <el-button
               type="text"
               @click="$listeners.openChioseStudent(scope.row)"
               v-if="
@@ -83,7 +95,7 @@
               "
               v-permission="'musicGroupPaymentCalenderDetail/batchAdd'"
               >添加学员</el-button
-            >
+            > -->
             <!-- <el-button
               type="text"
               v-if="scope.row.status == 'REJECT' && teamStatus"

src/views/teacherManager/teacherDetail/components/teacherInfo.vue

@@ -170,6 +170,13 @@
           </el-row>
              <el-row>
             <el-col :span="12">
+              <el-form-item label="转证日期"
+                            :label-width="formLabelWidth">
+                <el-input disabled
+                          v-model.trim="topForm.formalStaffDate"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="离职日期"
                             :label-width="formLabelWidth">
                 <el-input disabled
@@ -234,6 +241,9 @@ export default {
           if(this.topForm.demissionDate){
              this.topForm.demissionDate = dayjs(this.topForm.demissionDate).format('YYYY-MM-DD')
           }
+          if(this.topForm.formalStaffDate) {
+            this.topForm.formalStaffDate = dayjs(this.topForm.formalStaffDate).format('YYYY-MM-DD')
+          }
 
         }
       })

src/views/teacherManager/teacherList.vue

@@ -219,6 +219,13 @@
               }}</el-button>
             </template>
           </el-table-column>
+             <el-table-column align="center" label="转证日期">
+            <template slot-scope="scope">
+              <div>
+                {{scope.row.formalStaffDate | dayjsFormat}}
+              </div>
+            </template>
+          </el-table-column>
              <el-table-column align="center" label="离职日期">
             <template slot-scope="scope">
               <div>

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -282,6 +282,17 @@
           </el-row>
           <el-row>
             <el-col :span="12">
+              <el-form-item label="转证日期" :label-width="formLabelWidth">
+                <el-date-picker
+                   v-model="topForm.formalStaffDate"
+                    value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="选择转证日期"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
               <el-form-item label="离职日期" :label-width="formLabelWidth">
                 <el-date-picker
                    v-model="topForm.demissionDate"
@@ -292,6 +303,8 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label :label-width="formLabelWidth">
                 <!-- <el-input v-model.trim="topForm.certificateType"></el-input> -->
@@ -404,6 +417,7 @@ export default {
         email: null,
         educationBackground: null,
         demissionDate:null,
+        formalStaffDate: null,
         isProbationPeriod: null,
         technicalTitles: null,
         certificateType: null,
@@ -500,6 +514,7 @@ export default {
               email: result.email,
               educationBackground: result.educationBackground,
               demissionDate:result.demissionDate,
+              formalStaffDate: result.formalStaffDate,
               technicalTitles: result.technicalTitles,
               certificateType: result.certificateType,
               certificateNum: result.certificateNum,
@@ -610,6 +625,8 @@ export default {
         graduateSchool: null,
         email: null,
         educationBackground: null,
+        demissionDate: null,
+        formalStaffDate: null,
         subjectIds: [],
         technicalTitles: null,
         certificateType: null,

src/views/teamDetail/componentCourse/teacherList.vue

@@ -8,8 +8,8 @@
                        label="老师姓名">
         <template slot-scope="scope">
           <div>
-            {{scope.row.teacherName}}
-             <span style="color: #f56c6c">({{scope.row.teacherId}})</span>
+            <span>{{scope.row.teacherName}}</span><br/>
+             <span style="color: #f56c6c">(<copy-text>{{scope.row.teacherId}}</copy-text>)</span>
           </div>
         </template>
       </el-table-column>
@@ -41,6 +41,38 @@
         </template>
       </el-table-column>
       <el-table-column align='center'
+                       prop="complaintsContent"
+                       width="120"
+                       label="考勤申诉内容">
+        <template slot-scope="scope">
+          <div v-if="scope.row.teacherAttendance">
+            <overflow-text :text="scope.row.teacherAttendance.complaintsContent" width="100%">
+              {{ scope.row.teacherAttendance.complaintsContent}}
+            </overflow-text>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align='center'
+                       prop="complaintsTime"
+                       width="160"
+                       label="考勤申诉时间">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.teacherAttendance && scope.row.teacherAttendance.complaintsTime}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align='center'
+                       prop="complaintsStatus"
+                       width="140"
+                       label="考勤申诉状态">
+        <template slot-scope="scope">
+          <div v-if="scope.row.teacherAttendance">
+            {{scope.row.teacherAttendance.complaintsStatus | complaintsStatusEnum}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align='center'
                        prop="teacherPhone"
                        label="签到状态">
         <template slot-scope="scope">
@@ -56,6 +88,7 @@
       </el-table-column>
       <el-table-column align='center'
                        width="200px"
+                       fixed="right"
                        label="操作">
         <template slot-scope="scope">
           <div>

src/views/teamDetail/teamCourseList.vue

@@ -13,7 +13,7 @@
                :model.sync="searchForm">
         <el-form-item>
           <el-input v-model.trim="searchForm.search"
-                    @keyup.enter.native="search"
+                    clearable
                     placeholder="课程(组)编号/课程名称" />
         </el-form-item>
         <el-form-item>
@@ -219,6 +219,10 @@
             </template>
           </el-table-column>
           <el-table-column align="center"
+                           prop="teacherName"
+                           width="110"
+                           label="主教老师"></el-table-column>
+          <el-table-column align="center"
                            prop="schoolName"
                            label="教学点">
             <template slot-scope="scope">