Преглед изворни кода

签到信息对管审状态展示单独判断

cyy пре 9 месеци
родитељ
комит
7e781154fd
1 измењених фајлова са 17 додато и 5 уклоњено
  1. 17 5
      src/views/component/trainingManage/registerInfoDialog.vue

+ 17 - 5
src/views/component/trainingManage/registerInfoDialog.vue

@@ -35,7 +35,11 @@
                 placement="top-start"
                 width="300"
                 trigger="hover"
-                :content="`应到:${calRate.mustPeople}人,应到人员中实际签到:${calRate.mustSignIn}人(总计签到人数:${calRate.signIn}人,其他签到人数:${calRate.signIn - calRate.mustSignIn}人)`"
+                :content="`应到:${calRate.mustPeople}人,应到人员中实际签到:${
+                  calRate.mustSignIn
+                }人(总计签到人数:${calRate.signIn}人,其他签到人数:${
+                  calRate.signIn - calRate.mustSignIn
+                }人)`"
               >
                 <div slot="reference" style="cursor: pointer">
                   出勤率:{{ calRate.signInRate }}%
@@ -353,8 +357,12 @@ export default {
           this.tableList.push({
             ren_yuan_id_: person.ren_yuan_id_,
             //status: '已签到',
-            status: person.qian_dao_lei_xing === '手动'
-                ? '已签到' : '已补签',
+            status:
+              person.ye_wu_biao_ming_ === 't_gshyjyb'
+                ? '已签到'
+                : person.qian_dao_lei_xing === '手动'
+                ? '已签到'
+                : '已补签',
             qian_dao_shi_jian: person.qian_dao_shi_jian
             /*
             qian_dao_shi_jian:
@@ -364,8 +372,12 @@ export default {
             */
           })
         } else {
-          p.status = person.qian_dao_lei_xing === '手动'
-                ? '已签到' : '已补签'
+          p.status =
+            person.ye_wu_biao_ming_ === 't_gshyjyb'
+              ? '已签到'
+              : person.qian_dao_lei_xing === '手动'
+              ? '已签到'
+              : '已补签'
           p.qian_dao_shi_jian = person.qian_dao_shi_jian
           //p.qian_dao_shi_jian = person.qian_dao_lei_xing === '手动' ? '' : person.qian_dao_shi_jian
         }