Merge remote-tracking branch 'origin/master'

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

@@ -226,7 +226,6 @@ export default {
     },
     maxLength: {
       type: Number,
-      default: 256,
     },
   },
   methods: {

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

 <template>
   <div class="page">
-    <div >
+    <div>
       <tab-pane
         :thirdList="thirdList"
         :activeName="activeName"
@@ -66,14 +66,14 @@
         @click="lookexportHis"
         >导出记录</el-button
       >
-      <!-- <el-button
+      <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         @click="setdialog"
         >表格设置</el-button
-      > -->
+      >
     </LayoutTable>
     <drawer-show ref="drawerform" @ok="getData" />
     <!-- 导出记录查看 -->
@@ -189,7 +189,7 @@ import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
 import TabPane from "@/components/tabPane.vue";
 import { timestampToTime } from "@/assets/utils/dateFormat";
-import {formatterDateOnly} from "@/assets/utils/table";
+import { formatterDateOnly } from "@/assets/utils/table";
 export default {
   name: "AttendanceRecordList",
   components: {
@@ -401,12 +401,30 @@ export default {
       /** 子表列元素 */
       columnSet: [
         { prop: "shiftsName", label: "班次名称", width: 150 },
-        { prop: "goWorkDate", label: "上班打卡时间", width: 100 , formatter: this.formatterDate},
-        { prop: "goWorkResult", label: "上班打卡结果", width: 100, formatter: this.formatterString },
-        { prop: "offWorkDate", label: "下班打卡时间", width: 100 , formatter: this.formatterDate},
-        { prop: "offWorkResult", label: "下班打卡结果", width: 100 , formatter: this.formatterString}
-
-
+        {
+          prop: "goWorkDate",
+          label: "上班打卡时间",
+          width: 100,
+          formatter: this.formatterDate,
+        },
+        {
+          prop: "goWorkResult",
+          label: "上班打卡结果",
+          width: 100,
+          formatter: this.formatterString,
+        },
+        {
+          prop: "offWorkDate",
+          label: "下班打卡时间",
+          width: 100,
+          formatter: this.formatterDate,
+        },
+        {
+          prop: "offWorkResult",
+          label: "下班打卡结果",
+          width: 100,
+          formatter: this.formatterString,
+        },
       ],
       config: {
         search: [
@@ -459,7 +477,6 @@ export default {
             label: "考勤结束时间",
             fuzzy: false,
           },
-
         ],
         columns: [
           { type: "selection", width: 60 },
@@ -479,24 +496,35 @@ export default {
           { label: "部门", prop: "deptName", formatter: this.formatters },
           { label: "职位", prop: "positionName", formatter: this.formatters },
           { label: "班次", prop: "shiftsName", formatter: this.formatters },
-          { label: "签到结果", prop: "signInResult", formatter: this.formatter },
-          { label: "签退结果", prop: "signOutResult", formatter: this.formatter },
+          {
+            label: "签到结果",
+            prop: "signInResult",
+            formatter: this.formatter,
+          },
+          {
+            label: "签退结果",
+            prop: "signOutResult",
+            formatter: this.formatter,
+          },
           { label: "打卡结果", prop: "punchResult", formatter: this.formatter },
           { label: "考勤类型", prop: "attendType", formatter: this.formatter },
 
-          {label: "考勤打卡记录详细信息",
+          {
+            label: "考勤打卡记录详细信息",
             width: 120,
             prop: "subColumns",
             formatter: (row) => {
-                let widthsize = this.columnSet.reduce((pre, cur) => {
-                    return pre + Number(cur.width);
-                }, 50);
-                return (
-                    <el-popover placement="right" width={widthsize} trigger="click">
-                        {this.renderTable(row.attendanceRecordDetailList)}
-                        <el-button type="text" slot="reference">详细</el-button>
-                    </el-popover>
-                );
+              let widthsize = this.columnSet.reduce((pre, cur) => {
+                return pre + Number(cur.width);
+              }, 50);
+              return (
+                <el-popover placement="right" width={widthsize} trigger="click">
+                  {this.renderTable(row.attendanceRecordDetailList)}
+                  <el-button type="text" slot="reference">
+                    详细
+                  </el-button>
+                </el-popover>
+              );
             },
           },
           // {

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

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

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

@@ -115,7 +115,7 @@ export default {
           { label: "分类", prop: "categoryId", formatter: this.formatter },
           { label: "考核内容简称", prop: "name" },
 
-          { label: "考核编码", prop: "ruleCode" },
+          // { label: "考核编码", prop: "ruleCode" },
 
           { label: "评分标准", prop: "content" },
 

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

@@ -183,7 +183,12 @@
       </div>
     </el-dialog>
 
-    <drawer-show ref="drawerform" @ok="getData" :bumentree="areaData" :currentNode="currentNode"/>
+    <drawer-show
+      ref="drawerform"
+      @ok="getData"
+      :bumentree="areaData"
+      :currentNode="currentNode"
+    />
   </div>
 </template>
 
@@ -249,7 +254,7 @@ export default {
     },
 
     handleNodeClick(node) {
-      console.log(node,123123);
+      console.log(node, 123123);
       this.currentNode = node;
       this.query = { deptId: node.id };
       this.getData();