Merge remote-tracking branch 'origin/master'

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

@@ -44,7 +44,13 @@
         class="el-upload-list__item ele-upload-list__item-content"
         v-for="(file, index) in list"
       >
-        <el-link :href="baseUrl + file.url" :underline="false" target="_blank">
+        <el-link
+          :href="
+            file.url[0].indexOf('https') == -1 ? baseUrl + file.url : file.url
+          "
+          :underline="false"
+          target="_blank"
+        >
           <span class="el-icon-document" style="font-size: 12px">
             {{ getFileName(file.name) }}
           </span>
@@ -145,15 +151,23 @@ export default {
     list() {
       let temp = 1;
       if (this.value) {
-        console.log("value", this.value);
         // 首先将值转为数组
         const list = Array.isArray(this.value) ? this.value : [this.value];
+        list &&
+          list.forEach((v) => {
+            v.url.indexOf("https") >= 0 ? (v.url = JSON.parse(v.url)) : v.url;
+          });
         // 然后将数组转为对象数组
         this.fileList = list.map((item) => {
-          item = { name: item.name, url: item.url };
+          item = {
+            name: item.name,
+            url:
+              item.url.indexOf("[`\`") >= 0 ? JSON.parse(item.url) : item.url,
+          };
           item.uid = item.uid || new Date().getTime() + temp++;
           return item;
         });
+
         return this.fileList;
       } else {
         this.fileList = [];

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

@@ -164,7 +164,7 @@ export default {
             prop: "auditResult",
             formatter: this.formatter,
           },
-          { label: "审批负责人", prop: "approver" },
+          // { label: "审批负责人", prop: "approver" },
 
           {
             label: "创建用户",

attendance-performance-manager-ui/admin/src/views/check/window/perform/list.vue

@@ -66,7 +66,6 @@ export default {
     },
     // 切换表格
     changeRadio() {
-      console.log(this.radio1);
       this.radio1 == 2
         ? this.$router.push("/check/window/workman/perform/list?page=1")
         : "";
@@ -98,37 +97,50 @@ export default {
             fuzzy: false,
           },
           {
-            name: "staffName",
+            name: "ownerName",
             type: "text",
-            label: "请输入窗口负责人姓名搜索",
+            width: 200,
+            label: "窗口负责人姓名搜索",
             fuzzy: false,
           },
         ],
         columns: [
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
+          { label: "窗口负责人", prop: "ownerName" },
 
           {
-            label: "管理组核查时间",
-            prop: "manageCheckTime",
-            formatter: this.formatterDate,
+            label: "登记年月",
+            formatter: (row) => {
+              return `${row.year ? row.year : "--"}-${
+                row.month
+                  ? [1, 2, 3, 4, 5, 6, 7, 8, 9].includes(row.month)
+                    ? "0" + row.month
+                    : row.month
+                  : "--"
+              }`;
+            },
           },
 
-          { label: "管理组核查说明", prop: "manageCheckDesc" },
-
-          { label: "管理组核查结果", prop: "manageCheckResult" },
+          { label: "所属大厅", prop: "salaName" },
 
           {
-            label: "领导组核查时间",
-            prop: "leaderCheckTime",
-            formatter: this.formatterDate,
+            label: "所属部门",
+            prop: "deptName",
           },
 
-          { label: "领导组核查说明", prop: "leaderCheckDesc" },
+          { label: "考核窗口", prop: "windowName" },
 
-          { label: "领导组核查结果", prop: "leaderCheckResult" },
+          { label: "表单名称", prop: "fromName" },
 
+          { label: "总分分值", prop: "sumScore", formatter: this.formatter },
+          {
+            label: "提交时间",
+            prop: "submitDate",
+            formatter: this.formatterDate,
+          },
           { label: "处理状态", prop: "checkStatus", formatter: this.formatter },
+
           {
             label: "操作",
             width: 240,
@@ -136,6 +148,10 @@ export default {
               return (
                 <table-buttons
                   noAdd
+                  noDel
+                  noEdit
+                  reCheck
+                  text={"自评核查"}
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}

attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/list.vue

@@ -98,25 +98,57 @@ export default {
             fuzzy: false,
           },
           {
-            name: "staffName",
+            name: "ownerName",
             type: "text",
-            label: "请输入窗口负责人姓名搜索",
+            width: 200,
+            label: "窗口负责人姓名搜索",
             fuzzy: false,
           },
         ],
         columns: [
           { type: "selection", width: 60 },
           { type: "index", label: "序号", width: 50 },
+          { label: "窗口负责人", prop: "ownerName" },
 
           {
-            label: "管理组核查时间",
-            prop: "manageCheckTime",
-            formatter: this.formatterDate,
+            label: "登记年月",
+            formatter: (row) => {
+              return `${row.year ? row.year : "--"}-${
+                row.month
+                  ? [1, 2, 3, 4, 5, 6, 7, 8, 9].includes(row.month)
+                    ? "0" + row.month
+                    : row.month
+                  : "--"
+              }`;
+            },
+          },
+
+          { label: "所属大厅", prop: "salaName" },
+
+          {
+            label: "所属部门",
+            prop: "deptName",
           },
 
-          { label: "管理组核查说明", prop: "manageCheckDesc" },
+          { label: "考核窗口", prop: "windowName" },
+
+          { label: "表单名称", prop: "fromName" },
+
+          { label: "总分分值", prop: "sumScore", formatter: this.formatter },
+          {
+            label: "提交时间",
+            prop: "submitDate",
+            width: 110,
+            formatter: this.formatterDate,
+          },
+          {
+            label: "最新核查时间",
+            prop: "updateTime",
+            width: 150,
+            formatter: this.formatterDate,
+          },
+          { label: "处理状态", prop: "checkStatus", formatter: this.formatter },
 
-          { label: "管理组核查结果", prop: "manageCheckResult" },
           {
             label: "操作",
             width: 240,
@@ -124,6 +156,10 @@ export default {
               return (
                 <table-buttons
                   noAdd
+                  noDel
+                  noEdit
+                  reCheck
+                  text={"自评核查"}
                   row={row}
                   onEdit={this.toEdit}
                   onView={this.toView}