Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/App.vue

@@ -24,8 +24,7 @@ export default {
   beforeCreate() {
     Vue.prototype.$app = this;
   },
-  created() {
-  },
+  created() {},
 
   methods: {},
 };
@@ -58,4 +57,43 @@ export default {
     }
   }
 }
+/deep/.el-menu--horizontal > .el-menu-item.is-active,
+/deep/.el-tabs__item.is-active {
+  border-bottom: 2px solid #409eff;
+  color: #409eff;
+  font-weight: 600;
+}
+/deep/.el-tabs__item.is-active {
+  border-bottom: 3px solid #409eff;
+}
+/deep/.el-tabs__item:hover {
+  color: #303133;
+}
+/deep/.el-tabs__active-bar {
+  color: unset;
+  background-color: unset;
+}
+/deep/.el-tabs__item {
+  width: 120px;
+  color: #909399;
+}
+/deep/.el-card,
+/deep/.page {
+  // -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  // box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  padding: 0;
+}
+
+
+/deep/.el-table th {
+  background: #fafafa !important;
+  color: rgba(0, 0, 0, 0.85) !important;
+}
+/deep/.el-table .cell {
+  font-size: 14px;
+}
+/deep/.el-drawer__header {
+  margin-bottom: 0;
+  padding-bottom: 20px;
+}
 </style>

attendance-performance-manager-ui/admin/src/assets/less/base.css

@@ -11,13 +11,8 @@ html * {
 }
 html,
 body {
-  /* height: 100%; */
-  /* min-height: 100%; */
   font-family: "Microsoft Yahei", "Helvetica Neue", Helvetica, STHeiTi, Arial, sans-serif;
 }
-body {
-  overflow-y: scroll;
-}
 body,
 div,
 dl,
@@ -251,6 +246,11 @@ a {
 #operatorUserCabinCheckBox .el-checkbox__label {
   display: inline;
 }
+.el-table th,
+.el-table tr {
+  height: 54px;
+  text-align: center;
+}
 .page-statistics .chart {
   margin-bottom: 80px;
   border: 1px solid #ededed;
@@ -295,7 +295,7 @@ a {
   word-break: break-word;
 }
 .el-button--primary {
-  background: linear-gradient(90deg, #5ab6ff, #2e9aff) !important;
+  background: linear-gradient(180deg, #5ab6ff, #2e9aff) !important;
   color: #fff !important;
   text-align: center !important;
 }

attendance-performance-manager-ui/admin/src/assets/less/base.less

@@ -275,7 +275,11 @@ a {
 #operatorUserCabinCheckBox .el-checkbox__label {
   display: inline;
 }
-
+.el-table th,
+.el-table tr {
+  height: 54px;
+  text-align: center;
+}
 // 统计页面隔日期变色
 .page-statistics {
   .chart {
@@ -333,7 +337,7 @@ a {
   }
 }
 .el-button--primary {
-  background: linear-gradient(90deg, #5ab6ff, #2e9aff) !important;
+  background: linear-gradient(180deg, #5ab6ff, #2e9aff) !important;
   color: #fff !important;
   text-align: center !important;
 }

attendance-performance-manager-ui/admin/src/assets/utils/dateFormat.js

 export const timestampToTime = (timestamp, transLength) => {
   // 时间戳为10位需*1000，时间戳为13位不需乘1000
   let date = null;
+  if (timestamp) {
     if (timestamp.length < 13) {
       date = new Date(timestamp * 1000);
     } else {
@@ -19,13 +20,17 @@ export const timestampToTime = (timestamp, transLength) => {
     let m =
       (date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()) +
       ":";
-  let s = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+    let s =
+      date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
     switch (transLength) {
       case 3:
         return Y + M + D;
       case 6:
         return Y + M + D + h + m + s;
     }
+  } else {
+    return "";
+  }
 };
 // 小时：分钟 ==》 转分钟
 

attendance-performance-manager-ui/admin/src/components/DataTable.vue

@@ -25,7 +25,7 @@
       :width="column.width"
       :sortable="column.sortable"
       :show-overflow-tooltip="column.tooltip"
-      :align="column.align || 'left'"
+      :align="column.align || 'center'"
       :formatter="column.formatter"
       :reserve-selection="column.reserveSelection"
       :subColumns="column.subColumns"
@@ -39,7 +39,7 @@
         :label="sunColumn.label"
         :width="sunColumn.width"
         :sortable="sunColumn.sortable"
-        :align="sunColumn.align || 'left'"
+        :align="sunColumn.align || 'center'"
         :formatter="sunColumn.formatter"
       />
     </el-table-column>

attendance-performance-manager-ui/admin/src/components/DataTableSelect.vue

@@ -26,7 +26,7 @@
         :width="column.width"
         :sortable="column.sortable"
         :show-overflow-tooltip="column.tooltip"
-        :align="column.align || 'left'"
+        :align="column.align || 'center'"
         :formatter="column.formatter"
         :reserve-selection="column.reserveSelection"
         :subColumns="column.subColumns"
@@ -40,7 +40,7 @@
           :label="sunColumn.label"
           :width="sunColumn.width"
           :sortable="sunColumn.sortable"
-          :align="sunColumn.align || 'left'"
+          :align="sunColumn.align || 'center'"
           :formatter="sunColumn.formatter"
         />
       </el-table-column>

attendance-performance-manager-ui/admin/src/components/DataTreeTable.vue

@@ -19,7 +19,7 @@
         :label="column.label"
         :width="column.width"
         :show-overflow-tooltip="column.tooltip"
-        :align="column.align || 'left'"
+        :align="column.align || 'center'"
         :formatter='column.formatter'
       >
       </el-table-column>

attendance-performance-manager-ui/admin/src/components/FileUpload.vue

@@ -12,9 +12,12 @@
       :headers="headers"
       class="upload-file-uploader"
       ref="upload"
+      :disabled="pageInfoType == 'view'"
     >
       <!-- 上传按钮 -->
-      <el-button size="mini" type="primary">选取文件</el-button>
+      <el-button size="mini" type="success" :disabled="pageInfoType == 'view'"
+        >选取文件</el-button
+      >
 
       <!-- 上传提示 -->
       <div class="el-upload__tip" slot="tip" v-if="showTip">
@@ -95,6 +98,10 @@ export default {
       type: String,
       default: "",
     },
+    pageInfoType: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {

attendance-performance-manager-ui/admin/src/components/FormField.vue

@@ -108,6 +108,21 @@
             >{{ $label }}</el-radio
           >
         </el-radio-group>
+        <el-radio-group
+          :disabled="disabled"
+          v-model="field"
+          @change="emit"
+          v-if="type === 'radioCol'"
+          style="display: flex;margin-top: 12px;"
+        >
+          <el-radio
+            v-for="($label, $value) in enumData"
+            :key="$value"
+            :label="$value"
+            style="margin-bottom: 15px;"
+            >{{ $label }}</el-radio
+          >
+        </el-radio-group>
 
         <el-checkbox-group
           :disabled="disabled"

attendance-performance-manager-ui/admin/src/components/Header.vue

@@ -43,16 +43,16 @@
         </el-badge>
       </div> -->
       <div class="controllBar" @click="returnHome">
-        <i class="el-icon-s-home" style="font-size: 15px; margin-right: 10px">
-          首页</i
+        <i class="el-icon-s-home" style="font-size: 14px; margin-right: 10px">
+          返回系统首页</i
         >
       </div>
       <a class="controllBar" :href="portal" style="color: #fff;">
         <i
           class="el-icon-arrow-left"
-          style="font-size: 15px; margin-right: 10px"
+          style="font-size: 14px; margin-right: 10px"
         >
-          返回门户</i
+          返回平台门户</i
         >
       </a>
 
@@ -210,16 +210,19 @@ export default {
   .layout-menu-wrapper {
     height: 72px;
     line-height: 72px;
-    font-size: 14px;
+    font-size: 16px;
     color: #eee;
     background: linear-gradient(90deg, #1845c6, #2999ff) !important;
     .layout-logo {
-      height: 50px;
+      height: 100%;
       .el-icon-menu {
         display: none;
       }
       a {
         margin: auto;
+        display: block;
+        width: 300px;
+        height: 100%;
       }
       img {
         vertical-align: middle;
@@ -228,6 +231,8 @@ export default {
 
     .menu-list {
       li {
+        width: 140px;
+        text-align: center;
         span {
           display: block;
           padding: 0 6px;
@@ -251,10 +256,10 @@ export default {
   }
   .controllBar {
     background-color: rgba(255, 255, 255, 0.2);
-    width: 120px;
+    width: 150px;
     height: 44px;
     line-height: 44px;
-    margin-top: 34px;
+    margin-top: 36px;
     transform: translateY(-50%);
     text-align: center;
     border-radius: 5px;

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -32,7 +32,7 @@
           v-model="form[item.name]"
           :filterable="item.filterable"
           :multiple="item.multiple"
-          clearable="true"
+          :clearable="true"
           @change="item.change"
           @clear="item.clear"
           v-if="item.type === 'select'"
@@ -79,7 +79,7 @@
           v-if="item.type === 'cascader'"
           v-model="selectedTreeID"
           :filterable="item.filterable"
-          clearable="true"
+          :clearable="true"
           change-on-select
           @change="treeSelecteds"
           :options="treeDatas"
@@ -187,7 +187,11 @@
 import Qs from "qs";
 import { type } from "@/assets/utils";
 import { isArray } from "util";
-import { getFirstDay, getLastDay } from "@/assets/utils/dateFormat.js";
+import {
+  getFirstDay,
+  getLastDay,
+  timestampToTime,
+} from "@/assets/utils/dateFormat.js";
 export default {
   props: {
     search: {
@@ -251,6 +255,20 @@ export default {
         delete this.form.summaryTimeStart;
         delete this.form.summaryTimeEnd;
       }
+      if (this.$route.name == "attendance/record/hik/list") {
+        if (this.form.attendanceDateStart && this.form.attendanceDateEnd) {
+          let startValue = Date.parse(this.form.attendanceDateStart);
+          let endValue = Date.parse(this.form.attendanceDateEnd);
+          if (startValue > endValue) {
+            this.$message.error("查询-结束的日期需大于开始日期");
+            this.form.attendanceDateEnd = "";
+            return false;
+          }
+        } else {
+          this.form.attendanceDateStart = getFirstDay();
+          this.form.attendanceDateEnd = getFirstDay();
+        }
+      }
 
       let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
       let data = this.decode(params);
@@ -398,6 +416,20 @@ export default {
         delete this.form.summaryTimeStart;
         delete this.form.summaryTimeEnd;
       }
+      if (this.$route.name == "attendance/record/hik/list") {
+        if (this.form.attendanceDateStart && this.form.attendanceDateEnd) {
+          let startValue = Date.parse(this.form.attendanceDateStart);
+          let endValue = Date.parse(this.form.attendanceDateEnd);
+          if (startValue > endValue) {
+            this.$message.error("查询-结束的日期需大于开始日期");
+            this.form.attendanceDateEnd = "";
+            return false;
+          }
+        } else {
+          this.form.attendanceDateStart = timestampToTime(new Date(), 3);
+          this.form.attendanceDateEnd = timestampToTime(new Date(), 3);
+        }
+      }
       let params = JSON.parse(JSON.stringify(this.form)); //不更改原始数据
       let data = this.decode(params);
 
@@ -527,6 +559,9 @@ export default {
   .el-input {
     width: 170px;
   }
+  .el-form-item {
+    margin-bottom: 10px;
+  }
   .el-select .el-input {
     width: 140px;
   }
@@ -536,6 +571,7 @@ export default {
   .search-form-wapper {
     .el-form-item {
       width: 100%;
+      margin-bottom: 10px;
       .el-form-item__label {
         min-width: 70px;
       }

attendance-performance-manager-ui/admin/src/components/Table.vue

@@ -24,6 +24,7 @@
                 size="mini"
                 @click="config.methods.add"
                 title="新增"
+                style="margin-left: 10px;"
                 >新增</el-button
               >
               <el-button
@@ -55,6 +56,7 @@
                   icon="el-icon-delete"
                   type="danger"
                   size="mini"
+                  style="margin-left: 10px;"
                   title="批量删除"
                   >批量删除</el-button
                 >
@@ -233,7 +235,7 @@
       v-if="!isShowButton('notPagination') ? false : data.pageInfo.totalResult"
     >
       <Pagination
-        style="float: left"
+        style="float: right"
         :total="data.pageInfo.totalResult"
         :prePageResult="data.pageInfo.prePageResult"
       />
@@ -344,11 +346,11 @@ export default {
     .table-head {
       display: block;
       width: 100%;
+
       .el-button {
         margin-bottom: 5px;
       }
       .table-head-left {
-        margin-bottom: 10px;
         display: block;
         width: 100%;
       }
@@ -358,39 +360,41 @@ export default {
         width: 100%;
       }
     }
+    .table-body,
+    .table-foot {
+      padding: 0 10px;
+    }
   }
 }
 .layout-table {
   .table-head {
-    margin-bottom: 10px;
     //padding-bottom: 12px;
     // padding-top: 7px;
-    border-bottom: 1px solid #ededed;
+    // border-bottom: 1px solid #ededed;
     .el-breadcrumb {
       margin-right: 30px;
     }
     .table-head-left .buttons {
       button + button {
         margin-left: 10px;
-        margin-bottom: 10px;
       }
       button + span {
         margin-left: 10px;
-        margin-bottom: 10px;
       }
       span + span {
         margin-left: 10px;
-        margin-bottom: 10px;
       }
       span + button {
         margin-left: 10px;
-        margin-bottom: 10px;
       }
     }
   }
+  .table-body,
+  .table-foot {
+    padding: 0 10px;
+  }
   .table-form {
     padding-top: 10px;
-    margin-top: 10px;
     overflow: hidden;
   }
   .search-form-wapper {

attendance-performance-manager-ui/admin/src/components/tabPane.vue

 <template>
-  <div style="margin-bottom:15px;">
+  <div>
     <el-menu
       :default-active="activeName"
       class="el-menu-demo"

attendance-performance-manager-ui/admin/src/components/tools/TableButtons.vue

@@ -66,7 +66,7 @@
         icon="el-icon-delete"
         size="mini"
         title="删除"
-        style="margin-left: 0;margin-right: 5px"
+        style="margin-left: 0;margin-right: 5px;color: #FA4D4C;"
         >删除</el-button
       >
     </Confirm>

attendance-performance-manager-ui/admin/src/views/Layout.vue

 <template>
   <div :style="menuPageCss" class="pages page-layout">
-    <LayoutHeader v-if="menuPage !== 'left'" @changePath="changePath"></LayoutHeader>
-    <LayoutHeaderLeft @toggle="toggle" :isOpen="isOpen" v-if="menuPage === 'left'" />
+    <LayoutHeader
+      v-if="menuPage !== 'left'"
+      @changePath="changePath"
+    ></LayoutHeader>
+    <LayoutHeaderLeft
+      @toggle="toggle"
+      :isOpen="isOpen"
+      v-if="menuPage === 'left'"
+    />
     <div class="layout">
       <router-view :class="{ active: !isOpen }" />
     </div>
@@ -53,7 +60,6 @@ export default {
 .layout {
   padding: 15px 15px 0 15px;
   box-sizing: border-box;
-
 }
 
 .page {
@@ -71,7 +77,7 @@ export default {
 }
 
 .page-layout {
-  background: #eee;
+  background: #f0f2f5;
   height: 100vh;
   overflow: auto;
 }
@@ -83,13 +89,13 @@ export default {
 
 /* 滚动条上的滚动滑块 */
 .page-layout::-webkit-scrollbar-thumb {
-  background: #CCCCCC;
+  background: #cccccc;
   border-radius: 4px;
 }
 
 /* 滚动条轨道 */
 .page-layout::-webkit-scrollbar-track {
-  background: #EEEEEE;
+  background: #eeeeee;
   border-radius: 4px;
 }
 </style>

attendance-performance-manager-ui/admin/src/views/attendance/class/dialogshow.vue

 <template>
   <!-- 班次表单 -->
   <el-drawer :title="title" :visible.sync="open" size="55%">
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="140px"
+      style="padding-right:10px;"
+    >
       <el-row>
         <Field
           label="班次名称"

attendance-performance-manager-ui/admin/src/views/attendance/class/list.vue

@@ -6,17 +6,16 @@
 </template>
 
 <script>
-    /** 表单弹出框模式需引入 */
-    import dialogShow from "./dialogshow";
-    import table from "@/assets/mixins/table";
-    export default {
+/** 表单弹出框模式需引入 */
+import dialogShow from "./dialogshow";
+import table from "@/assets/mixins/table";
+export default {
   name: "AttendanceClassList",
   components: {
-            dialogShow
+    dialogShow,
   },
   mixins: [table],
-        created() {
-        },
+  created() {},
   methods: {
     renderTable(tableData) {
       return (
@@ -31,8 +30,8 @@
           prop={options.prop}
           label={options.label}
           width={options.width}
-                    >
-                    </el-table-column>
+          align="center"
+        ></el-table-column>
       );
     },
     /** 重写新增方法 */
@@ -47,18 +46,47 @@
     toView(row) {
       this.$refs.dialogform.view(row);
     },
-
   },
   data() {
     return {
       /** 子表列元素 */
-                columnSet:[
-                    {prop:"goWorkDate",label:"上班打卡时间",width:150},
-                    {prop:"goWorkDateBefore",label:"上班前打卡(分钟)",width:150},
-                    {prop:"goWorkDateAfter",label:"上班后打卡(分钟)",width:150},
-                    {prop:"offWorkDate",label:"下班打卡时间",width:150},
-                    {prop:"offWorkDateBefore",label:"下班前打卡(分钟)",width:150},
-                    {prop:"offWorkDateAfter",label:"下班后打卡(分钟)",width:150},
+      columnSet: [
+        {
+          prop: "goWorkDate",
+          label: "上班打卡时间",
+          width: 150,
+          align: "center",
+        },
+        {
+          prop: "goWorkDateBefore",
+          label: "上班前打卡(分钟)",
+          width: 150,
+          align: "center",
+        },
+        {
+          prop: "goWorkDateAfter",
+          label: "上班后打卡(分钟)",
+          width: 150,
+          align: "center",
+        },
+        {
+          prop: "offWorkDate",
+          label: "下班打卡时间",
+          width: 150,
+          align: "center",
+        },
+        {
+          prop: "offWorkDateBefore",
+          label: "下班前打卡(分钟)",
+          width: 150,
+          align: "center",
+        },
+        {
+          prop: "offWorkDateAfter",
+          label: "下班后打卡(分钟)",
+          width: 150,
+          align: "center",
+        },
         // {prop:"remark",label:"备注",width:150},
         // {prop:"classId",label:"班次ID",width:150},
       ],
@@ -68,16 +96,17 @@
             name: "className",
             type: "text",
             label: "班次名称",
-                            fuzzy: true
-                        }
+            fuzzy: true,
+          },
         ],
-                    isshowTabPane:true,
+        isshowTabPane: true,
         columns: [
-                        {type: "selection", width: 60},
-                        {type: "index",label: "序号",width: 50},
-                        {label: "班次名称", prop: "className"},
+          { type: "selection", width: 60 },
+          { type: "index", label: "序号", width: 50 },
+          { label: "班次名称", prop: "className" },
           // {label: "考勤时间", prop: "className"},
-                        {label: "考勤班次详细信息",
+          {
+            label: "考勤班次详细信息",
             width: 200,
             prop: "subColumns",
             formatter: (row) => {
@@ -87,7 +116,9 @@
               return (
                 <el-popover placement="right" width={widthsize} trigger="click">
                   {this.renderTable(row.attendanceClassDetailList)}
-                                      <el-button type="text" slot="reference">详细</el-button>
+                  <el-button type="text" slot="reference">
+                    详细
+                  </el-button>
                 </el-popover>
               );
             },
@@ -95,15 +126,22 @@
           {
             label: "操作",
             width: 240,
-                            formatter: row => {
+            formatter: (row) => {
               return (
-                                    <table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
+                <table-buttons
+                  noAdd
+                  noView
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
               );
-                            }
-                        }
-                    ]
-                }
-            };
-        }
+            },
+          },
+        ],
+      },
     };
+  },
+};
 </script>

attendance-performance-manager-ui/admin/src/views/attendance/group/groupTemplate.vue

 <template>
   <div class="container" v-if="open">
-    <el-card style="min-height:80vh;padding: 0 10px">
+    <el-card style="min-height:80vh;">
       <div class="head">
         <el-button type="primary" size="mini" @click="backTo"
           >返回上一级</el-button
         >
       </div>
       <tab-pane :activeName="activeName" :thirdList="thirdList"></tab-pane>
+      <div style="padding: 0 10px;">
         <div class="mt20">
           <div>考勤组名称</div>
           <el-input
@@ -136,27 +137,37 @@
           <el-button type="primary" @click="saveSetform">保存设置</el-button>
           <el-button @click="allReset">全部重置</el-button>
         </div>
+      </div>
     </el-card>
     <!-- 设置考勤人员 -->
     <el-drawer
-      title="考勤人员"
-      size="70%"
+      :title="
+        drawer1
+          ? '考勤人员'
+          : drawer2
+          ? '考勤组负责人'
+          : drawer3
+          ? '考勤时间'
+          : drawer4
+          ? '打卡方式'
+          : ''
+      "
+      size="50%"
       :beforeClose="closedrawer"
       :visible.sync="drawer"
       direction="rtl"
     >
-      <div style="padding:20px">
+      <div style="padding:10px 10px 10px 20px">
         <!-- 考勤人员 -->
         <div v-if="drawer1">
           <div>参与考勤人员({{ this.attendArr.length }})</div>
           <el-input
             @focus="selectGroup(true)"
             type="textarea"
-            maxlength="20"
-            autosize
+            maxlength="200"
+            :autosize="{ minRows: 2, maxRows: 100 }"
             v-model="persons"
-            style="width:80%"
-            size="mini"
+            style="width:100%;margin-top: 10px;"
             placeholder="请选择"
           >
           </el-input>
@@ -165,7 +176,10 @@
         <!-- 考勤组 -->
         <div class="mt10" v-if="drawer2">
           <div>考勤组负责人：</div>
-          <el-select v-model="groupResponsibleEntity.responsibleId">
+          <el-select
+            v-model="groupResponsibleEntity.responsibleId"
+            style="width: 100%;margin-top: 10px;"
+          >
             <el-option
               v-for="($label, $value) in responsiableList"
               :key="$value"
@@ -192,10 +206,25 @@
         <!-- 考勤时间 -->
         <div class="mt20" v-if="drawer3">
           <!--  -->
+          <div>班制设定</div>
           <el-radio-group v-model="setParams.type" @change="changeRadio">
-            <div class="mt10" v-for="(item, index) in paibanType" :key="index">
-              <el-radio :label="item.value">{{ item.label }}</el-radio>
-              <div class="tips">{{ item.des }}</div>
+            <div
+              v-for="(item, index) in paibanType"
+              :key="index"
+              style="margin: 30px 0;"
+              class="radio_box"
+            >
+              <el-radio :label="item.value"
+                ><span style="font-size: 16px;font-weight: 600;">
+                  {{ item.label }}</span
+                ></el-radio
+              >
+              <div
+                class="tips"
+                style="font-size: 14px;margin-top: 10px;margin-left: 28px;"
+              >
+                {{ item.des }}
+              </div>
             </div>
           </el-radio-group>
         </div>
@@ -275,13 +304,14 @@
           </div>
 
           <div v-if="setParams.type != 2">
+            <div>自动排休</div>
             <div class="mt10">
               <el-checkbox v-model="holidays" :true-label="1" :false-label="0"
                 >法定节假日自动排休</el-checkbox
               >
             </div>
 
-            <div class="mt10">
+            <div style="margin-top: 30px;">
               <div>特殊日期</div>
             </div>
 
@@ -332,15 +362,19 @@
           <div>考勤方式</div>
           <el-radio-group v-model="setParams.attendanceType">
             <div
-              class="mt10"
               v-for="(item, index) in attendanceType"
               :key="index"
+              style="margin: 30px 0;"
+            >
+              <el-radio :label="item.value"
+                ><span style="font-size: 16px;font-weight: 600;">
+                  {{ item.label }}</span
+                ></el-radio
               >
-              <el-radio :label="item.value">{{ item.label }}</el-radio>
             </div>
           </el-radio-group>
         </div>
-        <div class="button_box" style="width: 100%;margin: 20px">
+        <div class="button_box" style="width: 100%;margin: 20px 0">
           <el-button type="primary" @click="() => (drawer = false)"
             >保存</el-button
           >
@@ -1392,7 +1426,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .container {
-  font-size: 15px;
+  font-size: 16px;
 }
 .labelClass {
   width: 200px;
@@ -1401,9 +1435,19 @@ export default {
   margin-left: 5px;
   margin-right: 5px;
   color: #606266;
-  background-color: #fff;
+  background-color: transparent;
 }
 
+/deep/.el-card.is-always-shadow {
+  box-shadow: unset;
+  -webkit-box-shadow: unset;
+}
+/deep/.el-card {
+  border: unset;
+}
+/deep/.el-card__body {
+  padding: 0;
+}
 .contentClass {
   width: 600px;
 }
@@ -1427,8 +1471,12 @@ export default {
 }
 .head {
   position: absolute;
-  right: 45px;
+  right: 10px;
   z-index: 99;
-
+  top: 6px;
+}
+/deep/.el-textarea__inner {
+  height: 500px !important;
+  font-size: 14px;
 }
 </style>

attendance-performance-manager-ui/admin/src/views/attendance/group/list.vue

 <template>
   <div class="page">
-        <LayoutTable :data="tableData" notDel :config="tableConfig" v-if="isshow"></LayoutTable>
+    <LayoutTable
+      :data="tableData"
+      notDel
+      :config="tableConfig"
+      v-if="isshow"
+    ></LayoutTable>
     <group-template ref="groupTemplate" @ok="okFn" />
   </div>
 </template>
 
 <script>
-    /** 表单弹出框模式需引入 */
-    import groupTemplate from "./groupTemplate";
-    import table from "@/assets/mixins/table";
-    export default {
+/** 表单弹出框模式需引入 */
+import groupTemplate from "./groupTemplate";
+import table from "@/assets/mixins/table";
+export default {
   name: "AttendanceGroupList",
   components: {
-            groupTemplate
+    groupTemplate,
   },
   mixins: [table],
-        created() {
-        },
+  created() {},
   methods: {
     renderTable(tableData) {
       return (
@@ -31,13 +35,12 @@
           prop={options.prop}
           label={options.label}
           width={options.width}
-                    >
-                    </el-table-column>
+        ></el-table-column>
       );
     },
     /** 重写新增方法 */
     toAdd(row) {
-                this.isshow = false
+      this.isshow = false;
       this.$refs.groupTemplate.add(row);
       // this.$router.push(
       //     {
@@ -47,7 +50,7 @@
     },
     /** 重写编辑方法 */
     toEdit(row) {
-                this.isshow = false
+      this.isshow = false;
       this.$refs.groupTemplate.edit(row);
       // this.$router.push(
       //     {
@@ -57,47 +60,58 @@
     },
     /** 重写查看方法 */
     toView(row) {
-                this.isshow = false
+      this.isshow = false;
       this.$refs.groupTemplate.view(row);
     },
-            okFn(val){
-                this.getData()
-                this.isshow = val
-            }
+    okFn(val) {
+      this.getData();
+      this.isshow = val;
+    },
   },
   data() {
     return {
-                isshow:true,
+      isshow: true,
       /** 子表列元素 */
-                columnSet:[
-                    {prop:"groupId",label:"考勤组",width:100},
-                    {prop:"groupName",label:"考勤组名称",width:100},
-                    {prop:"staffId",label:"员工ID",width:100},
-                    {prop:"staffName",label:"员工姓名",width:100},
-                    {prop:"partAttendance",label:"是否参与考勤，",width:100},
-                    {prop:"remark",label:"备注",width:100},
+      columnSet: [
+        { prop: "groupId", label: "考勤组", width: 100 },
+        { prop: "groupName", label: "考勤组名称", width: 100 },
+        { prop: "staffId", label: "员工ID", width: 100 },
+        { prop: "staffName", label: "员工姓名", width: 100 },
+        { prop: "partAttendance", label: "是否参与考勤，", width: 100 },
+        { prop: "remark", label: "备注", width: 100 },
       ],
       config: {
-                    isshowTabPane:true,
+        isshowTabPane: true,
         search: [
           {
             name: "staffName",
             type: "text",
             label: "考勤组名称",
-                            fuzzy: true
+            fuzzy: true,
           },
         ],
         columns: [
-                        {type: "selection", width: 60,fixed:'left'},
-                        {type: "index",label: "序号",width: 50,fixed:'left'},
+          { type: "selection", width: 60, fixed: "left" },
+          { type: "index", label: "序号", width: 50, fixed: "left" },
 
-                        {label: "考勤组名称", prop: "groupName",width:200,fixed:'left'},
+          { label: "考勤组名称", prop: "groupName", width: 200, fixed: "left" },
 
-                        {label: "人数", prop: "personNum",width: 80,fixed:'left'},
+          { label: "人数", prop: "personNum", width: 80, fixed: "left" },
 
-                        {label: "负责人", prop: "responsibleName",width: 80,fixed:'left'},//未
+          {
+            label: "负责人",
+            prop: "responsibleName",
+            width: 80,
+            fixed: "left",
+          }, //未
 
-                        {label: "类型", prop: "type",formatter: this.formatterattendType,width: 100,fixed:'left'},
+          {
+            label: "类型",
+            prop: "type",
+            formatter: this.formatterattendType,
+            width: 100,
+            fixed: "left",
+          },
 
           // {label: "创建用户", prop: "createUserId", formatter: this.formatter},
 
@@ -105,7 +119,11 @@
 
           // {label: "考勤方式", prop: "attendanceType"},
 
-                        {label: "考勤时间", prop: "attendanceTime",formatter:this.formatterBanci},//未
+          {
+            label: "考勤时间",
+            prop: "attendanceTime",
+            formatter: this.formatterBanci,
+          }, //未
 
           // {label: "考勤组人员信息",
           //   width: 120,
@@ -125,15 +143,27 @@
           {
             label: "操作",
             width: 240,
-                            formatter: row => {
+            formatter: (row) => {
               return (
-                                    <table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
+                <table-buttons
+                  noAdd
+                  noView
+                  row={row}
+                  onEdit={this.toEdit}
+                  onView={this.toView}
+                  onDel={this.toDel}
+                />
               );
-                            }
-                        }
-                    ]
-                }
-            };
-        }
+            },
+          },
+        ],
+      },
     };
+  },
+};
 </script>
+<style lang="less" scoped>
+.table-head {
+  padding-left: 10px;
+}
+</style>

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/drawershow.vue

@@ -79,22 +79,18 @@
             placeholder="请输入请假事由"
             :disabled="pageInfo.type == 'view'"
           />
+          <el-row>
             <Field
               label="审核结果"
               prop="auditResult"
               v-model="form.auditResult"
-            type="radio"
+              type="radioCol"
               :enumData="dict.auditResult"
               placeholder="请选择审核结果"
               :disabled="pageInfo.type == 'view'"
             />
-          <Field
-            label="审核说明"
-            prop="auditDesc"
-            v-model="form.auditDesc"
-            placeholder="请输入审核说明"
-            :disabled="pageInfo.type == 'view'"
-          />
+          </el-row>
+
           <Field
             label="审批负责人"
             prop="approverId"
@@ -104,6 +100,24 @@
             :enumData="dict.approverId"
             :disabled="pageInfo.type == 'view'"
           />
+          <Field
+            label="申请时间"
+            prop="createTime"
+            v-model="form.createTime"
+            type="datetime"
+            disabled
+          />
+          <el-row>
+            <Field
+              label="审核说明"
+              prop="auditDesc"
+              type="textarea"
+              v-model="form.auditDesc"
+              placeholder="请输入审核说明"
+              :disabled="pageInfo.type == 'view'"
+              style="width: 100%;"
+            />
+          </el-row>
           <!-- <Field label="审批负责人" prop="approver" v-model="form.approver" placeholder="请输入审批负责人"/> -->
           <!-- <Field label="附件" prop="attachment" v-model="form.attachment" type="textarea" placeholder="请输入附件"/> -->
           <Field
@@ -113,13 +127,7 @@
             type="textarea"
             placeholder="请输入备注"
             :disabled="pageInfo.type == 'view'"
-          />
-          <Field
-            label="申请时间"
-            prop="createTime"
-            v-model="form.createTime"
-            type="datetime"
-            disabled
+            style="width: 100%;"
           />
         </el-row>
         <el-form-item label="附件路径" prop="attachmentPathList">
@@ -127,7 +135,7 @@
             @input="uploadFn"
             :value="form.attachmentPathList"
             :fileNumber="1"
-            :disabled="pageInfo.type == 'view'"
+            :pageInfoType="pageInfo.type"
           />
         </el-form-item>
         <form-buttons

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue

@@ -144,7 +144,7 @@ export default {
 
           {
             label: "钉钉原始时间（换算时长）",
-            width: 165,
+            width: 190,
             formatter: (row) => {
               return (
                 (row.sourceDingTime ? row.sourceDingTime : "--") +

attendance-performance-manager-ui/admin/src/views/attendance/record/error/list.vue

@@ -95,7 +95,7 @@ export default {
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "部门",
           },
           // {
           //   name: "groupId",
@@ -111,12 +111,12 @@ export default {
           {
             name: "errorStatus",
             type: "select",
-            label: "全部异常状态",
+            label: "异常状态",
           },
           {
             name: "processStatus",
             type: "select",
-            label: "全部处理状态",
+            label: "处理状态",
           },
           {
             name: "errorDateTimeStart",
@@ -134,12 +134,12 @@ export default {
             label: "员工姓名",
             fuzzy: true,
           },
-          {
-            name: "phoneNumber",
-            type: "text",
-            label: "手机号",
-            fuzzy: true,
-          },
+          // {
+          //   name: "phoneNumber",
+          //   type: "text",
+          //   label: "手机号",
+          //   fuzzy: true,
+          // },
         ],
         columns: [
           { type: "selection", width: 60, fixed: "left" },
@@ -157,6 +157,7 @@ export default {
           {
             label: "异常时间",
             prop: "errorDateTime",
+            width: 160,
             formatter: this.formatterDate,
           },
           {
@@ -175,11 +176,13 @@ export default {
             label: "实际打卡时间",
             prop: "actualAttendanceDateTime",
             formatter: this.formatterDate,
+            width: 160,
           },
           {
             label: "处理时间",
             prop: "operDateTime",
             formatter: this.formatterDate,
+            width: 160,
           },
           {
             label: "处理状态",
@@ -190,7 +193,7 @@ export default {
           { label: "备注", prop: "remark", formatter: this.formatters },
           {
             label: "操作",
-            width: 240,
+            width: 100,
             formatter: (row) => {
               if (row.processStatus == 0 || !row.processStatus) {
                 return (

attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue

@@ -35,7 +35,8 @@
         v-if="showBtn"
         style="margin-left: 10px"
         @click="formatData"
-        >生成打卡记录</el-button
+        :loading="btnLoading"
+        >极速计算结果</el-button
       >
     </LayoutTable>
     <dialog-show ref="dialogform" @ok="getData" />
@@ -122,10 +123,7 @@
       </div>
     </el-drawer>
     <div class="mask" v-if="progress">
-      <el-progress
-        :stroke-width="26"
-        :percentage="percent"
-      ></el-progress>
+      <el-progress :stroke-width="26" :percentage="percent"></el-progress>
     </div>
   </div>
 </template>
@@ -134,7 +132,11 @@
 /** 表单弹出框模式需引入 */
 import dialogShow from "./dialogshow";
 import table from "@/assets/mixins/table";
-import { timestampToTime } from "@/assets/utils/dateFormat";
+import {
+  timestampToTime,
+  getFirstDay,
+  getLastDay,
+} from "@/assets/utils/dateFormat";
 export default {
   name: "AttendanceRecordHikList",
   components: {
@@ -142,13 +144,16 @@ export default {
   },
   mixins: [table],
   created() {
+    this.query.attendanceDateStart = timestampToTime(new Date(), 3);
+    this.query.attendanceDateEnd = timestampToTime(new Date(), 3);
     JSON.parse(sessionStorage.getItem("userData")).id == 1
       ? (this.showBtn = true)
       : (this.showBtn = false);
   },
   methods: {
-    // 生成打卡记录
+    // 极速计算结果
     formatData() {
+      this.btnLoading = true;
       let params = {};
       for (let value of this.config.search) {
         if (this.query[value.name]) {
@@ -161,6 +166,7 @@ export default {
       this.$post("/attendance/record/hik/addAttendanceRecord", {
         ...params,
       }).then((res) => {
+        this.btnLoading = false;
         if (res.code == 1) {
           this.$message.success("生成打卡记录成功！");
         }
@@ -276,12 +282,11 @@ export default {
     toView(row) {
       this.$refs.dialogform.view(row);
     },
-    afterRender(data) {
-      console.log(this.tableData.data);
-    },
+    afterRender(data) {},
   },
   data() {
     return {
+      btnLoading: false,
       showBtn: false,
       progress: false,
       isExport: false,

attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue

@@ -70,7 +70,7 @@
         @click="lookexportHis"
         >导出记录</el-button
       >
-      <el-button
+      <!-- <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
         icon="el-icon-tickets"
@@ -85,7 +85,7 @@
         size="mini"
         @click="setdialog(1)"
         >导出表格设置</el-button
-      >
+      > -->
     </LayoutTable>
     <drawer-show ref="drawerform" @ok="getData" />
     <!-- 导出记录查看 -->
@@ -573,12 +573,12 @@ export default {
             fuzzy: true,
           },
 
-          {
-            name: "workNum",
-            type: "text",
-            label: "员工工号",
-            fuzzy: true,
-          },
+          // {
+          //   name: "workNum",
+          //   type: "text",
+          //   label: "员工工号",
+          //   fuzzy: true,
+          // },
           {
             name: "phone",
             type: "text",
@@ -646,30 +646,30 @@ export default {
             formatter: this.formatter,
             show: true,
           },
-          {
-            label: "签到结果",
-            prop: "signInResult",
-            formatter: this.formatter,
-            show: true,
-          },
-          {
-            label: "签退结果",
-            prop: "signOutResult",
-            formatter: this.formatter,
-            show: true,
-          },
-          {
-            label: "打卡结果",
-            prop: "punchResult",
-            formatter: this.formatter,
-            show: true,
-          },
-          {
-            label: "考勤类型",
-            prop: "attendType",
-            formatter: this.formatter,
-            show: true,
-          },
+          // {
+          //   label: "签到结果",
+          //   prop: "signInResult",
+          //   formatter: this.formatter,
+          //   show: true,
+          // },
+          // {
+          //   label: "签退结果",
+          //   prop: "signOutResult",
+          //   formatter: this.formatter,
+          //   show: true,
+          // },
+          // {
+          //   label: "打卡结果",
+          //   prop: "punchResult",
+          //   formatter: this.formatter,
+          //   show: true,
+          // },
+          // {
+          //   label: "考勤类型",
+          //   prop: "attendType",
+          //   formatter: this.formatter,
+          //   show: true,
+          // },
 
           // {
           //   label: "考勤打卡记录详细信息",

attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue

@@ -206,6 +206,7 @@ export default {
           show: true,
           label: item + "(" + getMyDay(new Date(item)) + ")",
           prop: "attendanceStaffStatEntities",
+          width: 100,
           formatter: (row) => {
             if (
               row.attendanceStaffStatEntities &&
@@ -226,7 +227,7 @@ export default {
       this.$forceUpdate();
     },
     beforeRender(row) {
-      this.tableData.dict=row.dict;
+      this.tableData.dict = row.dict;
       row.data.forEach((element) => {
         if (
           element.attendanceStaffStatEntities &&
@@ -255,7 +256,6 @@ export default {
                           {(v.goWorkDate = timestampToTime(v.goWorkDate, 6))}
                           {"  "} 打卡结果：
                           {this.tableData.dict.goWorkResult[v.goWorkResult]}
-
                         </span>
                       )}
                       {v.offWorkResult == 1 ? (
@@ -263,7 +263,6 @@ export default {
                           打卡时间：
                           {(v.offWorkDate = timestampToTime(v.offWorkDate, 6))}
                           {"  "} 打卡结果：
-
                           {this.tableData.dict.offWorkResult[v.offWorkResult]}
                         </span>
                       ) : (
@@ -357,6 +356,7 @@ export default {
   },
   data() {
     return {
+      isExport: false,
       config: {
         showType: "tableSelect",
         isshowTabPane: true,
@@ -397,12 +397,6 @@ export default {
             label: "员工姓名",
             fuzzy: true,
           },
-          {
-            name: "phoneNumber",
-            type: "text",
-            label: "手机号",
-            fuzzy: true,
-          },
         ],
         columns: [
           { type: "selection", width: 60, fixed: "left", show: true },
@@ -485,6 +479,7 @@ export default {
             label: "因公外出（与窗口工作无关/天）",
             prop: "businessTrip",
             show: true,
+            width: 140,
           },
 
           { label: "公休（天）", prop: "publicHoliday", show: true },
@@ -497,9 +492,19 @@ export default {
 
           { label: "育儿假（天）", prop: "childRearingLeave", show: true },
 
-          { label: "产假（陪护假/天）", prop: "maternityLeave", show: true },
+          {
+            label: "产假（陪护假/天）",
+            prop: "maternityLeave",
+            show: true,
+            width: 140,
+          },
 
-          { label: "调回单位（或离职/天）", prop: "transferBack", show: true },
+          {
+            label: "调回单位（或离职/天）",
+            prop: "transferBack",
+            show: true,
+            width: 140,
+          },
 
           { label: "探亲假（天）", prop: "homeLeave", show: true },
 
@@ -513,6 +518,7 @@ export default {
             label: "未按规定打卡（含忘记打卡）",
             prop: "nonCompliancePunch",
             show: true,
+            width: 140,
           },
 
           { label: "迟到（次）", prop: "lateTimes", show: true },
@@ -533,6 +539,7 @@ export default {
             label: "无故缺席会议（次）",
             prop: "unexcusedMeetingAbsence",
             show: true,
+            width: 140,
           },
 
           { label: "会议早退", prop: "earlyLeaveMeeting", show: true },

attendance-performance-manager-ui/admin/src/views/attendance/vacation/balance/list.vue

@@ -7,6 +7,7 @@
         :disabled="isExport"
         size="mini"
         slot="table-head-left2"
+        style="margin-left: 10px;"
         >导出</el-button
       >
     </LayoutTable>

attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue

@@ -213,7 +213,7 @@ export default {
           {
             label: "异常时间",
             prop: "errorTime",
-            width: 150,
+            width: 240,
             formatter: this.formatterDate,
           },
 
@@ -226,7 +226,7 @@ export default {
           {
             label: "实际打卡时间",
             prop: "actualAttendTime",
-            width: 150,
+            width: 240,
             formatter: this.formatterDate,
           },
 

attendance-performance-manager-ui/admin/src/views/dept/list.vue

 <template>
   <div className="page">
-    <el-card style="height:80vh;overflow:scroll-y">
+    <el-card style="height:80vh;overflow:scroll-y;padding: 10px;">
       <LayoutTable
         notPagination
         :data="tableData"
@@ -92,3 +92,8 @@ export default {
   },
 };
 </script>
+<style lang="less" scoped>
+/deep/.el-card__body {
+  padding: 0 !important;
+}
+</style>

attendance-performance-manager-ui/admin/src/views/errors/403.vue

@@ -3,7 +3,7 @@
     <h1>没有访问权限，或是账号过期。</h1>
     <div>
       <el-button>重新登录</el-button>
-      <el-button @click='goHome'>回首页</el-button>
+      <el-button @click='goHome'>回系统首页</el-button>
     </div>
   </div>
 </template>

attendance-performance-manager-ui/admin/src/views/feedback/list.vue

@@ -196,4 +196,7 @@ export default {
 /deep/ .buttons {
   margin-bottom: 10px;
 }
+/deep/.el-tabs__nav {
+  text-align: center;
+}
 </style>

attendance-performance-manager-ui/admin/src/views/login/login.vue

@@ -33,6 +33,7 @@
             native-type="submit"
             :loading="loading"
             @click="onSubmit"
+            style="font-size: 20px;"
             >登录</el-button
           >
         </el-form-item>
@@ -139,7 +140,7 @@ export default {
   text-align: center;
   .des,
   .tips {
-    font-size: 14px;
+    font-size: 18px;
     white-space: nowrap;
     margin-bottom: 20px;
     margin-top: 10px;
@@ -153,8 +154,8 @@ export default {
     border-radius: 15px;
     h1 {
       text-align: center;
-      font-size: 30px;
-      font-weight: 500;
+      font-size: 40px;
+      font-weight: 600;
     }
     button {
       margin-top: 10px;
@@ -172,7 +173,7 @@ export default {
     }
     .el-input__inner {
       border-color: #409eff;
-      border-radius: 20px;
+      border-radius: 8px;
     }
     .el-input--small .el-input__inner {
       height: 52px;
@@ -184,10 +185,10 @@ export default {
     }
     button {
       width: 80%;
-      border-radius: 20px;
+      border-radius: 8px;
       height: 52px;
       background: linear-gradient(
-        90deg,
+        180deg,
         rgba(24, 69, 198, 1) 0%,
         rgba(41, 153, 255, 1) 100%
       );

attendance-performance-manager-ui/admin/src/views/staff/drawershow.vue

@@ -5,7 +5,7 @@
       :title="title"
       :visible.sync="open"
       :direction="direction"
-      size="50%"
+      size="35%"
     >
       <el-form
         ref="form"
@@ -57,23 +57,65 @@
           </div>
           <div class="history">
             <span>考勤授权：</span>
-            <el-switch v-model="form.kaoqin"> </el-switch>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.attendCheck"
+            >
+            </el-switch>
           </div>
           <div class="history">
             <span>评价授权：</span>
-            <el-switch v-model="form.kaoqin"> </el-switch>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.complainCheck"
+            >
+            </el-switch>
           </div>
           <div class="history">
             <span>投诉授权：</span>
-            <el-switch v-model="form.kaoqin"> </el-switch>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.reviewCheck"
+            >
+            </el-switch>
           </div>
           <div class="history">
             <span>办件授权：</span>
-            <el-switch v-model="form.kaoqin"> </el-switch>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.goworkCheck"
+            >
+            </el-switch>
+          </div>
+          <div class="history">
+            <span>效能授权：</span>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.effectCheck"
+            >
+            </el-switch>
+          </div>
+          <div class="history">
+            <span>其他授权：</span>
+            <el-switch
+              :active-value="1"
+              :inactive-value="0"
+              v-model="form.otherCheck"
+            >
+            </el-switch>
           </div>
         </div>
 
-        <form-buttons @submit="submitForm" noCancelBtn />
+        <form-buttons
+          @submit="submitForm"
+          noCancelBtn
+          style="position: absolute; left: -100px;"
+        />
       </el-form>
     </el-drawer>
   </div>

attendance-performance-manager-ui/admin/src/views/staff/list.vue

 <template>
   <div class="page">
-    <div style="margin:10px 0">
+    <div>
       <tab-pane
         :thirdList="thirdList"
         :activeName="activeName"
@@ -35,7 +35,7 @@
         </div>
       </div>
     </div> -->
-    <el-row :gutter="20">
+    <el-row :gutter="20" style="padding-top: 10px;">
       <el-col :span="6" :xs="12" class="mytree">
         <div class="titles">选择部门</div>
         <!--  default-expand-all -->
@@ -378,23 +378,23 @@ export default {
             width: 240,
             formatter: (row) => {
               return (
-                <table-buttons
-                  noAdd
-                  noDel
-                  noEdit
-                  row={row}
-                  onView={this.toView}
-                  onEdit={this.toEdit}
-                />
                 // <table-buttons
                 //   noAdd
-                //   noAuth
                 //   noDel
                 //   noEdit
                 //   row={row}
                 //   onView={this.toView}
                 //   onEdit={this.toEdit}
                 // />
+                <table-buttons
+                  noAdd
+                  noAuth
+                  noDel
+                  noEdit
+                  row={row}
+                  onView={this.toView}
+                  onEdit={this.toEdit}
+                />
               );
             },
           },
@@ -445,6 +445,7 @@ export default {
 <style lang="scss" scoped>
 .page {
   min-width: 1400px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 }
 .hisList {
   padding: 15px;

attendance-performance-manager-ui/admin/vue.config.js

@@ -17,8 +17,8 @@ module.exports = {
 		hot: true,//自动保存
 		proxy: {
 			'/attendance': {
-				//target: 'http://192.168.0.98:11039',
-				  target: 'http://112.19.80.237:11039',
+				target: 'http://192.168.0.98:11039',
+				//   target: 'http://112.19.80.237:11039',
 				//   target: 'http://localhost:17500',
 				changeOrigin: true,
 				secure: false,

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/AttendanceSummaryTaskImpl.java

@@ -35,14 +35,15 @@ public class AttendanceSummaryTaskImpl  implements ITaskExcuteService {
         //考勤汇总前先自动处理前一天的异常考勤数据
         Calendar now = Calendar.getInstance();
         now.setTime(new Date());
-        now.add(Calendar.DAY_OF_MONTH, -1); //默认查前一天数据
+//        now.add(Calendar.DAY_OF_MONTH, -1); //默认查前一天数据
 //        attendanceRecordErrorService.doAutoProcess(now.getTime());
 
         AttendanceSummaryQuery query = new AttendanceSummaryQuery();
         query.setSummaryTimeEnd(DateUtils.getStrDate(now.getTime()));
-        now.add(Calendar.DAY_OF_MONTH, -19);
+        //now.add(Calendar.DAY_OF_MONTH, -10);
         query.setSummaryTimeStart(DateUtils.getStrDate(now.getTime()));
-        //重新汇总最近20天的考勤数据
+        log.info("考勤汇总时间:"+DateUtils.getDateTime(now.getTime(),"yyyy-MM-dd HH:mm:ss"));
+        //重新汇总最近10天的考勤数据
         cacheService.lpush(KEY_ATTENDANCE_STAT_CACHE,query);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceSummaryQuery.java

@@ -40,6 +40,8 @@ public class AttendanceSummaryQuery {
 
     private List<Long> idList;
 
+    private Integer dayOfWeek;
+
     public AttendanceSummaryQuery(String summaryTime) {
         this.summaryTime = summaryTime;
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/ErrorSummaryVo.java

@@ -2,6 +2,8 @@ package com.mortals.xhx.module.attendance.model.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 考勤异常汇总
  */
@@ -15,6 +17,10 @@ public class ErrorSummaryVo {
      * 员工姓名
      */
     private String staffName;
+    /**
+     * 工号
+     */
+    private String workNum;
     /**
      * 年
      */
@@ -40,4 +46,12 @@ public class ErrorSummaryVo {
      * 考勤汇总-早退（次）
      */
     private Integer overtimeTimes;
+    /**
+     * 员工状态(1.正式,2.试用,3.离职)
+     */
+    private Integer status;
+    /**
+     * 离职时间
+     */
+    private Date leaveDate;
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/LeaveSummaryVo.java

@@ -46,4 +46,12 @@ public class LeaveSummaryVo {
      * 结束时间
      */
     private Date endTime;
+    /**
+     * 员工状态(1.正式,2.试用,3.离职)
+     */
+    private Integer status;
+    /**
+     * 离职时间
+     */
+    private Date leaveDate;
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/VacationBalanceSummaryVo.java

@@ -3,6 +3,7 @@ package com.mortals.xhx.module.attendance.model.vo;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 假期余额汇总
@@ -129,4 +130,12 @@ public class VacationBalanceSummaryVo {
      * 探亲假（天）
      */
     private BigDecimal homeLeave;
+    /**
+     * 员工状态(1.正式,2.试用,3.离职)
+     */
+    private Integer status;
+    /**
+     * 离职时间
+     */
+    private Date leaveDate;
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java

@@ -178,10 +178,10 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
             recordDetailEntity.setShiftsName(classDetailEntity.getClassName());
 
             recordDetailEntity.setGoWorkResult(GoWorkResultEnum.缺卡.getValue());
-            recordDetailEntity.setGoWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getGoWorkDate())));
+            //recordDetailEntity.setGoWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getGoWorkDate())));
 
             recordDetailEntity.setOffWorkResult(GoWorkResultEnum.缺卡.getValue());
-            recordDetailEntity.setOffWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getOffWorkDate())));
+            //recordDetailEntity.setOffWorkDate(DateUtil.parse(commonData.getDateStr() + " " + DateUtil.formatTime(classDetailEntity.getOffWorkDate())));
 
             recordDetailEntity.setOrderNum(orderNum);
             commonData.getDetailEntityList().add(recordDetailEntity);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordController.java

@@ -428,6 +428,8 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
                 if (!existSet.contains(i)) {
                     AttendanceRecordDetailEntity recordDetailEntity = new AttendanceRecordDetailEntity();
                     recordDetailEntity.initAttrValue();
+                    recordDetailEntity.setOffWorkDate(null);
+                    recordDetailEntity.setGoWorkDate(null);
                     recordDetailEntity.setOrderNum(i);
                     return recordDetailEntity;
                 }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffEntity.java

@@ -140,6 +140,32 @@ public class StaffEntity extends StaffVo {
      * 最后登录时间
      */
     private Date lastLoginTime;
+
+    /**
+     * 考勤授权(0.不启用,1.启用)
+     */
+    private Integer attendCheck;
+    /**
+     * 评价授权(0.不启用,1.启用)
+     */
+    private Integer complainCheck;
+    /**
+     * 投诉授权(0.不启用,1.启用)
+     */
+    private Integer reviewCheck;
+    /**
+     * 办件授权(0.不启用,1.启用)
+     */
+    private Integer goworkCheck;
+    /**
+     * 效能授权(0.不启用,1.启用)
+     */
+    private Integer effectCheck;
+    /**
+     * 其他授权(0.不启用,1.启用)
+     */
+    private Integer otherCheck;
+
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -211,5 +237,17 @@ public class StaffEntity extends StaffVo {
         this.loginPwd = "";
 
         this.lastLoginTime = null;
+
+        this.attendCheck = 0;
+
+        this.complainCheck = 0;
+
+        this.reviewCheck = 0;
+
+        this.goworkCheck = 0;
+
+        this.effectCheck = 0;
+
+        this.otherCheck = 0;
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffCheckAuthorizePdu.java

+package com.mortals.xhx.module.staff.model.vo;
+
+import lombok.Data;
+
+@Data
+public class StaffCheckAuthorizePdu {
+    private Long staffId;
+    /** 核查类型枚举CheckTypeEnum(1.考勤绩效,2.评价绩效,3.办件绩效,4.效能绩效,5.其它绩效,6.投诉绩效) */
+    private Integer type;
+}

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/StaffService.java

 package com.mortals.xhx.module.staff.service;
 
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.model.vo.StaffCheckAuthorizePdu;
 import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
 
 import java.util.List;
@@ -30,4 +32,11 @@ public interface StaffService extends ICRUDCacheService<StaffEntity,Long> {
      */
     Rest<Void> syncPersons(Context context);
 
+    /**
+     * 绩效考核授权
+     * @param pdu
+     * @return
+     */
+    int checkAuthorize(StaffCheckAuthorizePdu pdu,Context context) throws AppException;
+
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java

@@ -34,6 +34,7 @@ import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.model.StaffLeaveEntity;
 import com.mortals.xhx.module.staff.model.StaffLeaveQuery;
 import com.mortals.xhx.module.staff.model.StaffQuery;
+import com.mortals.xhx.module.staff.model.vo.StaffCheckAuthorizePdu;
 import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
 import com.mortals.xhx.module.staff.service.StaffLeaveService;
 import com.mortals.xhx.module.staff.service.StaffService;
@@ -203,6 +204,7 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
                     if (!ObjectUtils.isEmpty(key)) {
                         StaffEntity staff = item.getValue();
                         staff.setStatus(StaffSatusEnum.离职.getValue());
+                        staff.setLeaveDate(new Date());
                         staff.setUpdateTime(new Date());
                         staff.setUpdateUserId(1L);
                         this.update(staff);
@@ -361,6 +363,76 @@ public class StaffServiceImpl extends AbstractCRUDCacheServiceImpl<StaffDao, Sta
         return params;
     }
 
+    @Override
+    public int checkAuthorize(StaffCheckAuthorizePdu pdu,Context context) throws AppException {
+        StaffEntity temp = this.get(pdu.getStaffId());
+        if(temp == null){
+            throw new AppException("人员信息ID不正确");
+        }
+        CheckTypeEnum checkTypeEnum = CheckTypeEnum.getByValue(pdu.getType());
+        if(checkTypeEnum==null){
+            throw new AppException("考核类型不正确");
+        }
+        StaffEntity update = new StaffEntity();
+        update.setId(pdu.getStaffId());
+        //1.考勤绩效,2.评价绩效,3.办件绩效,4.效能绩效,5.其它绩效,6.投诉绩效
+        switch(checkTypeEnum){
+            case 考勤绩效:
+                if(temp.getAttendCheck()==1){
+                    update.setAttendCheck(0);
+                }else {
+                    update.setAttendCheck(1);
+                }
+                break;
+            case 评价绩效:
+                if(temp.getComplainCheck()==1){
+                    update.setComplainCheck(0);
+                }else {
+                    update.setComplainCheck(1);
+                }
+                break;
+            case 办件绩效:
+                if(temp.getGoworkCheck()==1){
+                    update.setGoworkCheck(0);
+                }else {
+                    update.setGoworkCheck(1);
+                }
+                break;
+            case 效能绩效:
+                if(temp.getEffectCheck()==1){
+                    update.setEffectCheck(0);
+                }else {
+                    update.setEffectCheck(1);
+                }
+                break;
+            case 其它绩效:
+                if(temp.getOtherCheck()==1){
+                    update.setOtherCheck(0);
+                }else {
+                    update.setOtherCheck(1);
+                }
+                break;
+            case 投诉绩效:
+                if(temp.getReviewCheck()==1){
+                    update.setReviewCheck(0);
+                }else {
+                    update.setReviewCheck(1);
+                }
+                break;
+            default:
+                if(temp.getOtherCheck()==1){
+                    update.setOtherCheck(0);
+                }else {
+                    update.setOtherCheck(1);
+                }
+        }
+        update.setUpdateTime(new Date());
+        if(context.getUser()!=null) {
+            update.setUpdateUserId(context.getUser().getId());
+        }
+        return dao.update(update);
+    }
+
     public static void main(String[] args) {
         System.out.println("1" + StrUtil.padPre("125", 7, "0"));
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java

@@ -28,12 +28,14 @@ import com.mortals.xhx.module.job.model.JobQuery;
 import com.mortals.xhx.module.job.service.JobService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
 import com.mortals.xhx.module.staff.model.vo.HolidayListVo;
+import com.mortals.xhx.module.staff.model.vo.StaffCheckAuthorizePdu;
 import com.mortals.xhx.module.staff.model.vo.StaffInfoVo;
 import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
@@ -221,5 +223,34 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
     public String delete(Long[] id) {
         return super.delete(id);
     }
+
+    @PostMapping(value = "check/authorize")
+    public String checkAuthorize(StaffCheckAuthorizePdu pdu) {
+        Map<String, Object> model = new HashMap();
+        if (pdu.getStaffId() == null) {
+            return this.createFailJsonResp("请选择待授权" + this.getModuleDesc() + "信息");
+        } else {
+            JSONObject ret = new JSONObject();
+            String busiDesc = "授权" + this.getModuleDesc();
+            Context context = this.getContext();
+
+            try {
+                this.service.checkAuthorize(pdu,context);
+                if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
+                    this.recordSysLog(this.request, busiDesc + " 【成功】");
+                }
+            } catch (Exception var8) {
+                this.doException(this.request, busiDesc, model, var8);
+                Object msg = model.get("message_info");
+                return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
+            }
+
+            this.init(model, context);
+            ret.put("data", model);
+            ret.put("code", 1);
+            ret.put("msg", model.remove("message_info"));
+            return ret.toJSONString();
+        }
+    }
 }
 

attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceSummaryMapper.xml

@@ -5,65 +5,78 @@
 
     <!-- 汇总当前日期假期余额 -->
     <select id="getVacationBalanceSummary" parameterType="com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery" resultType="com.mortals.xhx.module.attendance.model.vo.VacationBalanceSummaryVo">
-        SELECT
+        SELECT DISTINCT
             s.id AS staffId,
             s.`name` AS staffName,
             s.phoneNumber,
             s.workNum,
             s.deptId,
             s.deptName,
+            s.`status`,
+            s.leaveDate,
             DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%Y') as `year`,
             DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%m') as `month`,
             DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%d') as `day`,
-            IFNULL(b.personalLeaveDays,0) as personalLeaveDays,
-            IFNULL(b.compensatedLeaveDays,0) as compensatedLeaveDays,
-            IFNULL(b.sickLeaveDays,0) as sickLeaveDays,
-            IFNULL(b.annualLeaveDays,0) as annualLeaveDays,
-            IFNULL(b.marriageLeaveDays,0) as marriageLeaveDays,
-            IFNULL(b.maternityLeaveDays,0) as maternityLeaveDays,
-            IFNULL(b.paternityLeaveDays,0) as paternityLeaveDays,
-            IFNULL(b.menstrualLeaveDays,0) as menstrualLeaveDays,
-            IFNULL(b.breastfeedingLeaveDays,0) as breastfeedingLeaveDays,
-            IFNULL(b.bereavementLeaveDays,0) as bereavementLeaveDays,
-            IFNULL(b.backToUnit,0) as backToUnit,
-            IFNULL(b.onDutyLeave,0) as onDutyLeave,
-            IFNULL(b.outOfOffice,0) as outOfOffice,
-            IFNULL(b.shiftCompensation,0) as shiftCompensation,
-            IFNULL(b.physicalExamination,0) as physicalExamination,
-            IFNULL(b.quarantine,0) as quarantine,
-            IFNULL(b.businessTrip,0) as businessTrip,
-            IFNULL(b.publicHoliday,0) as publicHoliday,
-            IFNULL(b.childRearingLeave,0) as childRearingLeave,
-            IFNULL(b.transferBack,0) as transferBack,
-            IFNULL(b.homeLeave,0) as homeLeave
+            0 as personalLeaveDays,
+            0 as compensatedLeaveDays,
+            0 as sickLeaveDays,
+            0 as annualLeaveDays,
+            0 as marriageLeaveDays,
+            0 as maternityLeaveDays,
+            0 as paternityLeaveDays,
+            0 as menstrualLeaveDays,
+            0 as breastfeedingLeaveDays,
+            0 as bereavementLeaveDays,
+            0 as backToUnit,
+            0 as onDutyLeave,
+            0 as outOfOffice,
+            0 as shiftCompensation,
+            0 as physicalExamination,
+            0 as quarantine,
+            0 as businessTrip,
+            0 as publicHoliday,
+            0 as childRearingLeave,
+            0 as transferBack,
+            0 as homeLeave
         FROM
-            mortals_xhx_staff s
-        LEFT JOIN mortals_xhx_attendance_vacation_balance b ON s.id = b.staffId
-        WHERE 1=1
-        <if test="staffId != null and staffId!=''"> AND s.id = #{staffId}</if>
+            mortals_xhx_staff s,
+            mortals_xhx_attendance_group_staff gs,
+            mortals_xhx_attendance_group_fixedwork f
+        WHERE
+            s.id = gs.staffId
+        AND gs.groupId = f.groupId
+        <if test="dayOfWeek != null and dayOfWeek == 2"> AND f.monday = 1</if>
+        <if test="dayOfWeek != null and dayOfWeek == 3"> AND f.tuesday = 1</if>
+        <if test="dayOfWeek != null and dayOfWeek == 4"> AND f.wednesday = 1</if>
+        <if test="dayOfWeek != null and dayOfWeek == 5"> AND f.thursday = 1</if>
+        <if test="dayOfWeek != null and dayOfWeek == 6"> AND f.friday = 1</if>
+        <if test="dayOfWeek != null and dayOfWeek == 7"> AND f.saturday = 1</if>
+        <if test="dayOfWeek != null and dayOfWeek == 1"> AND f.sunday = 1</if>
     </select>
 
     <!-- 汇总当前日期请假情况 -->
     <select id="getLeaveSummary" parameterType="com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery" resultType="com.mortals.xhx.module.attendance.model.vo.LeaveSummaryVo">
         SELECT
-            leavePersonId AS staffId,
-            leavePerson AS staffName,
-            leaveType,
-            IFNULL(sum(duration),0) as duration,
+            r.leavePersonId AS staffId,
+            r.leavePerson AS staffName,
+            ANY_VALUE(s.`status`) as `status`,
+            ANY_VALUE(s.leaveDate) as leaveDate,
+            r.leaveType,
+            IFNULL(sum(r.duration),0) as duration,
             ANY_VALUE(DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%Y')) as `year`,
             ANY_VALUE(DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%m')) as `month`,
             ANY_VALUE(DATE_FORMAT(STR_TO_DATE(#{summaryTime},'%Y-%m-%d'),'%d')) as `day`,
-            ANY_VALUE(startTime) as startTime,
-            ANY_VALUE(endTime) as endTime
+            ANY_VALUE(r.startTime) as startTime,
+            ANY_VALUE(r.endTime) as endTime
         FROM
-            mortals_xhx_attendance_leave_record
+            mortals_xhx_attendance_leave_record r INNER JOIN mortals_xhx_staff s ON r.leavePersonId = s.id
         WHERE
-            auditResult = 1
-            AND processStatus = 2
-            AND STR_TO_DATE(date_format(startTime,'%Y-%m-%d'),'%Y-%m-%d')  <![CDATA[ <= ]]> STR_TO_DATE(#{summaryTime},'%Y-%m-%d')
-            AND STR_TO_DATE(date_format(endTime,'%Y-%m-%d'),'%Y-%m-%d')  <![CDATA[ >= ]]> STR_TO_DATE(#{summaryTime},'%Y-%m-%d')
+            r.auditResult = 1
+            AND r.processStatus = 2
+            AND STR_TO_DATE(date_format(r.startTime,'%Y-%m-%d'),'%Y-%m-%d')  <![CDATA[ <= ]]> STR_TO_DATE(#{summaryTime},'%Y-%m-%d')
+            AND STR_TO_DATE(date_format(r.endTime,'%Y-%m-%d'),'%Y-%m-%d')  <![CDATA[ >= ]]> STR_TO_DATE(#{summaryTime},'%Y-%m-%d')
         <if test="staffId != null and staffId!=''"> AND leavePersonId = #{staffId}</if>
-        GROUP BY leavePersonId,leavePerson,leaveType
+        GROUP BY r.leavePersonId,r.leavePerson,r.leaveType
 
     </select>
 
@@ -71,7 +84,9 @@
     <select id="getErrorSummary" parameterType="com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery" resultType="com.mortals.xhx.module.attendance.model.vo.ErrorSummaryVo">
         select
             e.staffId,
-            e.staffName,
+            e.workNum,
+            ANY_VALUE(s.`status`) as `status`,
+            ANY_VALUE(s.leaveDate) as leaveDate,
             ANY_VALUE(DATE_FORMAT(errorDateTime,'%Y')) as `year`,
             ANY_VALUE(DATE_FORMAT(errorDateTime,'%m')) as `month`,
             ANY_VALUE(DATE_FORMAT(errorDateTime,'%d')) as `day`,
@@ -80,7 +95,7 @@
             sum(case processResult when 1 then 1 ELSE 0 end) as overtimeTimes,
             sum(case processResult when 2 then 1 ELSE 0 end) as lateTimes
         from
-            mortals_xhx_attendance_record_error e
+            mortals_xhx_attendance_record_error e INNER JOIN mortals_xhx_staff s ON e.staffId = s.id
         where
             processResult != 4
             and e.errorDateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{summaryTime},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
@@ -88,7 +103,7 @@
         <if test="staffId != null and staffId!=''"> AND e.staffId = #{staffId}</if>
         group by
             e.staffId,
-            e.staffName,
+            e.workNum,
             DATE_FORMAT(errorDateTime,'%Y-%m-%d')
     </select>
 </mapper>
\ No newline at end of file

db/add.sql

@@ -884,3 +884,16 @@ CREATE TABLE `mortals_sys_holiday`
 -- 2023-12-05 员工绩效分数初始化任务
 -- --------------
 INSERT INTO `mortals_xhx_task` (`name`, `taskKey`, `status`, `excuteService`, `excuteParam`, `excuteHost`, `excuteStrategy`, `excuteDate`, `excuteTime`, `remark`, `lastExcuteHost`, `lastExcuteTime`, `interimExcuteStatus`, `createTime`, `createUserId`, `createUserName`) VALUES ('员工绩效分数初始化任务', 'StaffPerformInitDataTask', '0', 'StaffPerformInitDataTask', NULL, NULL, '1', '0', '00:10', NULL, NULL, NULL, '0', NOW(), '1', '系统管理员');
+
+-- ----------
+-- 2024-01-08 更新人员信息离职时间,人员信息表增加考核授权
+-- ----------
+
+update mortals_xhx_staff s INNER JOIN mortals_xhx_staff_leave l ON s.id = l.staffId SET s.leaveDate = l.leaveDate;
+
+ALTER TABLE `mortals_xhx_staff` ADD COLUMN `attendCheck` TINYINT (2) DEFAULT '0' COMMENT '考勤授权(0.不启用,1.启用)',
+ ADD COLUMN `complainCheck` TINYINT (2) DEFAULT '0' COMMENT '评价授权(0.不启用,1.启用)',
+ ADD COLUMN `reviewCheck` TINYINT (2) DEFAULT '0' COMMENT '投诉授权(0.不启用,1.启用)',
+ ADD COLUMN `goworkCheck` TINYINT (2) DEFAULT '0' COMMENT '办件授权(0.不启用,1.启用)',
+ ADD COLUMN `effectCheck` TINYINT (2) DEFAULT '0' COMMENT '效能授权(0.不启用,1.启用)',
+ ADD COLUMN `otherCheck` TINYINT (2) DEFAULT '0' COMMENT '其他授权(0.不启用,1.启用)';
\ No newline at end of file