页面修改

src/pages/teacher/appraisalList.vue

@@ -29,10 +29,20 @@
             <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="考核" @click="goAssessTable()" />
           </div>
         </template>
+        <template v-slot:body-cell-AuditStatus="props">
+          <q-td :props="props">
+            <template v-if="props.row.AuditStatus==0">
+              待提交
+            </template>
+            <template v-else>
+              {{props.row.AuditStatusName}}
+            </template>
+          </q-td>
+        </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)"
-              label="提交审批" />
+              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)"
@@ -115,6 +125,12 @@
             field: "TotalScore",
             align: "left"
           },
+          {
+            name: "AuditStatus",
+            label: "审核状态",
+            field: "AuditStatus",
+            align: "left"
+          },
           {
             name: 'OptionId',
             label: '操作',

src/pages/teacher/jobEvaluation.vue

@@ -107,6 +107,8 @@
           TotalScore: 0, //总分
           DetailsList: [],
           CheckType: 0, //1-教学主管，2-教务主管
+          IsJiaoWuFinish:0,//教务主管是否完成打分
+          IsTeacherFinish:0,//教学主管是否完成打分
         },
         isAuth: false, //是否有权限
         saveLoading: false,
@@ -174,6 +176,8 @@
               this.saveObj.TotalScore = tempData.TotalScore;
               this.saveObj.CheckType = tempData.CheckType;
               this.saveObj.DetailsList = tempData.DetailsList;
+              this.saveObj.IsTeacherFinish=tempData.IsTeacherFinish;
+              this.saveObj.IsJiaoWuFinish=tempData.IsJiaoWuFinish;
             } else {
               this.$q.notify({
                 type: 'negative',