Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue

 <template>
   <!-- 弹出框表单 -->
-  <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+  <el-dialog
+    :title="title"
+    :visible.sync="open"
+    width="50%"
+    height="300px"
+    append-to-body
+  >
     <div class="userName">
       <div class="user-left">
         <div class="user-name">
@@ -19,6 +25,7 @@
         <div class="m">{{ form.month }}月得分</div>
       </div>
     </div>
+    <div class="dialog_box">
       <div
         class="userName user-t-item "
         :class="{ t2: item.subAddType == 1, t1: item.subAddType == 2 }"
@@ -44,7 +51,9 @@
             >
           </div>
           <div class="user-info">
-          <span class="user-i">核查时间：{{ momentVal(item.checkTime) }}</span>
+            <span class="user-i"
+              >核查时间：{{ momentVal(item.updateTime) }}</span
+            >
           </div>
           <div class="user-info" v-if="item.auditStatus == 2">
             <span class="user-i"
@@ -60,6 +69,8 @@
           </div>
         </div>
       </div>
+    </div>
+
     <!-- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
                 <Field label="人员id" prop="staffId" v-model="form.staffId" placeholder="请输入人员id" />
@@ -286,4 +297,12 @@ export default {
     color: rgba(27, 198, 167, 1);
   }
 }
+
+/deep/.el-dialog__body {
+  height: 650px;
+  .dialog_box {
+    height: 85%;
+    overflow-y: auto;
+  }
+}
 </style>

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

@@ -204,4 +204,8 @@ export default {
   color: #409eff;
   font-weight: 600;
 }
+::v-deep.el-dialog__wrapper {
+  overflow: hidden;
+  top: -50px;
+}
 </style>