提交

src/pages/super/CheckTeacherPay.vue

@@ -113,14 +113,14 @@
               <el-table-column prop="attendanceRate" label="出勤率" header-align="center"></el-table-column>
               <el-table-column prop="accuracy" label="正确率" header-align="center"></el-table-column>
               <el-table-column prop label="作业批改数量" header-align="center">
-              <el-table-column prop="autoLowGradeCount" label="快对答案张数"></el-table-column>
+              <el-table-column prop="totalAutoCount" label="快对答案张数"></el-table-column>
               <el-table-column prop="manualLowGradeCount" label="1-2年级手动批改"></el-table-column>
                <el-table-column prop="manualMiddleGradeCount" label="3-4年级手动批改"></el-table-column>
               <el-table-column prop="manualHighGradeCount" label="5-6年级手动批改"></el-table-column>
               </el-table-column>
               <el-table-column prop="basicSalary" label="底薪金额" header-align="center"></el-table-column>
               <el-table-column prop="correctDecution" label="批改提成" header-align="center"></el-table-column>
-            <el-table-column prop="total" label="总计" header-align="center"></el-table-column>
+            <el-table-column prop="total" label="总计" header-align="center" ></el-table-column>
           </el-table>
           <!-- 分页显示 -->
           <div class="page-block" v-if="parseInt(getTeacherSalaryList.pages) > 10">
@@ -172,12 +172,12 @@
             <el-table-column prop="identity" label="身份" header-align="center"></el-table-column>
              <el-table-column prop="manager" label="归属管理员" header-align="center"></el-table-column>
               <el-table-column prop="subject" label="科目" header-align="center"></el-table-column>
-                <el-table-column prop="subject" label="排班类型" header-align="center"></el-table-column>
+              <el-table-column prop="type" label="排班类型" header-align="center"></el-table-column>
               <el-table-column prop="actualAttendCount" label="实际有效出勤段数" header-align="center"></el-table-column>
               <el-table-column prop="shouldAttendCount" label="系统排班段数" header-align="center"></el-table-column>
               <el-table-column prop="attendanceRate" label="出勤率" header-align="center"></el-table-column>
-                 <el-table-column prop="accuracy" label="正确率" header-align="center"></el-table-column>
-                 <el-table-column prop="attendanceRate" label="作业批改数量" header-align="center"></el-table-column>
+              <el-table-column prop="accuracy" label="正确率" header-align="center"></el-table-column>
+              <el-table-column prop="correctCount" label="作业批改数量" header-align="center"></el-table-column>
               <el-table-column prop="basicSalary" label="底薪金额" header-align="center"></el-table-column>
               <el-table-column prop="correctDecution" label="批改提成" header-align="center"></el-table-column>
             <el-table-column prop="total" label="总计" header-align="center"></el-table-column>
@@ -193,7 +193,7 @@
             :total="parseInt(GetKnowledgeTeacherSalaryList.pages)"
           ></el-pagination>
         </div>
-        <!-- 老师资料表 -->
+        <!-- 个人信息 -->
         <div v-if="ActiveIndex == 2">
           <el-table
             style="width: 100%"
@@ -228,15 +228,21 @@
               </template>
             </el-table-column>
                <el-table-column prop="subject" label="科目" header-align="center"></el-table-column>
-                <el-table-column prop="bankName" label="注册时间" header-align="center"></el-table-column>
-                <el-table-column prop="bankName" label="状态" header-align="center"></el-table-column>
-                 <el-table-column prop="bankName" label="手机号码" header-align="center"></el-table-column>
-                  <el-table-column prop="bankName" label="身份证号码" header-align="center"></el-table-column>
-            <el-table-column prop="bankName" label="开户行" header-align="center"></el-table-column>
-            <el-table-column prop="bankBranch" label="开户支行" header-align="center"></el-table-column>
-            <el-table-column prop="cardholder" label="开户人姓名" header-align="center"></el-table-column>
-            <el-table-column prop="cardNumber" label="银行卡号" header-align="center"></el-table-column>
-            <el-table-column prop label="身份证" header-align="center" width="200">
+                <el-table-column prop="regisTime" label="注册时间" header-align="center"></el-table-column>
+                <el-table-column prop label="状态" header-align="center">
+                  <template slot-scope="scope">
+                      <span v-if="scope.row.status==0">封号</span>
+                      <span v-if="scope.row.status==1">在线</span>
+                      <span v-if="scope.row.status==2">离线</span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="telephone" label="手机号码" header-align="center"></el-table-column>
+                <el-table-column prop="idNumber" label="身份证号码" header-align="center"></el-table-column>
+                <el-table-column prop="bankName" label="开户行" header-align="center"></el-table-column>
+                <el-table-column prop="bankBranch" label="开户支行" header-align="center"></el-table-column>
+                <el-table-column prop="cardholder" label="开户人姓名" header-align="center"></el-table-column>
+                <el-table-column prop="cardNumber" label="银行卡号" header-align="center"></el-table-column>
+            <!--<el-table-column prop label="身份证" header-align="center" width="200">
               <template slot-scope="scope">
                 <img
                   :src="BASE_URL+scope.row.idFace"
@@ -250,7 +256,7 @@
                   @click="isShow(3,scope.row.idFace)"
                 >查看</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
           </el-table>
           <!-- 分页显示 -->
           <el-pagination
@@ -411,7 +417,7 @@ export default {
       imgCard: "",
       currentPage: 1,
       cardShow: false,
-      teacherList: ["批改老师", "匹配知识点老师", "银行卡信息", "批改明细"],
+      teacherList: ["批改老师", "匹配知识点老师", "个人信息", "批改明细"],
       ItemList: [
         {
           text: "数据监控"
@@ -511,26 +517,38 @@ export default {
         } else {
           let arr = this.getTeacherSalaryList.list;
           let str =
-            "注册老师,是否有底薪,1～2年级自动批改0.2元/张,1～2年级手动批改0.3元/张,3～4年级自动批改0.2元/张,3～4年级手动批改0.4元/张,5～6年级自动批改0.2元/张,5～6年级手动批改0.5元/张,总计/元";
+            "注册老师,身份,归属管理员,科目,实际有效出勤段数,系统排版段数,出勤率,正确率,快对答案张数,1-2年级手动张数,3-4年级手动张数,5-6年级手动张数,底薪金额,批改提成,总计";
           for (let i = 0; i < arr.length; i++) {
             str +=
               "\n" +
               arr[i].name +
               "," +
-              arr[i].basicSalary +
+              arr[i].identity +
               "," +
-              arr[i].autoLowGradeCount +
+              arr[i].manager +
               "," +
-              arr[i].manualLowGradeCount +
+              arr[i].subject +
               "," +
-              arr[i].autoMiddleGradeCount +
+              arr[i].actualAttendCount +
               "," +
-              arr[i].manualMiddleGradeCount +
+              arr[i].shouldAttendCount +
+              "," +
+              arr[i].attendanceRate +
+              "," +
+              arr[i].accuracy +
               "," +
-              arr[i].autoHighGradeCount +
+              arr[i].totalAutoCount +
+              "," +
+              arr[i].manualLowGradeCount +
+              "," +
+              arr[i].manualMiddleGradeCount +
               "," +
               arr[i].manualHighGradeCount +
               "," +
+              arr[i].basicSalary +
+              "," +
+              arr[i].correctDecution +
+              "," +
               arr[i].total;
           }
           var uri = "data:text/csv;charset=utf-8," + encodeURIComponent(str);
@@ -576,16 +594,34 @@ export default {
           alert("无法启动Excel，请确保电脑中已经安装了Excel!");
         } else {
           let arr = this.GetKnowledgeTeacherSalaryList.list;
-          let str = "注册老师,是否有底薪,批改张数（0.1元/张）,总计/元";
+          let str = "注册老师,身份,归属管理员,科目,排班类型,实际有效出勤段数,系统排班段数,出勤率,正确率,作业批改数量,底薪金额,批改提成,总计";
           for (let i = 0; i < arr.length; i++) {
             str +=
               "\n" +
               arr[i].name +
               "," +
-              arr[i].basicSalary +
+              arr[i].identity +
+              "," +
+              arr[i].manager +
+              "," +
+              arr[i].subject +
+              "," +
+              arr[i].type +
+              "," +
+              arr[i].actualAttendCount +
+              "," +
+              arr[i].shouldAttendCount +
+              "," +
+              arr[i].attendanceRate +
+              "," +
+              arr[i].accuracy +
               "," +
               arr[i].correctCount +
               "," +
+              arr[i].basicSalary +
+              "," +
+              arr[i].correctDecution +
+              "," +
               arr[i].total;
           }
           // debugger
@@ -632,12 +668,22 @@ export default {
           alert("无法启动Excel，请确保电脑中已经安装了Excel!");
         } else {
           let arr = this.AllTeacherInfoList.list;
-          let str = "注册老师,开户行,开户支行,开户人姓名,银行卡号";
+          let str = "注册老师,科目,注册时间,状态,手机号码,身份证号码,开户行,开户支行,开户人姓名,银行卡号";
           for (let i = 0; i < arr.length; i++) {
             str +=
               "\n" +
               arr[i].name +
               "," +
+              arr[i].subject +
+              "," +
+              arr[i].regisTime +
+              "," +
+              arr[i].status +
+              "," +
+              arr[i].telephone +
+              "," +
+              arr[i].idNumber +
+              "," +
               arr[i].bankName +
               "," +
               arr[i].bankBranch +
@@ -743,8 +789,6 @@ export default {
       this.$store.dispatch("AllTeacherInfoList", {
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
-        oneMonth: this.selMonth,
-        maxCreateTime: this.formatDate(),
         name: this.inputValue
       });
     },