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,12 +496,21 @@ 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) => {
@@ -494,7 +520,9 @@ export default {
               return (
                 <el-popover placement="right" width={widthsize} trigger="click">
                   {this.renderTable(row.attendanceRecordDetailList)}
-                        <el-button type="text" slot="reference">详细</el-button>
+                  <el-button type="text" slot="reference">
+                    详细
+                  </el-button>
                 </el-popover>
               );
             },

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

 <template>
   <div class="page">
-        <LayoutTable :data="tableData" notDel :config="tableConfig">
-        </LayoutTable>
+    <LayoutTable :data="tableData" notDel :config="tableConfig"> </LayoutTable>
     <drawer-show ref="drawerform" @ok="getData" />
   </div>
 </template>
@@ -13,11 +12,10 @@ import table from "@/assets/mixins/table";
 export default {
   name: "FeedbackList",
   components: {
-        drawerShow
+    drawerShow,
   },
   mixins: [table],
-    created() {
-    },
+  created() {},
   methods: {
     renderTable(tableData) {
       return (
@@ -33,8 +31,7 @@ export default {
           label={options.label}
           width={options.width}
           formatter={options.formatter}
-                >
-                </el-table-column>
+        ></el-table-column>
       );
     },
     /** 重写新增方法 */
@@ -46,25 +43,28 @@ export default {
     toEdit(row) {
       // this.$refs.drawerform.edit(row);
       this.$router.push({ path: `/feedback/addQuestion/list?id=${row.id}` });
-            localStorage.setItem('editFeedback', JSON.stringify(row))
+      localStorage.setItem("editFeedback", JSON.stringify(row));
     },
     /** 重写查看方法 */
     toView(row) {
-            console.log(row)
-            localStorage.setItem('checkFeedbackId', row.id)
+      console.log(row);
+      localStorage.setItem("checkFeedbackId", row.id);
       // this.$refs.drawerform.view(row);
-            this.$router.push('/feedback/questionnaire/list')
+      this.$router.push("/feedback/questionnaire/list");
     },
     goPage(path) {
-            this.$router.push(path)
-        }
-
+      this.$router.push(path);
+    },
   },
   data() {
     return {
       /** 子表列元素 */
       columnSet: [
-                { label: "反馈问卷id号", prop: "feedbackId", formatter: this.formatter },
+        {
+          label: "反馈问卷id号",
+          prop: "feedbackId",
+          formatter: this.formatter,
+        },
         { label: "问题内容", prop: "content" },
         { label: "问题类型 ", prop: "questionType", formatter: this.formatter },
         { label: "是否必填", prop: "require", formatter: this.formatter },
@@ -73,6 +73,18 @@ export default {
       config: {
         isshowTabPane: true,
         search: [
+          {
+            name: "feedbackTimeStart",
+            type: "datetime",
+            label: "请选择日期",
+            fuzzy: false,
+          },
+          {
+            name: "title",
+            type: "text",
+            label: "输入问卷标题关键字搜索",
+            fuzzy: false,
+          },
         ],
         columns: [
           { type: "selection", width: 60 },
@@ -80,11 +92,23 @@ export default {
 
           { label: "问卷标题", prop: "title" },
 
-                    { label: "更新时间", prop: "createTime", formatter: this.formatterDate },
+          {
+            label: "更新时间",
+            prop: "createTime",
+            formatter: this.formatterDate,
+          },
 
-                    { label: "反馈开始时间", prop: "feedbackTimeStart", formatter: this.formatterDate },
+          {
+            label: "反馈开始时间",
+            prop: "feedbackTimeStart",
+            formatter: this.formatterDate,
+          },
 
-                    { label: "反馈结束时间", prop: "feedbackTimeEnd", formatter: this.formatterDate },
+          {
+            label: "反馈结束时间",
+            prop: "feedbackTimeEnd",
+            formatter: this.formatterDate,
+          },
 
           { label: "邀请人数", prop: "inviteNum", formatter: this.formatter },
 
@@ -92,19 +116,30 @@ export default {
 
           // { label: "创建用户", prop: "createUserId", formatter: this.formatter },
           {
-                        label: "状态", prop: "processStatus", formatter: (row) => {
-                            let str = "未开始"
+            label: "状态",
+            prop: "processStatus",
+            formatter: (row) => {
+              let str = "未开始";
               if (row.processStatus == 1) {
-                                str = "进行中"
+                str = "进行中";
               } else if (row.processStatus == 2) {
-                                str = "已结束"
+                str = "已结束";
               }
               return (
-                                <el-tag type={row.processStatus ? row.processStatus == 1 ? 'success' : 'info' : 'danger'} size="small">
+                <el-tag
+                  type={
+                    row.processStatus
+                      ? row.processStatus == 1
+                        ? "success"
+                        : "info"
+                      : "danger"
+                  }
+                  size="small"
+                >
                   {str}
                 </el-tag>
-                            )
-                        }
+              );
+            },
           },
           // {
           //     label: "绩效反馈问题",
@@ -124,23 +159,37 @@ export default {
           {
             label: "操作",
             width: 240,
-                        formatter: row => {
+            formatter: (row) => {
               if (row.processStatus == 0) {
                 return (
-                                    <table-buttons noAdd noView row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
+                  <table-buttons
+                    noAdd
+                    noView
+                    row={row}
+                    onEdit={this.toEdit}
+                    onView={this.toView}
+                    onDel={this.toDel}
+                  />
                 );
               } else {
                 return (
-                                    <table-buttons noAdd noEdit row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
+                  <table-buttons
+                    noAdd
+                    noEdit
+                    row={row}
+                    onEdit={this.toEdit}
+                    onView={this.toView}
+                    onDel={this.toDel}
+                  />
                 );
               }
               // return <table-buttons noAdd noEdit row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
-                        }
-                    }
-                ]
-            }
+            },
+          },
+        ],
+      },
     };
-    }
+  },
 };
 </script>
 <style lang="less" scoped>

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();