Merge remote-tracking branch 'origin/master'

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

@@ -35,8 +35,8 @@
           clearable="true"
           @change="item.change"
           @clear="item.clear"
-          :placeholder="item.label ? item.label : '请选择'"
           v-if="item.type === 'select'"
+          :placeholder="'请选择' + item.label"
         >
           <el-option
             label="全部"
@@ -111,7 +111,7 @@
           v-if="item.type === 'date' && !item.valueFormat"
           type="date"
           value-format="yyyy-MM-dd"
-          :placeholder="item.label ? item.label : '选择日期'"
+          placeholder="选择日期"
         >
         </el-date-picker>
 
@@ -120,7 +120,7 @@
           v-if="item.type === 'date' && item.valueFormat"
           type="date"
           :value-format="item.valueFormat"
-          :placeholder="item.label ? item.label : '选择日期'"
+          placeholder="选择日期"
         >
         </el-date-picker>
 

attendance-performance-manager-ui/admin/src/components/tools/FormButtons.vue

 // 表单通用的保存和取消按钮，可以通过默认slot方式替换
 <template>
-    <el-form-item>
-        <slot name="prepend"></slot>
-        <slot>
-            <el-button v-if="!noSaveBtn" type="primary" @click='$emit("submit")' size='small' icon='el-icon-circle-check-outline'>保存</el-button>
-            <el-button v-if="!noCancelBtn" @click="$router.go(-1)" size='small' icon='el-icon-circle-close-outline'>取消</el-button>
-        </slot>
-        <slot name="append"></slot>
-    </el-form-item>
+  <el-form-item>
+    <slot name="prepend"></slot>
+    <slot>
+      <el-button
+        v-if="!noSaveBtn"
+        type="primary"
+        @click="$emit('submit')"
+        size="small"
+        icon="el-icon-circle-check-outline"
+        >保存</el-button
+      >
+      <el-button
+        v-if="!noCancelBtn"
+        @click="$router.go(-1)"
+        size="small"
+        icon="el-icon-circle-close-outline"
+        >取消</el-button
+      >
+    </slot>
+    <slot name="append"></slot>
+  </el-form-item>
 </template>
 
 <script>
 export default {
-    props: {
-        noSaveBtn: {
-            type: Boolean,
-            default: false,
-        },
-        noCancelBtn: {
-            type: Boolean,
-            default: false,
-        },
+  props: {
+    noSaveBtn: {
+      type: Boolean,
+      default: false,
     },
-    methods: {},
-    data() {
-        return {};
+    noCancelBtn: {
+      type: Boolean,
+      default: false,
     },
+  },
+  methods: {},
+  data() {
+    return {};
+  },
 };
 </script>
-
-
-

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

@@ -123,7 +123,7 @@ export default {
       // 是否显示弹出层
       open: false,
       direction: "rtl",
-      toString: ["leaveType","deptId","approverId"],
+      toString: ["leaveType", "deptId", "approverId"],
       toDate: ["startTime", "endTime"],
       // 表单校验
       rules: {
@@ -223,6 +223,7 @@ export default {
         if (this.form.endTime.valueOf() > this.form.startTime.valueOf()) {
           this.form.duration = getMinu(this.form.startTime, this.form.endTime);
         } else {
+          this.$message.closeAll();
           this.$message.error("结束日期需大于请假日期");
         }
       }

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

@@ -74,7 +74,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);
@@ -172,13 +172,13 @@ export default {
           {
             name: "checkStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
           {
@@ -249,6 +249,8 @@ export default {
 
           { label: "说明", prop: "checkDesc" },
 
+          { label: "巡查人员", prop: "createUserId", formatter: this.formatter },
+
           { label: "核查人员", prop: "checkPerson" },
 
           {

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

@@ -74,7 +74,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);
@@ -173,19 +173,19 @@ export default {
           {
             name: "checkStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
           {
             name: "complainSource",
             type: "select",
-            label: "全部来源",
+            label: "投诉来源",
             fuzzy: false,
           },
           {
@@ -255,6 +255,11 @@ export default {
           { label: "核查结果", prop: "checkResult", formatter: this.formatter },
 
           { label: "说明", prop: "checkDesc" },
+          {
+            label: "巡查人员",
+            prop: "createUserId",
+            formatter: this.formatter,
+          },
 
           { label: "核查人员", prop: "checkPerson" },
 

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

@@ -74,7 +74,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);
@@ -172,13 +172,13 @@ export default {
           {
             name: "status",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
 
@@ -229,7 +229,7 @@ export default {
             formatter: this.formatterDate,
           },
 
-         {
+          {
             label: "图片凭证",
             prop: "filePaths",
             width: 150,
@@ -256,6 +256,12 @@ export default {
 
           { label: "说明", prop: "checkDesc" },
 
+          {
+            label: "巡查人员",
+            prop: "createUserId",
+            formatter: this.formatter,
+          },
+
           { label: "核查人员", prop: "checkPerson" },
 
           {

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

@@ -74,7 +74,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);
@@ -173,13 +173,13 @@ export default {
           {
             name: "checkStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
           {
@@ -244,6 +244,12 @@ export default {
 
           { label: "说明", prop: "checkDesc" },
 
+          {
+            label: "巡查人员",
+            prop: "createUserId",
+            formatter: this.formatter,
+          },
+
           { label: "核查人员", prop: "checkPerson" },
 
           {

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

@@ -74,7 +74,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);
@@ -172,13 +172,13 @@ export default {
           {
             name: "checkStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
           {
@@ -225,7 +225,7 @@ export default {
           //   },
 
           //   { label: "绩效规则id", prop: "ruleId", formatter: this.formatter },
-         {
+          {
             label: "图片凭证",
             prop: "filePaths",
             width: 150,
@@ -252,6 +252,12 @@ export default {
 
           { label: "说明", prop: "checkDesc" },
 
+          {
+            label: "巡查人员",
+            prop: "createUserId",
+            formatter: this.formatter,
+          },
+
           { label: "核查人员", prop: "checkPerson" },
 
           {

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

@@ -74,7 +74,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);
@@ -172,19 +172,19 @@ export default {
           {
             name: "checkStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
           {
             name: "reviewSource",
             type: "select",
-            label: "全部来源",
+            label: "差评来源",
             fuzzy: false,
           },
           {
@@ -253,6 +253,12 @@ export default {
 
           { label: "说明", prop: "checkDesc" },
 
+          {
+            label: "巡查人员",
+            prop: "createUserId",
+            formatter: this.formatter,
+          },
+
           { label: "核查人员", prop: "checkPerson" },
 
           {

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

@@ -122,14 +122,40 @@
               <span v-if="!form.performAttendAppealFilesList">
                 --
               </span>
+
               <div class="img_content" v-else>
                 <div
                   class="imgBox"
                   v-for="val in form.performAttendAppealFilesList"
                   :key="val.id"
-                  @click="hanldeDownloadFile(val)"
                 >
-                  <img src="../../../../assets/images/fileImg.png" alt="" />
+                  <el-image
+                    v-if="
+                      val.filePath.includes(
+                        '.png' || '.jpg' || '.jpeg' || 'bmp'
+                      )
+                    "
+                    style="width: 100px; height: 100px"
+                    :src="
+                      `${
+                        val.filePath.indexOf('http') == -1
+                          ? baseUrl + val.filePath
+                          : val.filePath
+                      }`
+                    "
+                    :preview-src-list="
+                      val.filePath.indexOf('http') == -1
+                        ? [baseUrl + val.filePath]
+                        : [val.filePath]
+                    "
+                  >
+                  </el-image>
+                  <img
+                    src="../../../../assets/images/fileImg.png"
+                    v-else
+                    alt=""
+                    @click="hanldeDownloadFile(val)"
+                  />
                   {{ val.fileName }}
                 </div>
               </div>
@@ -502,6 +528,7 @@ export default {
         "checkTime",
         "appealTime",
       ],
+      baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
       // 表单校验
       rules: {
         staffName: [

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

@@ -180,13 +180,13 @@ export default {
           {
             name: "processStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
           {

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

@@ -180,19 +180,19 @@ export default {
           {
             name: "processStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
           {
             name: "complainSource",
             type: "select",
-            label: "全部来源",
+            label: "投诉来源",
             fuzzy: false,
           },
           {

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

@@ -180,13 +180,13 @@ export default {
           {
             name: "processStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
 

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

@@ -180,13 +180,13 @@ export default {
           {
             name: "processStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
           {

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

@@ -180,13 +180,13 @@ export default {
           {
             name: "processStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
           {

attendance-performance-manager-ui/admin/src/views/perform/review/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);
@@ -180,19 +180,19 @@ export default {
           {
             name: "processStatus",
             type: "select",
-            label: "全部状态",
+            label: "处理状态",
             fuzzy: false,
           },
           {
             name: "deptId",
             type: "select",
-            label: "全部部门",
+            label: "所属部门",
             fuzzy: false,
           },
           {
             name: "reviewSource",
             type: "select",
-            label: "全部来源",
+            label: "差评来源",
             fuzzy: false,
           },
           {