Merge remote-tracking branch 'origin/master'

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

@@ -32,7 +32,7 @@
       </div>
       <div class="text_line">
         <div class="text_box">
-          <span style="width: 90px;">工作总结：</span>
+          <span style="width: 120px;">工作总结：</span>
           <span style="display: inline-block;">{{
             form.workSummary ? form.workSummary : "--"
           }}</span>
@@ -40,13 +40,14 @@
       </div>
       <div class="text_line">
         <div class="text_box">
-          <span style="width: 90px;">加分申报：</span>
+          <span style="width: 120px;">加分申报：</span>
           <span>{{ form.bonusReport ? form.bonusReport : "--" }}</span>
         </div>
       </div>
       <div class="text_line">
         <div class="text_box">
-          <span style="width: 110px;">加分佐证材料：</span>
+          <span v-if="form.proofUrl" style="width: 110px;">加分佐证材料：</span>
+          <span v-else style="width: 195px;">加分佐证材料：</span>
           <el-link
             v-if="form.proofUrl"
             :href="baseUrl + form.proofUrl"
@@ -60,7 +61,7 @@
       </div>
       <div class="text_line">
         <div class="text_box">
-          <span style="width: 130px;">扣分情况：</span>
+          <span style="width: 140px;">扣分情况：</span>
           <span>{{ form.deductStatement ? form.deductStatement : "--" }}</span>
         </div>
       </div>
@@ -105,7 +106,8 @@
       </div>
       <div class="text_line">
         <div class="text_box">
-          <span style="width: 70px;">附件材料：</span>
+          <span v-if="form.annexUrl" style="width: 70px;">附件材料：</span>
+          <span v-else style="width: 180px;">附件材料：</span>
           <el-link
             v-if="form.annexUrl"
             :href="baseUrl + form.annexUrl"

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

@@ -134,7 +134,7 @@ export default {
 
           { label: "表单名称", prop: "fromName" },
 
-          { label: "总分分值", prop: "sumScore", formatter: this.formatter },
+          // { label: "总分分值", prop: "sumScore", formatter: this.formatter },
           {
             label: "提交时间",
             prop: "submitDate",

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

@@ -46,7 +46,8 @@
       </div>
       <div class="text_line">
         <div class="text_box">
-          <span style="width: 110px;">加分佐证材料：</span>
+          <span v-if="form.proofUrl" style="width: 110px;">加分佐证材料：</span>
+          <span v-else style="width: 195px;">加分佐证材料：</span>
           <el-link
             v-if="form.proofUrl"
             :href="baseUrl + form.proofUrl"
@@ -105,7 +106,8 @@
       </div>
       <div class="text_line">
         <div class="text_box">
-          <span style="width: 70px;">附件材料：</span>
+          <span v-if="form.annexUrl" style="width: 70px;">附件材料：</span>
+          <span v-else style="width: 180px;">附件材料：</span>
           <el-link
             v-if="form.annexUrl"
             :href="baseUrl + form.annexUrl"

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

@@ -135,7 +135,7 @@ export default {
 
           { label: "表单名称", prop: "fromName" },
 
-          { label: "总分分值", prop: "sumScore", formatter: this.formatter },
+          // { label: "总分分值", prop: "sumScore", formatter: this.formatter },
           {
             label: "提交时间",
             prop: "submitDate",

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/menu/service/impl/MenuServiceImpl.java

@@ -222,7 +222,7 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
         if(!ObjectUtils.isEmpty(menuEntity)){
             menuEntity.setStatus(SatusEnum.ENABLE.getValue());
             menuEntity.setUpdateTime(new Date());
-            menuEntity.setUpdateUser(context.getUser().getLoginName());
+            menuEntity.setUpdateUserId(this.getContextUserId(context));
             MenuEntity condition = new MenuEntity();
             condition.setId(menuEntity.getId());
             this.updateBatch(menuEntity, condition, context);