Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -198,7 +198,7 @@ export default {
     formatter(row, column, val) {
       const content = formatter(this.tableData, column, val);
       return content == 0 ? (
-        <p>{content}</p>
+        <p>{content ? content : "--"}</p>
       ) : content ? (
         content == "未处理" ? (
           <el-tag type={"danger"} size="mini">
@@ -214,7 +214,7 @@ export default {
           ) : row.subAddType == 2 && column.label.includes("分值") ? (
             <el-link type={"info"}>({-content})</el-link>
           ) : (
-            <p>{content}</p>
+            <p>{content ? content : "--"}</p>
           )
         ) : row.checkStatus == 2 || row.processStatus == 2 ? (
           row.subAddType == 1 && column.label.includes("分值") ? (
@@ -222,14 +222,14 @@ export default {
           ) : row.subAddType == 2 && column.label.includes("分值") ? (
             <el-link>{-content}</el-link>
           ) : (
-            <p>{content}</p>
+            <p>{content ? content : "--"}</p>
           )
         ) : row.subAddType == 1 && column.label.includes("分值") ? (
           <el-link>+{content}</el-link>
         ) : row.subAddType == 2 && column.label.includes("分值") ? (
           <el-link>{-content}</el-link>
         ) : (
-          <p>{content}</p>
+          <p>{content ? content : "--"}</p>
         )
       ) : (
         val
@@ -488,10 +488,10 @@ export default {
             <filepReview src={val} />
           );
         } else {
-          return <el-link type="primary">{val}</el-link>;
+          return <el-link type="primary">{val ? val : "--"}</el-link>;
         }
       } else {
-        return val;
+        return val ? val : "--";
       }
     },
 

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

 <template>
-  <div class="img-flex">
+  <div class="img-flex" v-if="fileList && fileList.length > 0">
     <el-image
-      :preview-src-list="fileList"
+      :preview-src-list="urlVal(fileList)"
       :src="require('../assets/images/picture.png')"
     >
     </el-image>
@@ -16,6 +16,7 @@
       </div>
     </el-image> -->
   </div>
+  <p v-else>--</p>
 </template>
 <script>
 const baseUrl = process.env.VUE_APP_API_BASE_URL + "/";
@@ -51,12 +52,28 @@ export default {
     //         : (val = zwfwUrl + val);
     //     });
     // },
-    urlVal(val) {
-      return val.indexOf("zwfw_api_xnjc") == -1
-        ? val.indexOf("http") == -1
-          ? baseUrl + val
-          : val
-        : zwfwUrl + val;
+    urlVal(arr) {
+      let Arr = [];
+      arr.length > 0 &&
+        arr.forEach((val) => {
+          if (val.indexOf("zwfw_api_xnjc") == -1) {
+            if (val.indexOf("http") == -1) {
+              val = baseUrl + val;
+              Arr.push(val);
+            } else {
+              Arr.push(val);
+            }
+          } else {
+            val = zwfwUrl + val;
+            Arr.push(val);
+          }
+          // val.indexOf("zwfw_api_xnjc") == -1
+          //   ? val.indexOf("http") == -1
+          //     ? (val = baseUrl + val)
+          //     : (val = val)
+          //   : (val = zwfwUrl + val);
+        });
+      return Arr;
     },
   },
 };

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

 <template>
-  <div class="img-flex">
+  <div class="img-flex" v-if="fileList && fileList.length > 0">
     <el-image
       :src="urlVal(item)"
       :preview-src-list="[urlVal(item)]"
@@ -8,6 +8,7 @@
       :key="item"
     />
   </div>
+  <p v-else>--</p>
 </template>
 <script>
 const baseUrl = process.env.VUE_APP_API_BASE_URL + "/";

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

@@ -198,13 +198,17 @@ export default {
           { type: "selection", width: 50 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
-          { label: "考勤组", prop: "attendanceGroupName" },
+          {
+            label: "考勤组",
+            prop: "attendanceGroupName",
+            formatter: this.formatter,
+          },
 
           {
             label: "异常时间",
@@ -213,7 +217,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "上下班时间", prop: "goOffTimeStr" },
+          {
+            label: "上下班时间",
+            prop: "goOffTimeStr",
+            formatter: this.formatterDate,
+          },
 
           {
             label: "实际打卡时间",
@@ -222,7 +230,7 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "异常结果", prop: "errorResult" },
+          { label: "异常结果", prop: "errorResult", formatter: this.formatter },
 
           {
             label: "图片凭证",
@@ -247,7 +255,7 @@ export default {
             },
           },
 
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -262,11 +270,15 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "核查结果", prop: "checkResult", formatter: this.formatter },
 
-          { label: "说明", prop: "checkDesc" },
+          { label: "说明", prop: "checkDesc", formatter: this.formatter },
 
           {
             label: "巡查人员",
@@ -274,7 +286,7 @@ export default {
             formatter: this.formatter,
           },
 
-          { label: "核查人员", prop: "checkPerson" },
+          { label: "核查人员", prop: "checkPerson", formatter: this.formatter },
 
           {
             label: "核查时间",

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

@@ -205,19 +205,31 @@ export default {
           { type: "selection", width: 50 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
-          { label: "投诉标题", prop: "complainTitle" },
+          {
+            label: "投诉标题",
+            prop: "complainTitle",
+            formatter: this.formatter,
+          },
 
-          { label: "投诉内容", prop: "complainContent" },
+          {
+            label: "投诉内容",
+            prop: "complainContent",
+            formatter: this.formatter,
+          },
 
-          { label: "投诉人真实姓名", prop: "complainRealName" },
+          {
+            label: "投诉人真实姓名",
+            prop: "complainRealName",
+            formatter: this.formatter,
+          },
 
-          { label: "联系电话", prop: "contact" },
+          { label: "联系电话", prop: "contact", formatter: this.formatter },
 
           {
             label: "投诉时间",
@@ -226,7 +238,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "投诉来源", prop: "complainSource" },
+          {
+            label: "投诉来源",
+            prop: "complainSource",
+            formatter: this.formatter,
+          },
 
           {
             label: "图片凭证",
@@ -251,9 +267,13 @@ export default {
             },
           },
 
-          { label: "投诉设备", prop: "complainDevice" },
+          {
+            label: "投诉设备",
+            prop: "complainDevice",
+            formatter: this.formatter,
+          },
 
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -268,18 +288,22 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "核查结果", prop: "checkResult", formatter: this.formatter },
 
-          { label: "说明", prop: "checkDesc" },
+          { label: "说明", prop: "checkDesc", formatter: this.formatter },
           {
             label: "巡查人员",
             prop: "createUserId",
             formatter: this.formatter,
           },
 
-          { label: "核查人员", prop: "checkPerson" },
+          { label: "核查人员", prop: "checkPerson", formatter: this.formatter },
 
           {
             label: "核查时间",

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

@@ -200,11 +200,11 @@ export default {
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {
             label: "违规类型",
@@ -223,7 +223,6 @@ export default {
             label: "时长",
             prop: "duration",
             formatter: (row) => {
-              console.log(row);
               return row.duration && row.duration !== ""
                 ? row.duration + "s"
                 : "--";
@@ -283,7 +282,7 @@ export default {
             },
           },
 
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -298,11 +297,15 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "核查结果", prop: "checkResult", formatter: this.formatter },
 
-          { label: "说明", prop: "checkDesc" },
+          { label: "说明", prop: "checkDesc", formatter: this.formatter },
 
           {
             label: "巡查人员",
@@ -310,7 +313,7 @@ export default {
             formatter: this.formatter,
           },
 
-          { label: "核查人员", prop: "checkPerson" },
+          { label: "核查人员", prop: "checkPerson", formatter: this.formatter },
 
           {
             label: "核查时间",

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

@@ -199,17 +199,21 @@ export default {
           { type: "selection", width: 50 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
-          { label: "办件编码", prop: "goworkCode" },
+          { label: "办件编码", prop: "goworkCode", formatter: this.formatter },
 
-          { label: "办件所属部门", prop: "goworkDepts" },
+          {
+            label: "办件所属部门",
+            prop: "goworkDepts",
+            formatter: this.formatter,
+          },
 
-          { label: "事项名称", prop: "matterlName" },
+          { label: "事项名称", prop: "matterlName", formatter: this.formatter },
 
           {
             label: "办理时间",
@@ -241,7 +245,7 @@ export default {
             },
           },
 
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -256,11 +260,15 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "核查结果", prop: "checkResult", formatter: this.formatter },
 
-          { label: "说明", prop: "checkDesc" },
+          { label: "说明", prop: "checkDesc", formatter: this.formatter },
 
           {
             label: "巡查人员",
@@ -268,7 +276,7 @@ export default {
             formatter: this.formatter,
           },
 
-          { label: "核查人员", prop: "checkPerson" },
+          { label: "核查人员", prop: "checkPerson", formatter: this.formatter },
 
           {
             label: "核查时间",

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

@@ -198,11 +198,11 @@ export default {
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {
             label: "违规类型",
@@ -217,7 +217,12 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "评分标准", prop: "ruleDesc" },
+          {
+            label: "评分标准",
+            width: 200,
+            prop: "ruleDesc",
+            formatter: this.formatter,
+          },
 
           //   {
           //     label: "持续时间，秒",
@@ -249,7 +254,7 @@ export default {
             },
           },
 
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -264,11 +269,15 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "核查结果", prop: "checkResult", formatter: this.formatter },
 
-          { label: "说明", prop: "checkDesc" },
+          { label: "说明", prop: "checkDesc", formatter: this.formatter },
 
           {
             label: "巡查人员",
@@ -276,7 +285,7 @@ export default {
             formatter: this.formatter,
           },
 
-          { label: "核查人员", prop: "checkPerson" },
+          { label: "核查人员", prop: "checkPerson", formatter: this.formatter },
 
           {
             label: "核查时间",

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

@@ -204,11 +204,11 @@ export default {
           { type: "selection", width: 50 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {
             label: "评价结果",
@@ -216,9 +216,17 @@ export default {
             formatter: this.formatter,
           },
 
-          { label: "评价来源", prop: "reviewSource" },
+          {
+            label: "评价来源",
+            prop: "reviewSource",
+            formatter: this.formatter,
+          },
 
-          { label: "评价设备", prop: "reviewDevice" },
+          {
+            label: "评价设备",
+            prop: "reviewDevice",
+            formatter: this.formatter,
+          },
 
           {
             label: "评价时间",
@@ -250,7 +258,7 @@ export default {
             },
           },
 
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -265,11 +273,15 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "核查结果", prop: "checkResult", formatter: this.formatter },
 
-          { label: "说明", prop: "checkDesc" },
+          { label: "说明", prop: "checkDesc", formatter: this.formatter },
 
           {
             label: "巡查人员",
@@ -277,7 +289,7 @@ export default {
             formatter: this.formatter,
           },
 
-          { label: "核查人员", prop: "checkPerson" },
+          { label: "核查人员", prop: "checkPerson", formatter: this.formatter },
 
           {
             label: "核查时间",

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

@@ -216,9 +216,9 @@ export default {
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {
             label: "违规类型",

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

@@ -206,13 +206,17 @@ export default {
           { type: "selection", width: 50 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
-          { label: "考勤组", prop: "attendanceGroupName" },
+          {
+            label: "考勤组",
+            prop: "attendanceGroupName",
+            formatter: this.formatter,
+          },
 
           {
             label: "异常时间",
@@ -220,7 +224,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "上下班时间", prop: "goOffTimeStr" },
+          {
+            label: "上下班时间",
+            prop: "goOffTimeStr",
+            formatter: this.formatterDate,
+          },
 
           {
             label: "实际打卡时间",
@@ -228,7 +236,7 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "异常结果", prop: "errorResult" },
+          { label: "异常结果", prop: "errorResult", formatter: this.formatter },
 
           /*
          {
@@ -246,7 +254,7 @@ export default {
             formatter: this.formatterPic,
           },
 
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -260,7 +268,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "分值", prop: "score", formatter: this.formatter },
 

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

@@ -212,19 +212,31 @@ export default {
           { type: "selection", width: 50 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
-          { label: "投诉标题", prop: "complainTitle" },
+          {
+            label: "投诉标题",
+            prop: "complainTitle",
+            formatter: this.formatter,
+          },
 
-          { label: "投诉内容", prop: "complainContent" },
+          {
+            label: "投诉内容",
+            prop: "complainContent",
+            formatter: this.formatter,
+          },
 
-          { label: "投诉人真实姓名", prop: "complainRealName" },
+          {
+            label: "投诉人真实姓名",
+            prop: "complainRealName",
+            formatter: this.formatter,
+          },
 
-          { label: "联系电话", prop: "contact" },
+          { label: "联系电话", prop: "contact", formatter: this.formatter },
 
           {
             label: "投诉时间",
@@ -232,7 +244,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "投诉来源", prop: "complainSource" },
+          {
+            label: "投诉来源",
+            prop: "complainSource",
+            formatter: this.formatter,
+          },
 
           {
             label: "图片凭证",
@@ -241,9 +257,13 @@ export default {
             formatter: this.formatterPic,
           },
 
-          { label: "投诉设备", prop: "complainDevice" },
+          {
+            label: "投诉设备",
+            prop: "complainDevice",
+            formatter: this.formatter,
+          },
 
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -257,7 +277,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "分值", prop: "score", formatter: this.formatter },
 

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

@@ -72,7 +72,8 @@
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
 import { downloadFile } from "@/assets/utils/index";
-
+const baseUrl = process.env.VUE_APP_API_BASE_URL + "/";
+const zwfwUrl = process.env.VUE_APP_API_ZWFW_URL + "/";
 export default {
   name: "PerformEffectRecordList",
   components: {
@@ -207,11 +208,11 @@ export default {
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {
             label: "违规类型",
@@ -239,11 +240,43 @@ export default {
 
           {
             label: "图片凭证",
-            prop: "filePaths",
             width: 150,
-            formatter: this.formatterPic,
+            formatter: (row) => {
+              let src = "";
+              if (row.snapPath && row.filePaths) {
+                src = row.snapPath + row.filePaths;
+              } else {
+                if (row.snapPath) {
+                  src = row.snapPath;
+                } else {
+                  src = row.filePaths;
+                }
+              }
+              row.fileList = src ? src.split(",") : [];
+
+              return row.snapPath || row.filePaths ? (
+                <buttonReview row={row} fileList={row.fileList} />
+              ) : (
+                "--"
+              );
+              // row.snapPath && row.snapPath !== ""
+              //   ? row.filePaths && row.filePaths !== ""
+              //     ? (row.filePaths = row.filePaths + "," + row.snapPath)
+              //     : (row.filePaths = row.snapPath)
+              //   : (row.filePaths = row.filePaths);
+              // return (
+              //   // <el-image
+              //   //   src={val.indexOf("http") == -1 ? baseUrl + val : val}
+              //   //   preview-src-list={
+              //   //     val.indexOf("http") == -1 ? [baseUrl + val] : [val]
+              //   //   }
+              //   //   style="width: 100px"
+              //   // ></el-image>
+              //   <filepReview src={row.filePaths} />
+              // );
+            },
           },
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -257,7 +290,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "分值", prop: "score", formatter: this.formatter },
 

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

@@ -206,17 +206,21 @@ export default {
           { type: "selection", width: 50 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
-          { label: "办件编码", prop: "goworkCode" },
+          { label: "办件编码", prop: "goworkCode", formatter: this.formatter },
 
-          { label: "办件所属部门", prop: "goworkDepts" },
+          {
+            label: "办件所属部门",
+            prop: "goworkDepts",
+            formatter: this.formatter,
+          },
 
-          { label: "事项名称", prop: "matterlName" },
+          { label: "事项名称", prop: "matterlName", formatter: this.formatter },
 
           {
             label: "办理时间",
@@ -230,7 +234,7 @@ export default {
             width: 150,
             formatter: this.formatterPic,
           },
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -244,7 +248,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "分值", prop: "score", formatter: this.formatter },
 

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

@@ -206,17 +206,17 @@ export default {
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
-          {
-            label: "违规类型",
-            prop: "irregularOtherType",
-            formatter: this.formatter,
-          },
+          // {
+          //   label: "违规类型",
+          //   prop: "irregularOtherType",
+          //   formatter: this.formatter,
+          // },
 
           {
             label: "发生时间",
@@ -224,7 +224,7 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "评分标准", prop: "ruleDesc" },
+          { label: "评分标准", prop: "ruleDesc", formatter: this.formatter },
 
           //   {
           //     label: "持续时间，秒",
@@ -239,7 +239,7 @@ export default {
             width: 150,
             formatter: this.formatterPic,
           },
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -253,7 +253,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "分值", prop: "score", formatter: this.formatter },
 

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

@@ -212,11 +212,11 @@ export default {
           { type: "selection", width: 50 },
           { type: "index", label: "序号", width: 50 },
 
-          { label: "姓名", prop: "staffName" },
+          { label: "姓名", prop: "staffName", formatter: this.formatter },
 
-          { label: "窗口编号", prop: "windowNum" },
+          { label: "窗口编号", prop: "windowNum", formatter: this.formatter },
 
-          { label: "所属部门", prop: "deptName" },
+          { label: "所属部门", prop: "deptName", formatter: this.formatter },
 
           {
             label: "评价结果",
@@ -224,9 +224,17 @@ export default {
             formatter: this.formatter,
           },
 
-          { label: "评价来源", prop: "reviewSource" },
+          {
+            label: "评价来源",
+            prop: "reviewSource",
+            formatter: this.formatter,
+          },
 
-          { label: "评价设备", prop: "reviewDevice" },
+          {
+            label: "评价设备",
+            prop: "reviewDevice",
+            formatter: this.formatter,
+          },
 
           {
             label: "评价时间",
@@ -241,7 +249,7 @@ export default {
             formatter: this.formatterPic,
           },
 
-          { label: "绩效规则", prop: "ruleName" },
+          { label: "绩效规则", prop: "ruleName", formatter: this.formatter },
 
           {
             label: "加分/扣分方式",
@@ -255,7 +263,11 @@ export default {
             formatter: this.formatterDate,
           },
 
-          { label: "加分/扣分人员", prop: "deductPerson" },
+          {
+            label: "加分/扣分人员",
+            prop: "deductPerson",
+            formatter: this.formatter,
+          },
 
           { label: "分值", prop: "score", formatter: this.formatter },