Merge remote-tracking branch 'origin/master'

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

@@ -182,8 +182,8 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },
@@ -249,7 +249,11 @@ export default {
 
           { label: "说明", prop: "checkDesc" },
 
-          { label: "巡查人员", prop: "createUserId", formatter: this.formatter },
+          {
+            label: "巡查人员",
+            prop: "createUserId",
+            formatter: this.formatter,
+          },
 
           { label: "核查人员", prop: "checkPerson" },
 

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

@@ -189,8 +189,8 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },

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

@@ -183,9 +183,9 @@ export default {
           },
 
           {
-            name: "date",
-            type: "date",
-            label: "请选择日期",
+            name: "createTime",
+            type: "datetime",
+            label: "请选择开始日期",
             fuzzy: false,
           },
           {

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

@@ -183,8 +183,8 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },

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

@@ -182,8 +182,8 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },

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

@@ -188,8 +188,8 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },

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);
@@ -197,7 +197,7 @@ export default {
           },
           {
             name: "date",
-            type: "date",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },

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);
@@ -190,8 +190,8 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },

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);
@@ -196,8 +196,8 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },

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);
@@ -191,8 +191,8 @@ export default {
           },
 
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },

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);
@@ -190,8 +190,8 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },

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);
@@ -190,8 +190,8 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },

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

@@ -196,8 +196,8 @@ export default {
             fuzzy: false,
           },
           {
-            name: "date",
-            type: "date",
+            name: "createTime",
+            type: "datetime",
             label: "请选择日期",
             fuzzy: false,
           },