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

src/pages/teacher/teacherMonth.vue

@@ -175,7 +175,8 @@
         </template>
         <template v-slot:body-cell-FinishTimesPlanCount="props">
           <q-td :props="props">
-            <span style="color:blue;cursor:pointer;" title="点击查看跟进详细信息" @click="GoToDetails(props.row)"> {{props.row.FinishTimes}} /
+            <span style="color:blue;cursor:pointer;" title="点击查看跟进详细信息" @click="GoToDetails(props.row)">
+              {{props.row.FinishTimes}} /
               {{props.row.FollowCount}}</span>
           </q-td>
         </template>
@@ -244,6 +245,9 @@
             <q-td>
               {{lastRow.ActivityNum}}
             </q-td>
+            <q-td>
+              {{lastRow.AssessmentScore}}
+            </q-td>
             <q-td>
               {{lastRow.TotalScore}}
             </q-td>
@@ -422,6 +426,13 @@
             align: 'left',
             sortable: true
           },
+          {
+            name: 'AssessmentScore',
+            label: '考核得分',
+            field: 'AssessmentScore',
+            align: 'left',
+            sortable: true
+          },
           {
             name: 'TotalScore',
             label: '总分数',