11

src/views/system/schedulingInformation/ViewClockInList.vue

@@ -101,11 +101,11 @@
           || (record.ifwork !=0 && record.attendanceCount < 2 && record.name != null)
           || (record.ifwork !=0 && record.name != null && record.name != '' && (record.gotoTime == null || record.gotoTime == ''))
           || record.duration != null
-          && (record.setInfo == '' || record.setInfo == null)">
+          && (record.setInfo > 0 ) && (record.errorState != 0 )">
           异常
           </a-tag>
           <a-tag color="#87d068" v-else>正常</a-tag>
-          <a-icon title="该员工在未排班或休息班打卡" v-if="(record.name == null || record.shiftRealTimeS == null) && record.gotoTime != null && record.gotoTime != '' " slot="count" v-else type="exclamation" style="color: #f57301" />
+          <a-icon title="该员工在未排班或休息班打卡" v-if="(record.name == null || record.shiftRealTimeS == null) && record.gotoTime != null && record.gotoTime != '' && (record.setInfo > 0 )" slot="count" type="exclamation" style="color: #f57301" />
           
         </a-badge>
         <span slot="realShiftTime" slot-scope="text, record, index">
@@ -204,6 +204,21 @@
           //   align: 'center',
           //   dataIndex: 'shiftTimeS'
           // },
+          {
+            title: '一级部门',
+            align: 'center',
+            dataIndex: 'oneDept'
+          },
+          {
+            title: '二级部门',
+            align: 'center',
+            dataIndex: 'twoDept'
+          },
+          {
+            title: '三级部门',
+            align: 'center',
+            dataIndex: 'threeDept'
+          },
           {
             title: '最早打卡时间',
             align: 'center',

src/views/system/schedulingInformation/ViewClockUserInfo.vue

@@ -65,7 +65,7 @@
           </a-tag>
           <a-tag color="#87d068" v-else>正常</a-tag>
           
-          <a-icon title="该员工在未排班或休息班打卡" v-if="(record.name == null || record.shiftRealTimeS == null) && record.gotoTime != null && record.gotoTime != '' && (record.setInfo > 0 )" slot="count" v-else type="exclamation" style="color: #f57301" />
+          <a-icon title="该员工在未排班或休息班打卡" v-if="(record.name == null || record.shiftRealTimeS == null) && record.gotoTime != null && record.gotoTime != '' && (record.setInfo > 0 )" slot="count" type="exclamation" style="color: #f57301" />
           
           <!-- <a>{{record.setInfo}}</a> -->
         </a-badge>
@@ -574,13 +574,18 @@
           //    this.$message.warning("已设置过，不能再次设置");
           //    return;
           // }
-          // if(record.demo == '' || record.demo == null){
-          //    this.$message.warning("该员工当日没有加班申请信息");
-          //    return;
-          // }
-          
+          if(record.duration == '' || record.duration == null){
+             this.$message.warning("该员工当日没有加班申请信息");
+             return;
+          }
+          let userId = null;
+          if(record.userId == '' || record.userId == null){
+            userId = record.person;
+          }else{
+            userId = record.userId;
+          }
           let that = this;
-          fuXinInfo({viewDate:record.viewDate,viewDate1:record.beginDate,userId:record.userId,pkId:record.id,st:st,w:w}).then((res) => {
+          fuXinInfo({viewDate:record.viewDate,viewDate1:record.beginDate,userId:userId,pkId:record.id,st:st,w:w}).then((res) => {
             if (res.success) {
               that.$message.success("已成功设置");
               that.loadData();