Merge remote-tracking branch 'origin/master'

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

@@ -7,9 +7,9 @@
       size="mini"
       @click="$emit('edit', row)"
       title="编辑"
+      style="margin-left: 0;margin-right: 5px"
       >编辑</el-button
     >
-    <span>&nbsp;</span>
     <el-button
       v-if="!noView"
       type="text"
@@ -17,18 +17,18 @@
       size="mini"
       @click="$emit('view', row)"
       title="查看"
+      style="margin-left: 0;margin-right: 5px"
       >查看</el-button
     >
-    <span>&nbsp;</span>
     <el-switch
       v-if="switchBtn"
       v-model="row.check"
       @change="$emit('view', row)"
       title="核查"
       :active-value="true"
+      style="margin-left: 0;margin-right: 5px"
       :inactive-value="false"
     ></el-switch>
-    <span>&nbsp;</span>
     <el-button
       v-if="reCheck"
       type="text"
@@ -36,9 +36,9 @@
       size="mini"
       @click="$emit('edit', row)"
       title="核查"
+      style="margin-left: 0;margin-right: 5px"
       >核查</el-button
     >
-    <span>&nbsp;</span>
     <el-button
       v-if="chuli"
       type="text"
@@ -46,9 +46,9 @@
       size="mini"
       @click="$emit('edit', row)"
       title="处理"
+      style="margin-left: 0;margin-right: 5px"
       >处理</el-button
     >
-    <span>&nbsp;</span>
     <Confirm @confirm="$emit('del', row.id)" message="确定要删除该条记录吗？">
       <el-button
         v-if="!noDel"
@@ -56,6 +56,7 @@
         icon="el-icon-delete"
         size="mini"
         title="删除"
+        style="margin-left: 0;margin-right: 5px"
         >删除</el-button
       >
     </Confirm>

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

@@ -255,6 +255,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

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

@@ -262,6 +262,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

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

@@ -262,6 +262,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

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

@@ -250,6 +250,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

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

@@ -258,6 +258,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

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

@@ -259,6 +259,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.checkStatus == 1 ? (
                 <table-buttons

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

@@ -1151,7 +1151,7 @@ export default {
         this.$app.loading = true;
         this.$app.percentage = parseInt((dataList.length / total) * 100);
         if (dataList.length >= total || data.data.length == 0) {
-          callback(dataList);
+          if (callback) callback(dataList);
           this.$app.loading = false;
           this.$app.percentage = 1;
           return;

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue

@@ -507,6 +507,9 @@ export default {
         ],
         createTime: [{ required: true, message: "请选择创建时间" }],
       },
+      urls: {
+        saveUrl: "/perform/attend/appeal/audit",
+      },
     };
   },
 

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

@@ -218,7 +218,7 @@ export default {
 
           { label: "异常结果", prop: "errorResult" },
 
-/*
+          /*
           {
             label: "图片凭证",
             prop: "filePaths",
@@ -232,10 +232,13 @@ export default {
             formatter: this.formatterPic,
           },
 
-
           { label: "绩效规则", prop: "ruleNme" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -256,6 +259,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

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

@@ -232,7 +232,11 @@ export default {
 
           { label: "绩效规则", prop: "ruleNme" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -253,6 +257,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

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

@@ -232,7 +232,11 @@ export default {
           },
           { label: "绩效规则", prop: "ruleName" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -252,7 +256,8 @@ export default {
 
           {
             label: "操作",
-            width: 240,
+            width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

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

@@ -219,7 +219,11 @@ export default {
           },
           { label: "绩效规则", prop: "ruleName" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -239,7 +243,8 @@ export default {
 
           {
             label: "操作",
-            width: 240,
+            width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

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

@@ -248,7 +248,8 @@ export default {
 
           {
             label: "操作",
-            width: 240,
+            width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

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

@@ -230,7 +230,11 @@ export default {
 
           { label: "绩效规则", prop: "ruleNme" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -251,6 +255,7 @@ export default {
           {
             label: "操作",
             width: 200,
+            fixed: "right",
             formatter: (row) => {
               return row.processStatus == 1 ? (
                 <table-buttons

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

 <template>
   <div class="page">
-    <LayoutTable :data="tableData" :config="tableConfig"  notDel />
+    <LayoutTable :data="tableData" :config="tableConfig" notDel />
     <dialog-show ref="dialogform" @ok="getData" />
 
     <el-dialog title="用户已分配的角色" :visible.sync="role.visible">
@@ -40,27 +40,25 @@
       </div>
     </el-dialog>
 
-
     <el-dialog
-        :title="userDeptDialog.title"
-        :visible.sync="userDeptDialog.open"
-        width="60%"
-        append-to-body
+      :title="userDeptDialog.title"
+      :visible.sync="userDeptDialog.open"
+      width="60%"
+      append-to-body
     >
-
       <div class="mytree">
         <el-tree
-            ref="bomTree"
-            :data="data"
-            id="el-tree"
-            indent="0"
-            node-key="id"
-            :props="treeProps"
-            :load="loadNode"
-            highlight-current
-            lazy
-            :render-content="renderContent"
-            @node-click="handleNodeClick"
+          ref="bomTree"
+          :data="data"
+          id="el-tree"
+          indent="0"
+          node-key="id"
+          :props="treeProps"
+          :load="loadNode"
+          highlight-current
+          lazy
+          :render-content="renderContent"
+          @node-click="handleNodeClick"
         >
         </el-tree>
       </div>
@@ -95,9 +93,9 @@ export default {
       this.tableData.loading = false;
     },
 
-    renderContent: function (h, { node, data, store }) {
+    renderContent: function(h, { node, data, store }) {
       return (
-          <span>
+        <span>
           <i style="font-size:16px;color:#409EFF" class={data.icon}></i>
           <span style="padding-left: 2px;font-size:14px">{node.label}</span>
         </span>
@@ -128,18 +126,17 @@ export default {
       //     });
     },
 
-
     userDeptConfirm(row) {
-      if(Object.keys(this.node).length === 0){
+      if (Object.keys(this.node).length === 0) {
         this.$message.error("请选择一个部门！");
         return;
       }
-    this.userDeptDialog.data['deptId']=this.node.id;
-    this.userDeptDialog.data['deptName']=this.node.label;
+      this.userDeptDialog.data["deptId"] = this.node.id;
+      this.userDeptDialog.data["deptName"] = this.node.label;
       this.$post("/user/save", this.userDeptDialog.data).then((res) => {
         if (res && res.code == 1) {
           this.userDeptDialog.data = {};
-          this.node=null;
+          this.node = null;
           this.$message.success("分配部门成功！");
           this.getData();
         }
@@ -148,7 +145,6 @@ export default {
       });
     },
 
-
     // 获取角色列表与当前用户角色列表
     userRoleConfirm(row) {
       let data = this.userRoleDialog.data;
@@ -182,7 +178,6 @@ export default {
       this.tableData.loading = false;
     },
 
-
     async distributeDept(row) {
       console.log("分配部门");
       try {
@@ -193,9 +188,8 @@ export default {
             parentId: 0,
           }).then(({ data }) => {
             this.data = data.result;
-            this.node={}
-            console.log("data",this.data)
-
+            this.node = {};
+            console.log("data", this.data);
           });
           this.userDeptDialog.open = true;
         });
@@ -218,8 +212,8 @@ export default {
     getRoleUsers(id) {
       return new Promise((resolve, reject) => {
         this.$post("/role/user/list", {
-          "userId": id,
-          "size": -1,
+          userId: id,
+          size: -1,
         })
           .then(({ data }) => {
             const result = data.data
@@ -247,7 +241,7 @@ export default {
     return {
       allRoles: {},
       nodeData: {},
-      node:{},
+      node: {},
       data: [],
       tree: [],
       roles: [],
@@ -276,10 +270,10 @@ export default {
         visible: false,
       },
       config: {
-        isshowTabPane:true,
+        isshowTabPane: true,
         columns: [
-          { type: "selection",reserveSelection:true, width: 60 },
-          { type: "index", label: "序号",align:"center", width: 50 },
+          { type: "selection", reserveSelection: true, width: 60 },
+          { type: "index", label: "序号", align: "center", width: 50 },
           {
             prop: "loginName",
             label: "登录名称",
@@ -346,23 +340,22 @@ export default {
                   */}
                   <span> </span>
                   <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-share"
-                      onClick={() => this.distributeDept(row)}
+                    size="mini"
+                    type="text"
+                    icon="el-icon-share"
+                    onClick={() => this.distributeDept(row)}
                   >
                     分配部门
                   </el-button>
-<span> </span>
+                  <span> </span>
                   <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-share"
-                      onClick={() => this.distributeDept(row)}
+                    size="mini"
+                    type="text"
+                    icon="el-icon-share"
+                    onClick={() => this.distributeDept(row)}
                   >
                     修改密码
                   </el-button>
-
                 </div>
               );
             },
@@ -394,16 +387,16 @@ export default {
 <style lang="scss" scoped>
 .mytree ::v-deep {
   .el-tree--highlight-current
-  ::v-deep
-  .el-tree-node.is-checked
-  > .el-tree-node__content {
+    ::v-deep
+    .el-tree-node.is-checked
+    > .el-tree-node__content {
     background-color: rgb(255, 255, 255);
     color: rgb(64, 158, 255);
   }
   .el-tree--highlight-current
-  ::v-deep
-  .el-tree-node.is-current
-  > .el-tree-node__content {
+    ::v-deep
+    .el-tree-node.is-current
+    > .el-tree-node__content {
     background-color: rgb(255, 255, 255);
     color: rgb(64, 158, 255);
   }
@@ -464,7 +457,5 @@ export default {
     top: 12px;
     width: 24px;
   }
-
 }
 </style>
-

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendAppealServiceImpl.java

@@ -74,7 +74,8 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
 
 
     private void sendCheckDingTalk(PerformAttendAppealEntity entity) {
-        String ruleStr = String.format("%s/%s/%s", PerformTypeEnum.getByValue(entity.getPerformType()).getDesc(), entity.getCategoryName(), entity.getRuleName());
+       // String ruleStr = String.format("%s/%s/%s", PerformTypeEnum.getByValue(entity.getPerformType()).getDesc(), entity.getCategoryName(), entity.getRuleName());
+        String ruleStr = String.format("%s/%s/%s", PerformTypeEnum.考勤绩效.getDesc(), entity.getCategoryName(), entity.getRuleName());
         //绩效核查通知
         StaffEntity staffCache = staffService.getCache(entity.getStaffId().toString());
         if (!ObjectUtils.isEmpty(staffCache)) {
@@ -121,7 +122,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
         }
         String appealMsg = "申诉成功，返回所扣分数，申诉ID:" + appeal.getId().toString();
         sendCheckDingTalk(appealEntity);
-log.info(appealMsg);
+        log.info(appealMsg);
 
         if (appeal.getAppealResult() == AppealResultEnum.通过.getValue()) {
             if (appeal.getSubAddType() == SubAddTypeEnum.扣除.getValue()) {

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

@@ -137,6 +137,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
             }
             recordSysLog(request, busiDesc + " 【成功】");
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            jsonObject.put(KEY_RESULT_MSG, busiDesc+ "成功!");
         } catch (Exception e) {
             log.error("申诉审核", e);
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);