Merge remote-tracking branch 'origin/master'

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

@@ -453,17 +453,26 @@ export default {
     formatterPic(row, column, val) {
       const content = formatter(this.tableData, column, val);
       if (content) {
-        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>
-        );
+        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}`);
+        if (regular.test(val)) {
+          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>
+          );
+        } else {
+          return <el-link type="primary">{val}</el-link>;
+        }
       } else {
         return val;
       }
     },
+
     // 考勤组格式
     formatterBanci(row, column, val) {
       const content = formatter(this.tableData, column, val);

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

@@ -80,7 +80,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -63,6 +63,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "CheckAttendRecordList",
   components: {
@@ -71,6 +73,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "考勤绩效记录核查信息导入";
@@ -213,6 +225,7 @@ export default {
           {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
 

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

@@ -95,7 +95,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -63,6 +63,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "CheckComplainRecordList",
   components: {
@@ -71,6 +73,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "评价绩效投诉核查信息导入";
@@ -218,6 +230,7 @@ export default {
           {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
 

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

@@ -72,7 +72,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -63,6 +63,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "CheckEffectRecordList",
   components: {
@@ -71,6 +73,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "效能绩效核查信息导入";
@@ -217,9 +229,10 @@ export default {
             formatter: this.formatterDate,
           },
 
-          {
+         {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
 

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

@@ -74,7 +74,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -63,6 +63,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "CheckGoworkRecordList",
   components: {
@@ -71,6 +73,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "办件绩效核查信息导入";
@@ -208,6 +220,7 @@ export default {
           {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
 

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

@@ -70,7 +70,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -63,6 +63,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "CheckOtherRecordList",
   components: {
@@ -71,6 +73,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "其它绩效核查信息导入";
@@ -213,9 +225,10 @@ export default {
           //   },
 
           //   { label: "绩效规则id", prop: "ruleId", formatter: this.formatter },
-          {
+         {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
 

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

@@ -75,7 +75,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -63,6 +63,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "CheckReviewRecordList",
   components: {
@@ -71,6 +73,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "评价差评绩效核查信息导入";
@@ -217,6 +229,7 @@ export default {
           {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
 

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

@@ -78,6 +78,8 @@
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
 import BarCharts from "./components/BarCharts.vue";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "PerformAttendAppealList",
   components: {
@@ -89,6 +91,16 @@ export default {
     this.getData();
   },
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     handleClick() {
       this.getData();
     },
@@ -209,7 +221,7 @@ export default {
             prop: "irregularType",
             formatter: this.formatter,
           },
-          
+
           { label: "绩效规则", prop: "ruleId", formatter: this.formatter },
 
           {

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

@@ -132,7 +132,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -71,6 +71,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "PerformAttendRecordList",
   components: {
@@ -79,6 +81,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "考勤绩效记录信息导入";
@@ -219,9 +231,10 @@ export default {
           { label: "异常结果", prop: "errorResult" },
 
           /*
-          {
+         {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
 */
@@ -229,6 +242,7 @@ export default {
           {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
 

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

@@ -184,7 +184,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -71,6 +71,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "PerformComplainRecordList",
   components: {
@@ -79,6 +81,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "评价绩效投诉记录信息导入";
@@ -225,6 +237,7 @@ export default {
           {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
 

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

@@ -158,7 +158,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -71,6 +71,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "PerformEffectRecordList",
   components: {
@@ -79,6 +81,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "效能绩效记录信息导入";
@@ -228,6 +240,7 @@ export default {
           {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
           { label: "绩效规则", prop: "ruleName" },

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

@@ -136,7 +136,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -71,6 +71,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "PerformGoworkRecordList",
   components: {
@@ -79,6 +81,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "办件绩效记录信息导入";
@@ -215,6 +227,7 @@ export default {
           {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
           { label: "绩效规则", prop: "ruleName" },

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

@@ -96,7 +96,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -71,6 +71,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "PerformOtherRecordList",
   components: {
@@ -79,6 +81,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "其它绩效记录信息导入";
@@ -224,11 +236,16 @@ export default {
           {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },
           { label: "绩效规则", prop: "ruleName" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subMethod",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",

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

@@ -149,7 +149,11 @@
                       : form.filePaths
                   }`
                 "
-                :preview-src-list="form.filePaths"
+                :preview-src-list="
+                  form.filePaths.indexOf('http') == -1
+                    ? [baseUrl + form.filePaths]
+                    : [form.filePaths]
+                "
               >
               </el-image>
               <span v-else>--</span>

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

@@ -71,6 +71,8 @@
 /** 表单弹出框模式需引入 */
 import drawerShow from "./drawershow";
 import table from "@/assets/mixins/table";
+import { downloadFile } from "@/assets/utils/index";
+
 export default {
   name: "PerformReviewRecordList",
   components: {
@@ -79,6 +81,16 @@ export default {
   mixins: [table],
   created() {},
   methods: {
+    handleCellClick(row, column, event, cell) {
+      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);
+        if (!regular.test(row.filePaths)) {
+          downloadFile(row.filePaths, row.fileName);
+        }
+      }
+    },
     /** 导入 */
     handleImport() {
       this.upload.title = "评价差评绩效记录信息导入";
@@ -225,6 +237,7 @@ export default {
           {
             label: "图片凭证",
             prop: "filePaths",
+            width: 150,
             formatter: this.formatterPic,
           },