caozhaorui 1 年之前
父節點
當前提交
a4f7e70e22
共有 2 個文件被更改,包括 22 次插入23 次删除
  1. 1 1
      src/views/staging/zbgly/center/seat.vue
  2. 21 22
      src/views/staging/zbgly/right/attendance-com.vue

+ 1 - 1
src/views/staging/zbgly/center/seat.vue

@@ -75,7 +75,7 @@ export default defineComponent({
       data: []
     })
     const isHover = (item) => {
-      return that.$util.isValue(item.deptName)
+      return that.$util.isValue(item.deptName) && item.peopleList?.length > 0
     }
     const initData = () => {
       state.loading = true

+ 21 - 22
src/views/staging/zbgly/right/attendance-com.vue

@@ -16,37 +16,37 @@
           <div class="title __text-ellipsis">{{item.name}}</div>
           <template v-if="item.status === '正常'">
             <div class="status status-true">
-              已签到<temlate v-if="dateType !== 'day'">({{item.number}}次)</temlate>
+              已签到<template v-if="dateType !== 'day'">({{item.number}}次)</template>
             </div>
           </template>
           <template v-else>
             <div class="status status-false">
-              {{item.status}}<temlate v-if="dateType !== 'day'">({{item.number}}次)</temlate>
+              {{item.status}}<template v-if="dateType !== 'day'">({{item.number}}次)</template>
             </div>
           </template>
         </div>
       </template>
     </div>
 <!--    <div class="opacity-block"/>-->
-    <CusDialog
-        title="考勤情况"
-        v-model:show="showTimeDialog"
-        @submit="showTimeDialog = false"
-        footAlign="right"
-        height="180px"
-        width="400px"
-    >
-      <div class="__normal-form">
-        <CusForm labelWidth="100px" ref="ref_form">
-          <CusFormColumn
-              :span="24"
-              label="自定义日期:"
-              link="date"
-              type="daterange"
-              v-model:param="cusDate"/>
-        </CusForm>
-      </div>
-    </CusDialog>
+<!--    <CusDialog-->
+<!--        title="考勤情况"-->
+<!--        v-model:show="showTimeDialog"-->
+<!--        @submit="showTimeDialog = false"-->
+<!--        footAlign="right"-->
+<!--        height="180px"-->
+<!--        width="400px"-->
+<!--    >-->
+<!--      <div class="__normal-form">-->
+<!--        <CusForm labelWidth="100px" ref="ref_form">-->
+<!--          <CusFormColumn-->
+<!--              :span="24"-->
+<!--              label="自定义日期:"-->
+<!--              link="date"-->
+<!--              type="daterange"-->
+<!--              v-model:param="cusDate"/>-->
+<!--        </CusForm>-->
+<!--      </div>-->
+<!--    </CusDialog>-->
   </BaseBlockCom>
 </template>
 
@@ -68,7 +68,6 @@ import {useRouter, useRoute} from 'vue-router'
 import BaseBlockCom from '../../common/base-block.vue'
 import ButtonSwitchCom from '../../common/button-switch.vue'
 import * as Handle from '../../common/handle'
-import {zbglyWorkbenchAdminCheck} from "@/api/modules/workbench";
 import {ElMessage} from "element-plus";
 
 export default defineComponent({