Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

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

@@ -74,7 +74,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);

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

@@ -74,7 +74,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);
@@ -236,7 +236,7 @@ export default {
 
           { label: "投诉设备", prop: "complainDevice" },
 
-          { label: "绩效规则", prop: "ruleNme" },
+          { label: "绩效规则", prop: "ruleName" },
 
           {
             label: "加分/扣分方式",

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

@@ -74,7 +74,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);

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

@@ -74,7 +74,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);

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

@@ -74,7 +74,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);

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

@@ -74,7 +74,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);
@@ -233,7 +233,7 @@ export default {
             formatter: this.formatterPic,
           },
 
-          { label: "绩效规则", prop: "ruleNme" },
+          { label: "绩效规则", prop: "ruleName" },
 
           {
             label: "加分/扣分方式",

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

@@ -92,7 +92,7 @@ export default {
   },
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);

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

@@ -153,7 +153,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item label="绩效规则：">
-            <p v-if="form.view == '查看'">{{ form.ruleNme }}</p>
+            <p v-if="form.view == '查看'">{{ form.ruleName }}</p>
             <div v-else>
               <el-col :span="22">
                 <el-select
@@ -261,8 +261,8 @@
         />
         <Field
           label="规则名称"
-          prop="ruleNme"
-          v-model="form.ruleNme"
+          prop="ruleName"
+          v-model="form.ruleName"
           placeholder="请输入规则名称"
         />
         <Field
@@ -597,7 +597,7 @@ export default {
         processStatus: 1,
         remark: "",
         ruleId: "",
-        ruleNme: "",
+        ruleName: "",
         score: "",
         staffId: "",
         staffName: "",

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

@@ -82,7 +82,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);
@@ -246,7 +246,7 @@ export default {
             formatter: this.formatterPic,
           },
 
-          { label: "绩效规则", prop: "ruleNme" },
+          { label: "绩效规则", prop: "ruleName" },
 
           {
             label: "加分/扣分方式",

attendance-performance-manager-ui/admin/src/views/perform/attend/record/list（原考勤绩效管理）.vue

@@ -180,7 +180,7 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "规则名称", prop: "ruleNme" },
+          { label: "规则名称", prop: "ruleName" },
 
           {
             label: "异常时间",

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

@@ -36,7 +36,7 @@
                             {{form.ruleId}}
                         </el-descriptions-item>
                         <el-descriptions-item label="规则名称" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.ruleNme}}
+                            {{form.ruleName}}
                         </el-descriptions-item>
                         <el-descriptions-item label="异常时间" label-class-name="labelClass" content-class-name="contentClass">
                             {{ util_formatterDate(form.errorTime)}}

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

@@ -205,7 +205,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item label="绩效规则：">
-            <p v-if="form.view == '查看'">{{ form.ruleNme }}</p>
+            <p v-if="form.view == '查看'">{{ form.ruleName }}</p>
             <div v-else>
               <el-col :span="22">
                 <el-select

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

@@ -82,7 +82,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);
@@ -243,7 +243,7 @@ export default {
 
           { label: "投诉设备", prop: "complainDevice" },
 
-          { label: "绩效规则", prop: "ruleNme" },
+          { label: "绩效规则", prop: "ruleName" },
 
           {
             label: "加分/扣分方式",

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

@@ -179,7 +179,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item label="绩效规则：">
-            <p v-if="form.view == '查看'">{{ form.ruleNme }}</p>
+            <p v-if="form.view == '查看'">{{ form.ruleName }}</p>
             <div v-else>
               <el-col :span="22">
                 <el-select

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

@@ -82,7 +82,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);

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

@@ -157,7 +157,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item label="绩效规则：">
-            <p v-if="form.view == '查看'">{{ form.ruleNme }}</p>
+            <p v-if="form.view == '查看'">{{ form.ruleName }}</p>
             <div v-else>
               <el-col :span="22">
                 <el-select

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

@@ -82,7 +82,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);

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

@@ -117,7 +117,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item label="绩效规则：">
-            <p v-if="form.view == '查看'">{{ form.ruleNme }}</p>
+            <p v-if="form.view == '查看'">{{ form.ruleName }}</p>
             <div v-else>
               <el-col :span="22">
                 <el-select

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

@@ -82,7 +82,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);

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

@@ -170,7 +170,7 @@
       <el-row>
         <el-col :span="22">
           <el-form-item label="绩效规则：">
-            <p v-if="form.view == '查看'">{{ form.ruleNme }}</p>
+            <p v-if="form.view == '查看'">{{ form.ruleName }}</p>
             <div v-else>
               <el-col :span="22">
                 <el-select

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

@@ -82,7 +82,7 @@ export default {
   created() {},
   methods: {
     handleCellClick(row, column, event, cell) {
-      if ((column.label = "图片凭证")) {
+      if ((column.label == "图片凭证")) {
         const suffix = `(bmp|jpg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp|jpeg)`;
         const regular = new RegExp(`.*\.${suffix}`);
         regular.test(row.filePaths);
@@ -241,7 +241,7 @@ export default {
             formatter: this.formatterPic,
           },
 
-          { label: "绩效规则", prop: "ruleNme" },
+          { label: "绩效规则", prop: "ruleName" },
 
           {
             label: "加分/扣分方式",

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/h5/web/PerformApiController.java

@@ -333,7 +333,9 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
     private void updateAppealResult(PerformInfo performInfo, PerformAttendAppealEntity entity) {
         if (!ObjectUtils.isEmpty(entity)) {
             Boolean bool = entity.newEntity();
-            updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+            if (bool) {
+                performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+            }else {
                 if (AppealResultEnum.通过.getValue() == entity.getAppealResult()) {
                     performInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
                 } else if (AppealResultEnum.不通过.getValue() == entity.getAppealResult()) {
@@ -341,6 +343,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 } else {
                     performInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
                 }
+            }
         } else {
             performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
         }