Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

src/pages/teacher/appraisalList.vue

@@ -17,6 +17,10 @@
           </template>
         </q-field>
       </div>
+      <div class="col-2">
+        <q-select filled v-model="msg.TeacherAccountId" dense use-input label="教师" :options="MyTeacherListData"
+          option-label="EmployeeName" @input="refreshPage" clearable option-value="Id" emit-value map-options />
+      </div>
     </div>
     <div class="page-content">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
@@ -29,7 +33,7 @@
             <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="考核" @click="goAssessTable()" />
           </div>
         </template>
-        <template v-slot:body-cell-AuditStatus="props">
+        <!-- <template v-slot:body-cell-AuditStatus="props">
           <q-td :props="props">
             <template v-if="props.row.AuditStatus==0">
               待提交
@@ -38,15 +42,15 @@
               {{props.row.AuditStatusName}}
             </template>
           </q-td>
-        </template>
+        </template> -->
         <template v-slot:body-cell-OptionId="props">
           <q-td :props="props">
-            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="submitApproval(props.row)"
+            <!-- <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="submitApproval(props.row)"
               label="提交审批" v-if="props.row.AuditStatus==0&&props.row.TeacherSignDate" />
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="showForm(props.row,1)"
               label="评价" />
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="showForm(props.row,2)"
-              label="建议" />
+              label="建议" /> -->
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="gotoDetail(props.row)"
               label="详情" />
           </q-td>
@@ -67,6 +71,9 @@
     queryTeacherAssessmentPage,
     SubmitTeacherAssessmentApproval
   } from '../../api/teacher/index';
+  import {
+    queryEmployee,
+  } from "../../api/users/user";
   import behaviorForm from "../../components/teacher/behavior-form.vue";
   import helpForm from "../../components/teacher/help-form.vue";
   export default {
@@ -125,12 +132,12 @@
             field: "TotalScore",
             align: "left"
           },
-          {
-            name: "AuditStatus",
-            label: "审核状态",
-            field: "AuditStatus",
-            align: "left"
-          },
+          // {
+          //   name: "AuditStatus",
+          //   label: "审核状态",
+          //   field: "AuditStatus",
+          //   align: "left"
+          // },
           {
             name: 'OptionId',
             label: '操作',
@@ -142,6 +149,7 @@
         isShowBehavior: false, //是否显示对员工评价弹窗
         isShowHelp: false, //是否显示员工对公司建议弹窗
         objOption: null,
+        MyTeacherListData: [], //教师列表
       }
     },
     created() {
@@ -149,14 +157,22 @@
       this.msg.YearStr = today.getFullYear().toString();
       this.msg.MonthStr = (today.getMonth() + 1).toString();
       this.queryDate = this.msg.YearStr + '-' + this.msg.MonthStr;
-      if (this.$route.query) {
-
-      }
+      this.findData();
     },
     mounted() {
       this.getTeacherAssessmentPage()
     },
     methods: {
+      findData() {
+        queryEmployee({
+          AccountTypeStr: "2",
+          IsLeave: 1
+        }).then(res => {
+          if (res.Code == 1) {
+            this.MyTeacherListData = res.Data;
+          }
+        })
+      },
       //翻页
       changePage(val) {
         this.msg.pageIndex = val;

src/pages/teacher/teacherAssessment.vue

@@ -81,7 +81,7 @@
               {{saveObj.S_JiaoWu_Time}}
             </td>
           </tr>
-          <tr>
+          <!-- <tr>
             <td colspan="9" style="text-align:left;padding-left:5px;">
               注：以下由部门考核者填写
             </td>
@@ -170,7 +170,7 @@
             <td colspan="9" style="text-align:left;padding-left:5px;">
               签字/日期：{{saveObj.TeacherSignDate}}
             </td>
-          </tr>
+          </tr> -->
         </tfoot>
       </table>
     </div>