Merge remote-tracking branch 'origin/dev' into dev

zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration/indexList.vue

@@ -503,6 +503,7 @@ const closeDetailDialog = () => {
           {{ noScanReasonOptions.find(d => d.dictValue === row.checkCss)?.dictLabel || '' }}
         </template>
       </el-table-column>
+      <el-table-column label="其他原因描述" prop="otherReasons" align="center" min-width="150" show-overflow-tooltip />
       <el-table-column label="是否投诉" width="90" align="center">
         <template #default="{ row }">
           <el-tag v-if="row.isComplaint === 1" type="danger" size="small">是</el-tag>
@@ -546,6 +547,7 @@ const closeDetailDialog = () => {
         <el-descriptions-item label="任务来源">{{ checkCategoryOptions.find(d => d.dictValue === detailRow.checkCategory)?.dictLabel || '-' }}</el-descriptions-item>
         <el-descriptions-item label="是否扫码">{{ detailRow.checkCss ? '否' : '是' }}</el-descriptions-item>
         <el-descriptions-item label="未扫码原因">{{ noScanReasonOptions.find(d => d.dictValue === detailRow.checkCss)?.dictLabel || '-' }}</el-descriptions-item>
+        <el-descriptions-item label="其他原因描述">{{ detailRow.otherReasons || '-' }}</el-descriptions-item>
         <el-descriptions-item label="是否投诉" :span="2">{{ detailRow.isComplaint === 1 ? '是' : '否' }}</el-descriptions-item>
       </el-descriptions>
     </el-dialog>