Merge remote-tracking branch 'origin/master'

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

@@ -129,7 +129,12 @@ export default {
             prop: "deptName",
           },
 
-          { label: "考核窗口", prop: "windowName" },
+          {
+            label: "考核窗口",
+            formatter: (row) => {
+              return `${row.windowName ? row.windowName : "--"}`;
+            },
+          },
 
           { label: "表单名称", prop: "fromName" },
 
@@ -150,6 +155,7 @@ export default {
                   noAdd
                   noDel
                   noEdit
+                  noView
                   reCheck
                   text={"自评核查"}
                   row={row}

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

@@ -80,7 +80,7 @@
               </el-table-column>
               <el-table-column
                 prop="examineLevel"
-                label="建议考核等级"
+                label="建议考核等次"
                 align="center"
                 width="200"
               >

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

@@ -130,7 +130,12 @@ export default {
             prop: "deptName",
           },
 
-          { label: "考核窗口", prop: "windowName" },
+          {
+            label: "考核窗口",
+            formatter: (row) => {
+              return `${row.windowName ? row.windowName : "--"}`;
+            },
+          },
 
           { label: "表单名称", prop: "fromName" },
 
@@ -159,6 +164,7 @@ export default {
                   noDel
                   noEdit
                   reCheck
+                  noView
                   text={"自评核查"}
                   row={row}
                   onEdit={this.toEdit}

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

@@ -131,7 +131,12 @@ export default {
             prop: "deptName",
           },
 
-          { label: "考核窗口", prop: "windowName" },
+          {
+            label: "考核窗口",
+            formatter: (row) => {
+              return `${row.windowName ? row.windowName : "--"}`;
+            },
+          },
 
           { label: "表单名称", prop: "fromName" },
 

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

@@ -80,7 +80,7 @@
               </el-table-column>
               <el-table-column
                 prop="examineLevel"
-                label="建议考核等级"
+                label="建议考核等次"
                 align="center"
                 width="200"
               >

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

@@ -68,9 +68,7 @@ export default {
     },
     // 切换表格
     changeRadio() {
-      this.radio1 == 1
-        ? this.$router.push("/window/perform/list?page=1")
-        : "";
+      this.radio1 == 1 ? this.$router.push("/window/perform/list?page=1") : "";
     },
   },
   data() {
@@ -131,7 +129,12 @@ export default {
             prop: "deptName",
           },
 
-          { label: "考核窗口", prop: "windowName" },
+          {
+            label: "考核窗口",
+            formatter: (row) => {
+              return `${row.windowName ? row.windowName : "--"}`;
+            },
+          },
 
           { label: "表单名称", prop: "fromName" },
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowPerformServiceImpl.java

@@ -123,6 +123,7 @@ public class WindowPerformServiceImpl extends AbstractCRUDServiceImpl<WindowPerf
         BeanUtils.copyProperties(entity, perform, BeanUtil.getNullPropertyNames(entity));
         perform.setId(null);
         perform.setRecordId(entity.getId());
+        perform.setWindowName(entity.getWindowName()+"("+entity.getWindowCode()+")");
         perform.setFromName("市政务服务大厅窗口考核登记表");
         perform.setSubmitDate(entity.getFillDate());
         perform.setUpdateTime(null);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowWorkmanPerformServiceImpl.java

@@ -144,6 +144,7 @@ public class WindowWorkmanPerformServiceImpl extends AbstractCRUDServiceImpl<Win
         BeanUtils.copyProperties(entity, perform, BeanUtil.getNullPropertyNames(entity));
         perform.setId(null);
         perform.setRecordId(entity.getId());
+        perform.setWindowName(entity.getWindowName()+"("+entity.getWindowCode()+")");
         perform.setFromName("市政务服务大厅窗口工作人员考核汇总表");
         perform.setSubmitDate(entity.getFillDate());
         perform.setUpdateTime(null);