推

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

@@ -20,6 +20,13 @@
       >查看</el-button
     >
     <span>&nbsp;</span>
+    <el-switch
+      v-if="switchBtn"
+      @change="$emit('view', row)"
+      title="核查"
+      v-model="row.check"
+    ></el-switch>
+    <span>&nbsp;</span>
     <el-button
       v-if="reCheck"
       type="text"
@@ -63,6 +70,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    switchBtn: {
+      type: Boolean,
+      default: false,
+    },
     noView: {
       type: Boolean,
       default: false,

attendance-performance-manager-ui/admin/src/views/perform/rules/attend/components/AttendIndex.vue

@@ -218,6 +218,7 @@ export default {
     async getKaoQin(categoryId) {
       await this.$post("/perform/rules/list", {
         categoryId,
+        type: this.activeName,
         page: this.query.page,
         orderColList: this.typeArr,
         name: this.searchValue,

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

@@ -36,6 +36,9 @@
                 <el-tag style="margin: 0 5px 5px 0"
                   >效能绩效指标/工作纪律：{{ val.effectCount }}</el-tag
                 >
+                <el-tag style="margin: 0 5px 5px 0"
+                  >其他绩效指标/工作纪律：{{ val.otherCount }}</el-tag
+                >
               </p>
               <p class="goal_txt">
                 <span>最近更新：</span><span>{{ val.createTime }}</span>
@@ -85,6 +88,8 @@ import drawerShow from "./drawershow";
 import deptdrawerShow from "./deptdrawershow.vue";
 import windowdrawerShow from "./windowdrawershow.vue";
 import table from "@/assets/mixins/table";
+import { timestampToTime } from "@/assets/utils/dateFormat.js";
+
 export default {
   name: "PerformStaffConfList",
   components: {
@@ -146,9 +151,12 @@ export default {
       await this.$post(
         this.type == 1 ? "/perform/dept/conf/list" : "/perform/staff/conf/list"
       ).then((res) => {
-        console.log(res);
         if (res.code == 1) {
           this.dataList = res.data.data;
+          this.dataList.forEach((v) => {
+            v.createTime = v.createTime ? timestampToTime(v.createTime, 6) : "";
+            v.updateTime = v.updateTime ? timestampToTime(v.updateTime, 6) : "";
+          });
         }
       });
       this.activeName == 2
@@ -293,7 +301,7 @@ export default {
       flex-wrap: wrap;
       .goal_box {
         width: 405px;
-        height: 270px;
+        height: 310px;
         background: inherit;
         background-color: rgba(255, 255, 255, 1);
         border: none;