From 7733d6094ee4fbf0618a86a0b5bf0e987c8c5337 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Wed, 17 Dec 2025 09:33:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=A0=B8=E6=9F=A5?=
 =?UTF-8?q?=E7=BB=93=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/negative/description.vue       |  2 +-
 .../negative/verify-description.vue           |  4 +-
 src/components/negative/verify.vue            | 93 +++++++------------
 src/views/system/Police.vue                   | 13 ++-
 src/views/work/BatchDistribute.vue            |  2 +-
 src/views/work/Query.vue                      | 15 +--
 src/views/work/Todo.vue                       |  7 +-
 7 files changed, 61 insertions(+), 75 deletions(-)

diff --git a/src/components/negative/description.vue b/src/components/negative/description.vue
index afcbde7..dcbdd2d 100644
--- a/src/components/negative/description.vue
+++ b/src/components/negative/description.vue
@@ -28,7 +28,7 @@
             </div>
             <div class="col col-6" v-if="negative.involveMoney">
                 <label>问题金额</label>
-                <span>{{ negative.involveMoney }}万元</span>
+                <span>{{ negative.involveMoney }}元</span>
             </div>
             <div class="col col-6" v-if="negative.responderName">
                 <label>投诉反映人</label>
diff --git a/src/components/negative/verify-description.vue b/src/components/negative/verify-description.vue
index 5aeb191..1008e64 100644
--- a/src/components/negative/verify-description.vue
+++ b/src/components/negative/verify-description.vue
@@ -6,8 +6,8 @@
             v-if="negative.checkStatus"
         >
             <div class="row">
-                <div class="col col-6">
-                    <label>核查情况</label>
+                <div class="col col-12">
+                    <label>核查结论</label>
                     <span>{{ negative.checkStatusName }}</span>
                 </div>
                 <div class="col col-6" v-if="negative.isRectifyName">
diff --git a/src/components/negative/verify.vue b/src/components/negative/verify.vue
index 4916896..d50f525 100644
--- a/src/components/negative/verify.vue
+++ b/src/components/negative/verify.vue
@@ -31,31 +31,43 @@
             </el-col>
             <el-col :span="12">
                 <el-form-item
-                    label="核查情况"
-                    prop="checkStatus"
+                    label="核查结论"
+                    prop="checkStatusCode"
                     :rules="{
                         required: true,
-                        message: '请选择核查情况',
+                        message: '请选择核查结论',
                         trigger: ['blur'],
                     }"
                 >
-                    <el-radio-group
-                        v-model="form.checkStatus"
-                        @change="(val) => handleChangeCheckStatus(val, item)"
-                    >
-                        <el-radio value="1">属实</el-radio>
-                        <el-radio value="2">基本属实</el-radio>
-                        <el-radio value="3">不属实</el-radio>
+                    
+                    <el-select v-model="form.checkStatusCode" @change="(val) => handleChangeCheckStatus(val, item)" clearable style="width: 280px">
+                        <el-option v-for="item in dict.checkStatus" :value="item.dictValue" :label="item.dictLabel"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+            <el-col
+                :span="12"
+            >
+                <el-form-item
+                    label="涉及对象"
+                    prop="accountabilityTarget"
+                    :rules="{
+                        required: true,
+                        message: '请选择追责对象',
+                        trigger: ['blur'],
+                    }"
+                >
+                    <el-radio-group v-model="form.accountabilityTarget">
                         <el-radio
-                            value="4"
-                            v-if="negative.problemSourcesCode === ProblemSources.XF12337"
-                            >无法办理
+                            v-for="item in dict.accountabilityTarget"
+                            :key="item.dictCode"
+                            :value="item.dictValue"
+                            >{{ item.dictLabel }}
                         </el-radio>
                     </el-radio-group>
                 </el-form-item>
             </el-col>
-
-            <el-col :span="12">
+            <el-col :span="12" v-if="problemIsTrue">
                 <el-form-item
                     label="是否整改"
                     prop="isRectifyCode"
@@ -64,7 +76,7 @@
                         message: '请选择是否整改',
                         trigger: ['blur'],
                     }"
-                    v-if="problemIsTrue && form.checkStatus !== InspectCase.UNABLE"
+                    
                 >
                     <el-radio-group
                         v-model="form.isRectifyCode"
@@ -84,38 +96,12 @@
                     </el-radio-group>
                 </el-form-item>
             </el-col>
-            <el-col
-                :span="12"
-                v-if="
-                    negative.problemSourcesCode !== ProblemSources.JWDC &&
-                    form.checkStatus !== InspectCase.UNABLE
-                "
-            >
-                <el-form-item
-                    label="涉及对象"
-                    prop="accountabilityTarget"
-                    :rules="{
-                        required: true,
-                        message: '请选择追责对象',
-                        trigger: ['blur'],
-                    }"
-                >
-                    <el-radio-group v-model="form.accountabilityTarget">
-                        <el-radio
-                            v-for="item in dict.accountabilityTarget"
-                            :key="item.dictCode"
-                            :value="item.dictValue"
-                            >{{ item.dictLabel }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-col>
             <el-col
                 :span="12"
                 v-if="
                     problemIsTrue &&
                     form.isRectifyCode === IsRectify.NOT &&
-                    form.checkStatus !== InspectCase.UNABLE
+                    (form.checkStatusCode === '1' || form.checkStatusCode === '2' || form.checkStatusCode === '3')
                 "
             >
                 <el-form-item
@@ -158,8 +144,7 @@
                 trigger: ['blur'],
             }"
             v-if="
-                (form.isRectifyCode === '0' || form.isRectifyCode === '2') &&
-                form.checkStatus !== InspectCase.UNABLE
+                (form.isRectifyCode === '0' || form.isRectifyCode === '2')
             "
         >
             <el-input
@@ -417,7 +402,7 @@
             <el-divider />
         </template>
 
-        <template v-if="form.checkStatus !== InspectCase.UNABLE">
+        <template>
             <div v-if="form.accountabilityTarget !== AccountabilityTarget.DEPARTMENT">
                 
                 <el-form-item
@@ -1575,20 +1560,16 @@ import {
     IsRectify,
     AccountabilityTarget,
     BlameType,
-    AssistCase,
     ProblemSources,
     PersonType,
     HostLevel,
     SubjectiveAspect,
 } from "@/enums/dictEnums";
 import useCatchStore from "@/stores/modules/catch";
-import { reduceMerge } from "@/utils/util";
-import feedback from "@/utils/feedback";
 import { getConfinementListAll } from "@/api/work/confinement";
 //获取数据
 const catchSotre = useCatchStore();
 const dict = catchSotre.getDicts([
-    "inspectCase",
     "isRectify",
     "personType",
     "superviseMeasures",
@@ -1601,6 +1582,7 @@ const dict = catchSotre.getDicts([
     "leadResponsibilityType",
     "resolveSituation",
     "resolveStatus",
+    "checkStatus"
 ]);
 
 const negative = inject("negative");
@@ -1644,7 +1626,7 @@ const fileConfinement = async (query, type = "All") => {
 };
 
 const problemIsTrue = computed(() => {
-    return form.value.checkStatus !== InspectCase.FALSE;
+    return form.value.checkStatusCode === '1' || form.value.checkStatusCode === '2' || form.value.checkStatusCode === '3';
 });
 
 getFormData();
@@ -1657,7 +1639,7 @@ async function getFormData() {
     form.value = {
         involveDepartId: negative.value.involveDepartId,
         caseNumber: negative.value.caseNumber,
-        checkStatus: negative.value.checkStatus,
+        checkStatusCode: negative.value.checkStatusCode,
         checkStatusName: negative.value.checkStatusName,
         isRectifyName: negative.value.isRectifyName,
         isRectifyCode: negative.value.isRectifyCode,
@@ -1797,17 +1779,12 @@ watch(
 );
 
 function handleChangeCheckStatus(val, item) {
-    if (val === "4") {
-        form.value.checkStatusName = "无法办理";
-        return;
-    }
-    form.value.checkStatusName = dict.inspectCase.filter(
+    form.value.checkStatusName = dict.checkStatus.filter(
         (item) => item.dictValue === val
     )[0].dictLabel;
 }
 
 function handleChangePolice(police, item) {
-    console.log(police);
     item.blameName = police.name;
     item.blameIdCode = police.idCode;
     item.ivPersonTypeCode = police.personType;
diff --git a/src/views/system/Police.vue b/src/views/system/Police.vue
index e9ed069..d0ec57a 100644
--- a/src/views/system/Police.vue
+++ b/src/views/system/Police.vue
@@ -193,7 +193,7 @@
                         <el-table-column
                             label="警号"
                             prop="empNo"
-                            width="100"
+                            width="90"
                             show-overflow-tooltip
                         />
                         <el-table-column label="所属机构" show-overflow-tooltip>
@@ -229,13 +229,13 @@
                                     <span v-if="row.level === 0"
                                         >局领导{{ row.position }}</span
                                     >
-                                    <span v-if="row.level === 2"
+                                    <span v-else-if="row.level === 2 || (row.level === 3 && row.departShortName.indexOf('领导') > -1)"
                                         >二级机构{{ row.position }}</span
                                     >
-                                    <span v-if="row.level === 3"
+                                    <span v-else-if="row.level === 3"
                                         >三机机构{{ row.position }}</span
                                     >
-                                    <span v-if="row.level === 4"
+                                    <span v-else-if="row.level === 4"
                                         >四机机构{{ row.position }}</span
                                     >
                                 </span>
@@ -246,6 +246,11 @@
                             prop="idCode"
                             width="200"
                         />
+                        <el-table-column
+                            label="最后更新时间"
+                            prop="updatedAt"
+                            width="180"
+                        />
                         <el-table-column label="角色" show-overflow-tooltip>
                             <template #default="{ row }">
                                 <div class="flex gap" v-if="row.role">
diff --git a/src/views/work/BatchDistribute.vue b/src/views/work/BatchDistribute.vue
index 42df10e..b2fa433 100644
--- a/src/views/work/BatchDistribute.vue
+++ b/src/views/work/BatchDistribute.vue
@@ -537,7 +537,7 @@
                             width="110"
                         />
                         <el-table-column
-                            label="问题金额（万元）"
+                            label="问题金额（元）"
                             prop="involveMoney"
                             width="90"
                         />
diff --git a/src/views/work/Query.vue b/src/views/work/Query.vue
index 273023b..7ff032f 100644
--- a/src/views/work/Query.vue
+++ b/src/views/work/Query.vue
@@ -108,14 +108,15 @@
                             />
                         </div>
                         <el-select
-                            style="width: 120px"
-                            placeholder="是否属实"
+                            style="width: 160px"
+                            placeholder="核查结论"
                             clearable
-                            v-model="query.checkStatus"
+                            v-model="query.checkStatusCode"
                             multiple
+                            collapse-tags
                         >
                             <el-option
-                                v-for="item in dict.inspectCase"
+                                v-for="item in dict.checkStatus"
                                 :key="item.id"
                                 :label="item.dictLabel"
                                 :value="item.dictValue"
@@ -183,11 +184,12 @@
                             />
                         </el-select>
                         <el-select
-                            style="width: 120px"
+                            style="width: 160px"
                             placeholder="办理状态"
                             clearable
                             v-model="query.processingStatus"
                             multiple
+                            collapse-tags
                         >
                             <el-option
                                 v-for="item in dict.processingStatus"
@@ -378,7 +380,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column
-                        label="是否属实"
+                        label="核查结论"
                         prop="checkStatusName"
                         width="100"
                         align="center"
@@ -862,6 +864,7 @@ const catchStore = useCatchStore();
 const dict = catchStore.getDicts([
     "businessType",
     "inspectCase",
+    "checkStatus",
     "isRectify",
     "suspectProblem",
     "policeType",
diff --git a/src/views/work/Todo.vue b/src/views/work/Todo.vue
index 0aa1dd2..4525a5e 100644
--- a/src/views/work/Todo.vue
+++ b/src/views/work/Todo.vue
@@ -340,9 +340,10 @@
                     prop="discoveryTime"
                     width="150"
                 />
-                <el-table-column label="问题来源" prop="problemSources" />
-                <el-table-column label="业务类别" prop="businessTypeName" />
-                <el-table-column label="涉嫌问题">
+                <el-table-column label="问题来源" prop="problemSources" width="110"
+                        show-overflow-tooltip />
+                <el-table-column label="业务类别" prop="businessTypeName"  width="110" />
+                <el-table-column label="涉嫌问题" show-overflow-tooltip>
                     <template #default="{ row }">
                         <span>{{
                             getInvolveProblem(