feat(检查模块): 添加BRIGADE_LEVEL级别支持并优化不合格人员显示

- 在检查记录、整改记录和任务页面中添加BRIGADE_LEVEL级别的支持
- 优化getUserName方法，当用户选项为空时显示原始用户名
- 移除checkTask页面中科内自查的单选框
- 统一格式化代码，删除多余空格和换行

src/views/check/checkCorrection/components/Deatils.vue

@@ -1,12 +1,14 @@
 <template>
   <el-dialog :title="title" v-model="open" width="1100px" append-to-body>
     <div class="contentWrap" v-loading="loading">
-      <el-form ref="checkFormRef" :model="form" :rules="rules" scroll-to-error :scroll-into-view-options="{block: 'center'}" label-width="9em">
-        <el-card header="基本信息" style="margin-bottom: 10px;"  v-card-expand="{ isExpanded: true }">
+      <el-form ref="checkFormRef" :model="form" :rules="rules" scroll-to-error
+        :scroll-into-view-options="{ block: 'center' }" label-width="9em">
+        <el-card header="基本信息" style="margin-bottom: 10px;" v-card-expand="{ isExpanded: true }">
           <el-row :gutter="16">
             <el-col :span="12">
               <el-form-item label="任务编号" prop="taskCode">
-                <el-input :disabled="disabled" v-model="form.taskCode" :placeholder="disabled ? '-' : '请输入任务编号'" maxlength="30" />
+                <el-input :disabled="disabled" v-model="form.taskCode" :placeholder="disabled ? '-' : '请输入任务编号'"
+                  maxlength="30" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -16,29 +18,20 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="被检查人/科/班组" prop="checkedDepartmentName">
-                <el-input
-                  v-if=" form.checkedLevel === 'DEPARTMENT_LEVEL' "
-                  :disabled="disabled"
-                  :value="form.checkedDepartmentName"
-                  :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
-                <el-input
-                  v-else-if=" form.checkedLevel === 'TEAM_LEVEL' "
-                  :disabled="disabled"
-                  :value="form.checkedTeamName"
-                  :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
-                <el-input
-                  v-else-if=" form.checkedLevel === 'PERSONNEL_LEVEL' "
-                  :disabled="disabled"
-                  :value="form.checkedPersonnelName"
-                  :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
+                <el-input v-if="form.checkedLevel === 'DEPARTMENT_LEVEL'" :disabled="disabled"
+                  :value="form.checkedDepartmentName" :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
+                <el-input v-else-if="form.checkedLevel === 'TEAM_LEVEL'" :disabled="disabled"
+                  :value="form.checkedTeamName" :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
+                <el-input v-else-if="form.checkedLevel === 'PERSONNEL_LEVEL'" :disabled="disabled"
+                  :value="form.checkedPersonnelName" :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
+                <el-input v-else-if="form.checkedLevel === 'BRIGADE_LEVEL'" :disabled="disabled"
+                  :value="form.checkedBrigadeName" :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
                 <el-input :disabled="disabled" v-else />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="检查地点" prop="nickName">
-                <el-input
-                  :disabled="disabled"
-                  :value="viewText( form.terminlName, form.regionalName, form.channelName )"
+                <el-input :disabled="disabled" :value="viewText(form.terminlName, form.regionalName, form.channelName)"
                   :placeholder="disabled ? '-' : '请输入检查地点'" />
               </el-form-item>
             </el-col>
@@ -53,27 +46,20 @@
         <el-card header="待整改任务" style="margin-bottom: 10px;" v-card-expand="{ isExpanded: true }">
           <div>
             <el-row :gutter="16">
-              <el-col :span="24" v-for=" item of groupHandler( form.checkProjectItemList ) " :key="item.id"
+              <el-col :span="24" v-for="item of groupHandler(form.checkProjectItemList)" :key="item.id"
                 style="margin-bottom: 15px;">
                 <div class="title">{{ item.title }}</div>
-                <div v-for=" attr in item.list " :key="attr.index" style="padding: 0 30px; box-sizing: border-box;">
+                <div v-for="attr in item.list" :key="attr.index" style="padding: 0 30px; box-sizing: border-box;">
                   <el-form-item :label="attr.projectName" label-width="auto"
                     :prop="`checkProjectItemList.${attr.index}.scoreLevel`">
-                    <el-switch
-                      :disabled="disabled"
-                      v-model="attr.scoreLevel"
-                      active-value="QUALIFIED"
-                      inactive-value="UNQUALIFIED"
-                      inline-prompt
-                      active-text="符合"
-                      inactive-text="不符合"
+                    <el-switch :disabled="disabled" v-model="attr.scoreLevel" active-value="QUALIFIED"
+                      inactive-value="UNQUALIFIED" inline-prompt active-text="符合" inactive-text="不符合"
                       style="--el-switch-on-color: rgb(98, 111, 240); --el-switch-off-color: #ff4949" />
                   </el-form-item>
-                  <div v-if=" attr.scoreLevel === 'UNQUALIFIED' " style="padding: 0 30px; box-sizing: border-box;">
-                    <el-form-item v-if="attr.checkUserList && attr.checkUserList.length" label="不合格人员" label-width="6em" prop="checkedPersonnelName">
-                      <el-input
-                        :disabled="disabled"
-                        :value="getUserName( attr.checkUserList )" />
+                  <div v-if="attr.scoreLevel === 'UNQUALIFIED'" style="padding: 0 30px; box-sizing: border-box;">
+                    <el-form-item v-if="attr.checkUserList && attr.checkUserList.length" label="不合格人员" label-width="6em"
+                      prop="checkedPersonnelName">
+                      <el-input :disabled="disabled" :value="getUserName(attr.checkUserList)" />
                     </el-form-item>
                     <el-form-item v-if="attr.problemDescription" label="问题描述" label-width="6em"
                       :prop="`checkProjectItemList.${attr.index}.problemDescription`">
@@ -82,52 +68,57 @@
                   </div>
                 </div>
               </el-col>
-              <el-col :span="24" v-if=" form.checkRecordBaseAttachmentList && form.checkRecordBaseAttachmentList.length ">
+              <el-col :span="24" v-if="form.checkRecordBaseAttachmentList && form.checkRecordBaseAttachmentList.length">
                 <div class="title">不合格照片</div>
                 <div class="imgList">
-                  <ImageUpload :modelValue="transformImglistData(form.checkRecordBaseAttachmentList)" :disabled="disabled"  />
+                  <ImageUpload :modelValue="transformImglistData(form.checkRecordBaseAttachmentList)"
+                    :disabled="disabled" />
                 </div>
               </el-col>
             </el-row>
           </div>
         </el-card>
 
-        <el-card header="整改要求" style="margin-bottom: 10px;"  v-card-expand="{ isExpanded: true }">
+        <el-card header="整改要求" style="margin-bottom: 10px;" v-card-expand="{ isExpanded: true }">
           <el-row :gutter="16">
             <el-col :span="12">
               <el-form-item label="负责人" prop="responsibleUserName">
-                <el-input v-model="form.responsibleUserName" :disabled="disabled" :placeholder="disabled ? '-' : '请输入负责人'" />
+                <el-input v-model="form.responsibleUserName" :disabled="disabled"
+                  :placeholder="disabled ? '-' : '请输入负责人'" />
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="整改期限" prop="rectificationDeadline">
-                <el-input v-model="form.rectificationDeadline" :disabled="disabled" :placeholder="disabled ? '-' : '请输入整改期限'" />
+                <el-input v-model="form.rectificationDeadline" :disabled="disabled"
+                  :placeholder="disabled ? '-' : '请输入整改期限'" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="整改要求" prop="rectificationSuggestions">
-                <el-input type="textarea" v-model="form.rectificationSuggestions" :disabled="disabled" :placeholder="disabled ? '-' : '请输入整改要求'" />
+                <el-input type="textarea" v-model="form.rectificationSuggestions" :disabled="disabled"
+                  :placeholder="disabled ? '-' : '请输入整改要求'" />
               </el-form-item>
             </el-col>
           </el-row>
         </el-card>
-        <el-card header="整改详情" style="margin-bottom: 10px;"  v-card-expand="{ isExpanded: true }">
+        <el-card header="整改详情" style="margin-bottom: 10px;" v-card-expand="{ isExpanded: true }">
           <el-row :gutter="16">
             <el-col :span="24">
               <el-form-item label="整改详情" label-width="6em" prop="rectificationDetails">
-                <el-input type="textarea" v-model="form.rectificationDetails" :disabled="disabled" :placeholder="'请输入整改要求'" />
+                <el-input type="textarea" v-model="form.rectificationDetails" :disabled="disabled"
+                  :placeholder="'请输入整改要求'" />
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="baseAttachmentList.length">
               <div class="title">整改图片</div>
               <div class="imgList">
-                <ImageUpload v-model="baseAttachmentList" :disabled="disabled"  />
+                <ImageUpload v-model="baseAttachmentList" :disabled="disabled" />
               </div>
             </el-col>
           </el-row>
         </el-card>
-        <el-card header="审批历史" style="margin-bottom: 10px;"  v-card-expand="{ isExpanded: true }">
+        <el-card header="审批历史" style="margin-bottom: 10px;" v-card-expand="{ isExpanded: true }">
           <el-table :data="historyInstanceList">
             <el-table-column label="审批人" align="center" prop="operatorName" width="180" />
             <el-table-column label="审批时间" align="center" prop="operationTime" />
@@ -146,7 +137,7 @@
 
 <script setup>
 import { watch, ref, onMounted, reactive, onUnmounted, computed } from 'vue'
-import { getCheckCorrection, historyInstance} from "@/api/check/checkCorrection"
+import { getCheckCorrection, historyInstance } from "@/api/check/checkCorrection"
 import { listUser } from "@/api/system/user"
 const props = defineProps({
   id: {
@@ -178,7 +169,7 @@ const getDetailInfo = () => {
     } else {
       return historyInstanceList.value = []
     }
-    
+
   }).finally(() => {
     loading.value = false
   })
@@ -210,10 +201,10 @@ const transformImglistData = (imgList) => {
 }
 
 const baseAttachmentList = computed({
-  get () {
+  get() {
     return transformImglistData(form.value.baseAttachmentList)
   },
-  set (newValue) {
+  set(newValue) {
     form.value.baseAttachmentList = newValue.map(item => {
       return {
         attachmentName: item.name,
@@ -228,13 +219,13 @@ const groupHandler = (list) => {
     return list.reduce((cur, acc, index) => {
       const findIndex = cur.findIndex(item => item.categoryCodeOne === acc.categoryCodeOne && item.categoryCodeTwo === acc.categoryCodeTwo)
       if (findIndex >= 0) {
-        cur[ findIndex ].list.push({ index, ...acc })
+        cur[findIndex].list.push({ index, ...acc })
       } else {
         cur.push({
           title: `${acc.categoryNameOne}/${acc.categoryNameTwo}`,
           categoryCodeOne: acc.categoryCodeOne,
           categoryCodeTwo: acc.categoryCodeTwo,
-          list: [ { index, ...acc } ]
+          list: [{ index, ...acc }]
         })
       }
       return cur
@@ -252,12 +243,20 @@ const getUserInfo = () => {
 }
 
 const getUserName = (list) => {
+  let res = ''
   if (Array.isArray(list) && list.length) {
-    return list.map(attr => {
+    res = list.map(attr => {
       return (listUserOption.value.find(item => item.value === attr.userId) || {}).label
     }).filter(Boolean).join('、')
   }
-  return '-'
+  
+  if (res) {
+    return res
+  } else {
+    res = list.map((item) => item.userName).join('、')
+    return res || '-'
+  }
+
 }
 
 const cancel = () => {

src/views/check/checkCorrection/index.vue

@@ -47,6 +47,7 @@
           <div v-if="scope.row.checkedLevel === 'DEPARTMENT_LEVEL'">{{ scope.row.checkedDepartmentName }}</div>
           <div v-if="scope.row.checkedLevel === 'TEAM_LEVEL'">{{ scope.row.checkedTeamName }}</div>
           <div v-if="scope.row.checkedLevel === 'PERSONNEL_LEVEL'">{{ scope.row.checkedPersonnelName }}</div>
+          <div v-if="scope.row.checkedLevel === 'BRIGADE_LEVEL'">{{ scope.row.checkedBrigadeName }}</div>
         </template>
       </el-table-column>
       <el-table-column label="整改状态" align="center" prop="statusDesc" width="100" />

src/views/check/checkRecord/components/Details.vue

@@ -15,25 +15,20 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="被检查人/科/班组" prop="checkedDepartmentName">
-              <el-input
-                v-if=" form.checkedLevel === 'DEPARTMENT_LEVEL' "
-                :value="form.checkedDepartmentName"
+              <el-input v-if="form.checkedLevel === 'DEPARTMENT_LEVEL'" :value="form.checkedDepartmentName"
                 :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
-              <el-input
-                v-else-if=" form.checkedLevel === 'TEAM_LEVEL' "
-                :value="form.checkedTeamName"
+              <el-input v-else-if="form.checkedLevel === 'TEAM_LEVEL'" :value="form.checkedTeamName"
                 :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
-              <el-input
-                v-else-if=" form.checkedLevel === 'PERSONNEL_LEVEL' "
-                :value="form.checkedPersonnelName"
+              <el-input v-else-if="form.checkedLevel === 'PERSONNEL_LEVEL'" :value="form.checkedPersonnelName"
+                :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
+              <el-input v-else-if="form.checkedLevel === 'BRIGADE_LEVEL'" :value="form.checkedBrigadeName"
                 :placeholder="disabled ? '-' : '请输入被检查人/科/班组'" />
               <el-input v-else />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="检查地点" prop="nickName">
-              <el-input
-                :value="viewText( form.terminlName, form.regionalName, form.channelName )"
+              <el-input :value="viewText(form.terminlName, form.regionalName, form.channelName)"
                 :placeholder="disabled ? '-' : '请输入检查地点'" />
             </el-form-item>
           </el-col>
@@ -48,26 +43,20 @@
       <el-card header="巡检项目" style="margin-bottom: 10px;">
         <div>
           <el-row :gutter="16">
-            <el-col :span="24" v-for=" item of groupHandler( form.checkProjectItemList ) " :key="item.id"
+            <el-col :span="24" v-for="item of groupHandler(form.checkProjectItemList)" :key="item.id"
               style="margin-bottom: 15px;">
               <div class="title">{{ item.title }}</div>
-              <div v-for=" attr in item.list " :key="attr.index" style="padding: 0 30px; box-sizing: border-box;">
+              <div v-for="attr in item.list" :key="attr.index" style="padding: 0 30px; box-sizing: border-box;">
                 <el-form-item :label="attr.projectName" label-width="auto"
                   :prop="`checkProjectItemList.${attr.index}.scoreLevel`">
-                  <el-switch
-                    v-model="attr.scoreLevel"
-                    active-value="QUALIFIED"
-                    inactive-value="UNQUALIFIED"
-                    inline-prompt
-                    active-text="符合"
-                    inactive-text="不符合"
+                  <el-switch v-model="attr.scoreLevel" active-value="QUALIFIED" inactive-value="UNQUALIFIED"
+                    inline-prompt active-text="符合" inactive-text="不符合"
                     style="--el-switch-on-color: rgb(98, 111, 240); --el-switch-off-color: #ff4949" />
                 </el-form-item>
-                <div v-if=" attr.scoreLevel === 'UNQUALIFIED' " style="padding: 0 30px; box-sizing: border-box;">
-                  <el-form-item v-if=" attr.checkUserList && attr.checkUserList.length " label="不合格人员" label-width="6em" prop="checkedPersonnelName">
-                    <el-input
-                      :value="getUserName( attr.checkUserList )" 
-                    />
+                <div v-if="attr.scoreLevel === 'UNQUALIFIED'" style="padding: 0 30px; box-sizing: border-box;">
+                  <el-form-item v-if="attr.checkUserList && attr.checkUserList.length" label="不合格人员" label-width="6em"
+                    prop="checkedPersonnelName">
+                    <el-input :value="getUserName(attr.checkUserList)" />
                   </el-form-item>
                   <el-form-item v-if="attr.problemDescription" label="问题描述" label-width="6em"
                     :prop="`checkProjectItemList.${attr.index}.problemDescription`">
@@ -76,10 +65,10 @@
                 </div>
               </div>
             </el-col>
-            <el-col :span="24" v-if=" form.baseAttachmentList && form.baseAttachmentList.length ">
+            <el-col :span="24" v-if="form.baseAttachmentList && form.baseAttachmentList.length">
               <div class="title">不合格照片</div>
               <div class="imgList">
-                <ImageUpload :modelValue="transformImglistData( form.baseAttachmentList )" disabled />
+                <ImageUpload :modelValue="transformImglistData(form.baseAttachmentList)" disabled />
               </div>
             </el-col>
           </el-row>
@@ -138,12 +127,20 @@ const getUserInfo = () => {
 }
 
 const getUserName = (list) => {
+  let res = ''
   if (Array.isArray(list) && list.length) {
-    return list.map(attr => {
+    res = list.map(attr => {
       return (listUserOption.value.find(item => item.value === attr.userId) || {}).label
     }).filter(Boolean).join('、')
   }
-  return '-'
+
+  if (res) {
+    return res
+  } else {
+    res = list.map((item) => item.userName).join('、')
+    return res || '-'
+  }
+
 }
 
 const transformImglistData = (imgList) => {
@@ -168,13 +165,13 @@ const groupHandler = (list) => {
     return list.reduce((cur, acc, index) => {
       const findIndex = cur.findIndex(item => item.categoryCodeOne === acc.categoryCodeOne && item.categoryCodeTwo === acc.categoryCodeTwo)
       if (findIndex >= 0) {
-        cur[ findIndex ].list.push({ index, ...acc })
+        cur[findIndex].list.push({ index, ...acc })
       } else {
         cur.push({
           title: `${acc.categoryNameOne}/${acc.categoryNameTwo}`,
           categoryCodeOne: acc.categoryCodeOne,
           categoryCodeTwo: acc.categoryCodeTwo,
-          list: [ { index, ...acc } ]
+          list: [{ index, ...acc }]
         })
       }
       return cur

src/views/check/checkRecord/index.vue

@@ -117,6 +117,7 @@
           <div v-if="scope.row.checkedLevel === 'DEPARTMENT_LEVEL'">{{ scope.row.checkedDepartmentName }}</div>
           <div v-if="scope.row.checkedLevel === 'TEAM_LEVEL'">{{ scope.row.checkedTeamName }}</div>
           <div v-if="scope.row.checkedLevel === 'PERSONNEL_LEVEL'">{{ scope.row.checkedPersonnelName }}</div>
+          <div v-if="scope.row.checkedLevel === 'BRIGADE_LEVEL'">{{ scope.row.checkedBrigadeName }}</div>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">

src/views/check/checkTask/index.vue

@@ -141,14 +141,14 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="是否科内自查" prop="isSelfCheck">
               <el-radio-group v-model="form.isSelfCheck" :disabled="formDisabled">
                 <el-radio :value="1">是</el-radio>
                 <el-radio :value="0">否</el-radio>
               </el-radio-group>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12" v-if="form.isSelfCheck === 1">
             <el-form-item label="自查科室" prop="selfCheckDeptId" :required="true">
               <el-select v-model="form.selfCheckDeptId" placeholder="请选择自查科室" style="width: 100%"