Merge branch 'blockingData'

src/views/blockingData/missedInspectionList/index.vue

@@ -64,7 +64,12 @@
       <el-table-column label="航站楼" align="center" prop="terminalName" min-width="120" />
       <el-table-column label="被回查人" align="center" prop="reviewedUserName" min-width="120" />
       <el-table-column label="回查日期" align="center" prop="reviewDate" min-width="120" />
-      <el-table-column label="漏检时间" align="center" prop="missCheckTime" min-width="180" />
+      <el-table-column label="漏检时间" align="center" prop="missCheckTime" min-width="180" >
+        <template #default="scope">
+          {{ scope.row.missCheckTime.split(' ')[1] || '' }}
+        </template>
+
+      </el-table-column>
       <el-table-column label="漏检时间段" align="center" prop="missCheckTimePeriod" min-width="150" />
       <el-table-column label="上岗位置" align="center" prop="channelName" min-width="120" />
       <el-table-column label="分管主管" align="center" prop="supervisorName" min-width="120" />

src/views/system/user/components/UserInfoEdit.vue

@@ -103,12 +103,12 @@
           <el-col :span="12">
             <el-form-item label="是否参加考核" prop="takeAssessment">
               <el-radio-group v-model="form.takeAssessment">
-                <el-radio :value="'1'">是</el-radio>
-                <el-radio :value="'0'">否</el-radio>
+                <el-radio :value="'Y'">是</el-radio>
+                <el-radio :value="'N'">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="form.takeAssessment === '0'">
+          <el-col :span="24" v-if="form.takeAssessment === 'N'">
             <el-row :gutter="16">
               <el-col :span="12">
                 <el-form-item label="免考核开始时间" prop="exemptTakeAssessmentStartTime">