From 2029458b019e882c6de10c84d2494b11a126b990 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Tue, 3 Dec 2024 18:09:41 +0800
Subject: [PATCH] =?UTF-8?q?fit:=20=E5=87=BB=E6=9F=A5=E7=9C=8B=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E6=A8=A1=E5=9E=8B=E6=97=B6=EF=BC=8C=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9B=B8=E5=85=B3=E7=9A=84=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9C=E6=9F=A5=E7=9C=8B=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E2=80=9D=E5=92=8C=E2=80=9C=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=E9=97=AE=E9=A2=98=E2=80=9D=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=87=B3=E7=9B=B8=E5=85=B3=E5=88=97=E8=A1=A8=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AF=B9=E5=BA=94=E9=A2=84=E8=AD=A6=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E4=BA=A7=E7=94=9F=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=9B?=
 =?UTF-8?q?=20fit:=20=E8=B0=83=E6=95=B4=E6=89=80=E6=9C=89=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?Lable=E5=92=8C=E5=86=85=E5=AE=B9=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8C=BA=E5=88=AB=E5=BC=80=EF=BC=9B=20fit:=20=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E2=80=9C=E4=BF=AE=E6=94=B9=E6=A0=B8=E6=9F=A5=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E2=80=9D=E5=90=8E=E6=8C=89=E9=92=AE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E4=BF=9D=E5=AD=98=E6=A0=B8=E6=9F=A5=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E7=82=B9=E5=87=BB=E4=BF=AE=E6=94=B9=E6=A0=B8?=
 =?UTF-8?q?=E6=9F=A5=E7=BB=93=E6=9E=9C=E5=90=8E=E7=82=B9=E5=87=BB=E2=80=9C?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E9=80=9A=E8=BF=87=E2=80=9D=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E2=80=9C=E6=98=AF=E5=90=A6=E4=BF=9D=E5=AD=98=E6=AD=A4=E6=AC=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E7=BB=93=E6=9E=9C=E5=86=85=E5=AE=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E2=80=9D=EF=BC=8C=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=86=85=E5=AE=B9=E4=BF=9D=E5=AD=98=E5=B9=B6?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=E3=80=82=20fit:=20?=
 =?UTF-8?q?=E8=AD=A6=E5=91=98=E4=B8=AD=E5=BF=83=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=B6=E8=A6=81=E5=A1=AB=E5=86=99=E5=8E=9F=E5=9B=A0=E3=80=82?=
 =?UTF-8?q?=E5=B9=B6=E5=B0=86=E5=8A=9F=E8=83=BD=E5=BC=80=E6=94=BE=E7=BB=99?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E3=80=81=E4=B8=89=E7=BA=A7=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=EF=BC=9B=20fit:=20=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=B6=89=E5=8F=8A=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=20fit:=20=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=BE=85=E5=8A=9E=EF=BC=88=E6=88=91=E7=9A=84=E5=B7=B2=E5=8A=9E?=
 =?UTF-8?q?=EF=BC=89=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=87=B3=E5=92=8C=E7=BB=BC?=
 =?UTF-8?q?=E5=90=88=E6=9F=A5=E8=AF=A2=E4=B8=80=E6=A0=B7=E7=9A=84=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/police.ts                      |   5 +-
 .../negative/confirmation-completion.vue      |   2 +-
 src/components/negative/dialog.vue            |   6 +-
 src/style/public.scss                         |   2 +-
 src/views/sensitivePerception/Model.vue       | 116 ++++--
 src/views/system/Police.vue                   |  13 +-
 src/views/work/Done.vue                       | 270 +++++++++++---
 src/views/work/Query.vue                      | 248 +++++++------
 src/views/work/Todo.vue                       | 332 +++++++++++++-----
 9 files changed, 708 insertions(+), 286 deletions(-)

diff --git a/src/api/system/police.ts b/src/api/system/police.ts
index bdbd0e4..1d19872 100644
--- a/src/api/system/police.ts
+++ b/src/api/system/police.ts
@@ -21,9 +21,10 @@ export function updatePolice(body) {
     });
 }
 
-export function delPolice(id) {
+export function delPolice(id, body) {
     return request.del({
-        url: `/police/${id}`
+        url: `/police/${id}`,
+        body
     });
 }
 
diff --git a/src/components/negative/confirmation-completion.vue b/src/components/negative/confirmation-completion.vue
index 0c61e7a..9fe76de 100644
--- a/src/components/negative/confirmation-completion.vue
+++ b/src/components/negative/confirmation-completion.vue
@@ -203,7 +203,7 @@
             </el-form>
         </div>
         <footer class="flex end mt-40">
-            <el-button size="large">取消</el-button>
+            <el-button size="large" @click="show = false">取消</el-button>
             <el-button type="primary" size="large" @click="submit"
                 >认定办结</el-button
             >
diff --git a/src/components/negative/dialog.vue b/src/components/negative/dialog.vue
index 6b12973..1c1bd71 100644
--- a/src/components/negative/dialog.vue
+++ b/src/components/negative/dialog.vue
@@ -175,7 +175,7 @@
                                 item.actionKey ===
                                     FlowActionEnum.THREE_SIGN_RETURN))
                     "
-                    >{{ item.buttonLabel }}</el-button
+                    >{{ item.actionKey === 'update_verify' && verifyEditFlag ? '保存核查内容' : item.buttonLabel }}</el-button
                 >
             </div>
         </footer>
@@ -317,6 +317,10 @@ async function handleExecute(action, data) {
         verifyEditFlag.value = true;
         return
     }
+    if (action.actionKey !== 'update_verify' && verifyEditFlag.value) {
+        feedback.confirm('请先“保存核查内容”再操作')
+        return
+    }
     if (action.validateForm) {
         if (action.actionKey !== FlowActionEnum.SAVE) {
             try {
diff --git a/src/style/public.scss b/src/style/public.scss
index f3b70f6..6d61e19 100644
--- a/src/style/public.scss
+++ b/src/style/public.scss
@@ -374,7 +374,7 @@ svg + span {
   label {
     width: var(--label-width);
     text-align: right;
-    color: #666;
+    color: #999;
   }
 
   > span {
diff --git a/src/views/sensitivePerception/Model.vue b/src/views/sensitivePerception/Model.vue
index 7f84d07..4193fbd 100644
--- a/src/views/sensitivePerception/Model.vue
+++ b/src/views/sensitivePerception/Model.vue
@@ -353,7 +353,11 @@
                                 DistributionCycle.WEEKLY
                             "
                         >
-                            <el-select style="width: 120px" clearable v-model="form.distributionCycleDayOfWeek">
+                            <el-select
+                                style="width: 120px"
+                                clearable
+                                v-model="form.distributionCycleDayOfWeek"
+                            >
                                 <el-option
                                     v-for="(item, index) in WEEKS"
                                     :key="index"
@@ -686,30 +690,80 @@
             <h4 style="margin: 10px 0" class="text-primary">预警记录</h4>
             <div style="min-height: 300px">
                 <div class="table-container">
-                    <el-table :data="tableData" size="small">
-                        <el-table-column label="同步时间" prop="createTime" />
-                        <el-table-column
-                            label="预警条数"
-                            prop="size"
-                            align="center"
-                        />
-                        <el-table-column label="分发状态" align="center">
-                            <template #default="{ row }">
-                                <el-tag
-                                    type="success"
-                                    v-if="row.state === 'success'"
-                                    >成功</el-tag
-                                >
-                                <el-tooltip
-                                    effect="dark"
-                                    :content="row.errMsg"
-                                    placement="top-start"
-                                    v-else
-                                >
-                                    <el-tag type="danger">失败</el-tag>
-                                </el-tooltip>
-                            </template>
-                        </el-table-column>
+                    <el-table
+                        :data="tableData"
+                        size="small"
+                    >
+                        <template v-if="activeModel.classId !== GRJDBLFX_CLASS_ID">
+                            <el-table-column
+                                label="同步时间"
+                                prop="createTime"
+                            />
+                            <el-table-column
+                                label="预警条数"
+                                prop="size"
+                                align="center"
+                            />
+                            <el-table-column label="分发状态" align="center">
+                                <template #default="{ row }">
+                                    <el-tag
+                                        type="success"
+                                        v-if="row.state === 'success'"
+                                        >成功</el-tag
+                                    >
+                                    <el-tooltip
+                                        effect="dark"
+                                        :content="row.errMsg"
+                                        placement="top-start"
+                                        v-else
+                                    >
+                                        <el-tag type="danger">失败</el-tag>
+                                    </el-tooltip>
+                                </template>
+                            </el-table-column>
+                        </template>
+                        <template v-else>
+                            <el-table-column
+                                label="开始时间"
+                                prop="startTime"
+                            />
+                            <el-table-column
+                                label="结束时间"
+                                prop="endTime"
+                            />
+                            <el-table-column
+                                label="新增条数"
+                                prop="insertSize"
+                                align="center"
+                            />
+                            <el-table-column
+                                label="更新条数"
+                                prop="updateSize"
+                                align="center"
+                            />
+                            <el-table-column label="状态" align="center">
+                                <template #default="{ row }">
+                                    <el-tag
+                                        type="success"
+                                        v-if="row.state === 1"
+                                        >成功</el-tag
+                                    >
+                                    <el-tag
+                                        type="primary"
+                                        v-if="row.state === 0"
+                                        >进行中</el-tag
+                                    >
+                                    <el-tooltip
+                                        effect="dark"
+                                        :content="row.errMsg"
+                                        placement="top-start"
+                                        v-if="row.state === -1"
+                                    >
+                                        <el-tag type="danger">失败</el-tag>
+                                    </el-tooltip>
+                                </template>
+                            </el-table-column>
+                        </template>
                     </el-table>
                 </div>
             </div>
@@ -724,12 +778,6 @@
         </footer>
     </el-dialog>
 
-    <el-dialog
-        title="线索详细信息配置"
-        v-model="detailConfigShow"
-        width="800px"
-    >
-    </el-dialog>
 </template>
 <script setup>
 import {
@@ -803,8 +851,8 @@ onMounted(() => {
         classes.value = data;
     });
     listRiskScoreRuleTree().then((data) => {
-        treeOptions.value = data
-    })
+        treeOptions.value = data;
+    });
 });
 
 function handleChangeClass(id) {
@@ -861,8 +909,8 @@ async function handleSubmit() {
         activeModel.value = await updateModel(form.value);
     }
     getList();
-    initForm();
     show.value = false;
+    initForm();
     feedback.msgSuccess("操作成功");
 }
 
diff --git a/src/views/system/Police.vue b/src/views/system/Police.vue
index b46e0d6..642b202 100644
--- a/src/views/system/Police.vue
+++ b/src/views/system/Police.vue
@@ -612,8 +612,17 @@ function getWorkYear(employmentDate) {
 }
 
 async function handleDel(row) {
-    await feedback.confirm(`确定要删除 ${row.name} ？`);
-    await delPolice(row.id);
+    const result = await feedback.prompt(`删除原因`, `确定要删除 ${row.name} ？`, {
+        inputType: 'textarea',
+        inputPlaceholder: '请输入',
+        inputErrorMessage: '请输入删除原因',
+        inputValidator: (val) => {
+            return val ? true: false;
+        }
+    })
+    await delPolice(row.id, {
+        reason: result.value
+    });
     feedback.msgSuccess("操作成功");
     getList();
 }
diff --git a/src/views/work/Done.vue b/src/views/work/Done.vue
index 9ccafe2..f81c68f 100644
--- a/src/views/work/Done.vue
+++ b/src/views/work/Done.vue
@@ -1,63 +1,253 @@
 <template>
     <div class="container">
         <header>
-            <el-form :label-width="114">
+            <el-form :label-width="120">
                 <el-row>
                     <el-col :span="6">
-                        <el-form-item label="问题发生时间">
-                            <date-time-range-picker-ext v-model="query.happenTime"/>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="问题来源">
-                            <dict-select name="problemSources" v-model="query.problemSourcesCode" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="业务类别">
-                            <dict-select name="businessType" v-model="query.businessType" />
+                        <el-form-item label="问题发现时间">
+                            <date-time-range-picker-ext
+                                v-model="query.discoveryTime"
+                            />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="涉嫌问题">
-                            <dict-select name="suspectProblem" v-model="query.involveProblem" />
+                        <el-form-item label="问题发生时间">
+                            <date-time-range-picker-ext
+                                v-model="query.happenTime"
+                            />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="问题内容">
-                            <el-input placeholder="请输入问题内容" v-model="query.thingDesc" clearable/>
+                        <el-form-item label="问题录入时间">
+                            <date-time-range-picker-ext
+                                v-model="query.crtTime"
+                            />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="涉及单位">
-                            <depart-tree-select
+                </el-row>
+                <div class="form-row flex">
+                    <label class="text-center">问题信息</label>
+                    <div class="flex wrap query-box">
+                        <el-input
+                            placeholder="问题编号 / 样本源头编号"
+                            v-model="query.originId"
+                            clearable
+                            style="width: 200px"
+                            size="small"
+                        />
+                        <el-input
+                            placeholder="事情简要描述"
+                            v-model="query.thingDesc"
+                            clearable
+                            style="width: 280px"
+                            size="small"
+                        />
+                        <el-select
+                            size="small"
+                            style="width: 146px"
+                            placeholder="业务类别"
+                            clearable
+                            v-model="query.businessTypeCode"
+                        >
+                            <el-option
+                                v-for="item in dict.businessType"
+                                :key="item.id"
+                                :label="item.dictLabel"
+                                :value="item.dictValue"
+                            />
+                        </el-select>
+                        <el-tree-select
+                            :data="dictProblemSources"
+                            :props="{ value: 'id' }"
+                            node-key="id"
+                            v-model="query.problemSourcesCode"
+                            clearable
+                            filterable
+                            size="small"
+                            style="width: 180px"
+                            placeholder="问题来源"
+                        />
+                        <el-select
+                            size="small"
+                            style="width: 146px"
+                            placeholder="专项督察"
+                            clearable
+                            v-model="query.specialSupervision"
+                        >
+                            <el-option
+                                v-for="item in dict.specialSupervision"
+                                :key="item.id"
+                                :label="item.dictLabel"
+                                :value="item.dictValue"
+                            />
+                        </el-select>
+                        <el-input
+                            placeholder="通报期数"
+                            size="small"
+                            style="width: 146px"
+                            v-model="query.reportNumber"
+                            clearable
+                        />
+                        <div style="width: 180px">
+                             <depart-tree-select
                                 v-model="query.involveDepartId"
-                                :check-strictly="false"
+                                placeholder="涉及单位"
+                                size="small"
+                                
                             />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="办理单位">
-                            <depart-tree-select
-                                v-model="query.handleThreeDepartId"
-                                :check-strictly="false"
+                        </div>
+                        
+                    </div>
+                </div>
+                <div class="form-row flex">
+                    <label class="text-center">核查情况</label>
+                    <div class="flex wrap query-box">
+                        <div style="width: 180px">
+                             <depart-tree-select
+                                v-model="query.handleDepartId"
+                                placeholder="办理单位"
+                                size="small"
                                 
                             />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="办理状态">
-                            <dict-select name="processingStatus" v-model="query.processingStatus" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+                        </div>
+                        <el-select
+                            size="small"
+                            style="width: 120px"
+                            placeholder="是否属实"
+                            clearable
+                            v-model="query.checkStatus"
+                        >
+                            <el-option
+                                v-for="item in dict.inspectCase"
+                                :key="item.id"
+                                :label="item.dictLabel"
+                                :value="item.dictValue"
+                            />
+                        </el-select>
+                        <el-select
+                            size="small"
+                            style="width: 120px"
+                            placeholder="是否整改"
+                            clearable
+                            v-model="query.isRectifyCode"
+                        >
+                            <el-option
+                                v-for="item in dict.isRectify"
+                                :key="item.id"
+                                :label="item.dictLabel"
+                                :value="item.dictValue"
+                            />
+                        </el-select>
+                        <div class="flex gap-4">
+                            <el-select
+                                v-model="query.blameKey"
+                                style="width: 120px"
+                                @change="delete query.blameValue"
+                                size="small"
+                            >
+                                <el-option value="name" label="姓名" />
+                                <el-option value="empNo" label="警号" />
+                                <el-option value="idCode" label="身份证" />
+                            </el-select>
+                            <el-input
+                                placeholder="涉及人员"
+                                v-model="query.blameValue"
+                                clearable
+                                size="small"
+                                style="width: 160px"
+                            />
+                        </div>
+                    </div>
+                </div>
+                <div class="form-row flex">
+                    <label class="text-center">其他选项</label>
+                    <div class="flex wrap query-box">
+                        <el-select
+                            size="small"
+                            style="width: 120px"
+                            placeholder="办理状态"
+                            clearable
+                            v-model="query.processingStatus"
+                            multiple
+                        >
+                            <el-option
+                                v-for="item in dict.processingStatus"
+                                :key="item.id"
+                                :label="item.dictLabel"
+                                :value="item.dictValue"
+                            />
+                        </el-select>
+                        <el-select
+                            size="small"
+                            style="width: 150px"
+                            placeholder="流程阶段"
+                            clearable
+                            v-model="query.flowKey"
+                        >
+                            <el-option
+                                v-for="item in flowNodes"
+                                :key="item.flowKey"
+                                :label="item.flowName"
+                                :value="item.flowKey"
+                            />
+                        </el-select>
+                        <el-select
+                            size="small"
+                            style="width: 120px"
+                            placeholder="是否超时"
+                            clearable
+                            v-model="query.timeoutFlag"
+                        >
+                            <el-option label="未超时" :value="false" />
+                            <el-option label="已超时" :value="true" />
+                        </el-select>
+                        <el-select
+                            size="small"
+                            style="width: 120px"
+                            placeholder="申请延期"
+                            clearable
+                            v-model="query.extensionFlag"
+                        >
+                            <el-option label="已申请" :value="true" />
+                            <el-option label="未申请" :value="false" />
+                        </el-select>
+                        <el-select
+                            size="small"
+                            style="width: 146px"
+                            placeholder="下发单位的层级"
+                            clearable
+                            v-model="query.crtDepartLevel"
+                        >
+                            <el-option label="市局下发" :value="0" />
+                            <el-option label="二级机构下发" :value="2" />
+                        </el-select>
+                        <div class="flex gap-4">
+                            <el-select
+                                v-model="query.responderKey"
+                                style="width: 120px"
+                                @change="delete query.responderValue"
+                                size="small"
+                            >
+                                <el-option value="name" label="姓名" />
+                                <el-option value="phone" label="电话" />
+                            </el-select>
+                            <el-input
+                                placeholder="投诉反映人"
+                                v-model="query.responderValue"
+                                clearable
+                                size="small"
+                                style="width: 160px"
+                            />
+                        </div>
+                    </div>
+                </div>
             </el-form>
-            <div class="mb-25 flex end">
+            <div class="flex end mt-20 mb-26">
                 <div>
                     <el-button type="primary" @click="getList">
-                        <template #icon>
-                            <icon name="el-icon-Search" />
-                        </template>
+                        <template #icon
+                            ><icon name="el-icon-Search"
+                        /></template>
                         查询</el-button
                     >
                     <el-button @click="reset">重置</el-button>
diff --git a/src/views/work/Query.vue b/src/views/work/Query.vue
index 5ab5c17..da1b97b 100644
--- a/src/views/work/Query.vue
+++ b/src/views/work/Query.vue
@@ -1,18 +1,6 @@
 <template>
     <div class="container">
         <header>
-            <div class="crumbs flex gap wrap">
-                <el-tag
-                    type="info"
-                    closable
-                    v-for="item in queryCrumbs"
-                    :key="item.key"
-                    @close="removeQueryItem(item.key)"
-                >
-                    <span>{{ item.label }}：</span>
-                    <span class="text-primary">{{ item.text }}</span>
-                </el-tag>
-            </div>
             <el-form :label-width="120">
                 <el-row>
                     <el-col :span="6">
@@ -36,65 +24,38 @@
                             />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="样本源头编号">
-                            <el-input
-                                placeholder="请输入"
-                                v-model="query.originId"
-                                clearable
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="涉及单位">
-                            <depart-tree-select
-                                v-model="query.involveDepartId"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="办理单位">
-                            <depart-tree-select
-                                v-model="query.handleDepartId"
-                            />
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="6">
-                        <el-form-item label="投诉反映人">
-                            <div class="flex gap">
-                                <el-select
-                                    v-model="query.responderKey"
-                                    style="width: 160px"
-                                    @change="delete query.responderValue"
-                                >
-                                    <el-option value="name" label="姓名" />
-                                    <el-option value="phone" label="电话" />
-                                </el-select>
-                                <el-input
-                                    placeholder="请输入"
-                                    v-model="query.responderValue"
-                                    clearable
-                                />
-                            </div>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="事情简述">
-                            <el-input
-                                placeholder="请输入"
-                                v-model="query.thingDesc"
-                                clearable
-                            />
-                        </el-form-item>
-                    </el-col>
                 </el-row>
-                
                 <div class="form-row flex">
-                    <label class="text-center">其他选项</label>
+                    <label class="text-center">问题信息</label>
                     <div class="flex wrap query-box">
+                        <el-input
+                            placeholder="问题编号 / 样本源头编号"
+                            v-model="query.originId"
+                            clearable
+                            style="width: 200px"
+                            size="small"
+                        />
+                        <el-input
+                            placeholder="事情简要描述"
+                            v-model="query.thingDesc"
+                            clearable
+                            style="width: 280px"
+                            size="small"
+                        />
+                        <el-select
+                            size="small"
+                            style="width: 146px"
+                            placeholder="业务类别"
+                            clearable
+                            v-model="query.businessTypeCode"
+                        >
+                            <el-option
+                                v-for="item in dict.businessType"
+                                :key="item.id"
+                                :label="item.dictLabel"
+                                :value="item.dictValue"
+                            />
+                        </el-select>
                         <el-tree-select
                             :data="dictProblemSources"
                             :props="{ value: 'id' }"
@@ -106,26 +67,53 @@
                             style="width: 180px"
                             placeholder="问题来源"
                         />
-
                         <el-select
                             size="small"
                             style="width: 146px"
-                            placeholder="业务类别"
+                            placeholder="专项督察"
                             clearable
-                            v-model="query.businessTypeCode"
+                            v-model="query.specialSupervision"
                         >
                             <el-option
-                                v-for="item in dict.businessType"
+                                v-for="item in dict.specialSupervision"
                                 :key="item.id"
                                 :label="item.dictLabel"
                                 :value="item.dictValue"
                             />
                         </el-select>
+                        <el-input
+                            placeholder="通报期数"
+                            size="small"
+                            style="width: 146px"
+                            v-model="query.reportNumber"
+                            clearable
+                        />
+                        <div style="width: 180px">
+                             <depart-tree-select
+                                v-model="query.involveDepartId"
+                                placeholder="涉及单位"
+                                size="small"
+                                
+                            />
+                        </div>
                         
+                    </div>
+                </div>
+                <div class="form-row flex">
+                    <label class="text-center">核查情况</label>
+                    <div class="flex wrap query-box">
+                        <div style="width: 180px">
+                             <depart-tree-select
+                                v-model="query.handleDepartId"
+                                placeholder="办理单位"
+                                size="small"
+                                
+                            />
+                        </div>
                         <el-select
                             size="small"
                             style="width: 120px"
-                            placeholder="核查情况"
+                            placeholder="是否属实"
                             clearable
                             v-model="query.checkStatus"
                         >
@@ -150,6 +138,30 @@
                                 :value="item.dictValue"
                             />
                         </el-select>
+                        <div class="flex gap-4">
+                            <el-select
+                                v-model="query.blameKey"
+                                style="width: 120px"
+                                @change="delete query.blameValue"
+                                size="small"
+                            >
+                                <el-option value="name" label="姓名" />
+                                <el-option value="empNo" label="警号" />
+                                <el-option value="idCode" label="身份证" />
+                            </el-select>
+                            <el-input
+                                placeholder="涉及人员"
+                                v-model="query.blameValue"
+                                clearable
+                                size="small"
+                                style="width: 160px"
+                            />
+                        </div>
+                    </div>
+                </div>
+                <div class="form-row flex">
+                    <label class="text-center">其他选项</label>
+                    <div class="flex wrap query-box">
                         <el-select
                             size="small"
                             style="width: 120px"
@@ -199,22 +211,6 @@
                             <el-option label="已申请" :value="true" />
                             <el-option label="未申请" :value="false" />
                         </el-select>
-                        <el-select
-                            size="small"
-                            style="width: 146px"
-                            placeholder="专项督察"
-                            clearable
-                            v-model="query.specialSupervision"
-                        >
-                            <el-option
-                                v-for="item in dict.specialSupervision"
-                                :key="item.id"
-                                :label="item.dictLabel"
-                                :value="item.dictValue"
-                            />
-                        </el-select>
-                        <el-input placeholder="通报期数" size="small" style="width: 146px" v-model="query.reportNumber" clearable />
-                        <!-- <el-input placeholder="任务ID" size="small" style="width: 146px" clearable /> -->
                         <el-select
                             size="small"
                             style="width: 146px"
@@ -222,15 +218,27 @@
                             clearable
                             v-model="query.crtDepartLevel"
                         >
-                            <el-option
-                                label="市局下发"
-                                :value="0"
-                            />
-                            <el-option
-                                label="二级机构下发"
-                                :value="2"
-                            />
+                            <el-option label="市局下发" :value="0" />
+                            <el-option label="二级机构下发" :value="2" />
                         </el-select>
+                        <div class="flex gap-4">
+                            <el-select
+                                v-model="query.responderKey"
+                                style="width: 120px"
+                                @change="delete query.responderValue"
+                                size="small"
+                            >
+                                <el-option value="name" label="姓名" />
+                                <el-option value="phone" label="电话" />
+                            </el-select>
+                            <el-input
+                                placeholder="投诉反映人"
+                                v-model="query.responderValue"
+                                clearable
+                                size="small"
+                                style="width: 160px"
+                            />
+                        </div>
                     </div>
                 </div>
             </el-form>
@@ -251,7 +259,11 @@
         </header>
         <main>
             <div class="table-container" v-loading="loading">
-                <el-table :data="list" @sort-change="handleTableSort" ref="tableRef">
+                <el-table
+                    :data="list"
+                    @sort-change="handleTableSort"
+                    ref="tableRef"
+                >
                     <el-table-column type="expand">
                         <template #default="{ row }">
                             <div class="row mt-10">
@@ -342,8 +354,7 @@
                         prop="thingDesc"
                         show-overflow-tooltip
                     />
-                    
-                    
+
                     <el-table-column label="办理单位" show-overflow-tooltip>
                         <template #default="{ row }">
                             <span
@@ -521,8 +532,13 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-row >
-                    <el-col :span="12" v-if="formData.problemSourcesCode === ProblemSources.ZXDC">
+                <el-row>
+                    <el-col
+                        :span="12"
+                        v-if="
+                            formData.problemSourcesCode === ProblemSources.ZXDC
+                        "
+                    >
                         <el-form-item
                             label="专项督察"
                             prop="specialSupervision"
@@ -545,7 +561,13 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12" v-if="form.problemSourcesCode === ProblemSources.ZXDC || form.problemSourcesCode === ProblemSources.XCDC">
+                    <el-col
+                        :span="12"
+                        v-if="
+                            form.problemSourcesCode === ProblemSources.ZXDC ||
+                            form.problemSourcesCode === ProblemSources.XCDC
+                        "
+                    >
                         <el-form-item
                             label="通报期数"
                             prop="reportNumber"
@@ -783,23 +805,23 @@ function getList() {
 
 function handleTableSort(orderObj) {
     if (orderObj.order) {
-        query.value.order = orderObj.order
-        query.value.orderProp = orderObj.prop
+        query.value.order = orderObj.order;
+        query.value.orderProp = orderObj.prop;
     } else {
-        query.value.order = ''
-        query.value.orderProp = ''
+        query.value.order = "";
+        query.value.orderProp = "";
     }
-    getList()
+    getList();
 }
 
-const tableRef = ref()
+const tableRef = ref();
 function reset() {
     query.value = {
         current: 1,
         size: 10,
         responderKey: "name",
     };
-    tableRef.value.clearSort()
+    tableRef.value.clearSort();
     getList();
     // 重置路由
     router.push("/query");
@@ -829,9 +851,9 @@ function updateQuery() {
         query.value.crtTime = [];
     }
     if (route.query.extensionFlag === "true") {
-        query.value.extensionFlag = true
+        query.value.extensionFlag = true;
     } else {
-        query.value.extensionFlag = '';
+        query.value.extensionFlag = "";
     }
 }
 
@@ -907,6 +929,4 @@ function handleSelectInvolveProblem(vals) {
 }
 </script>
 <style lang="scss" scoped>
-
-
 </style>
\ No newline at end of file
diff --git a/src/views/work/Todo.vue b/src/views/work/Todo.vue
index c90ebcd..3a26d49 100644
--- a/src/views/work/Todo.vue
+++ b/src/views/work/Todo.vue
@@ -1,96 +1,116 @@
 <template>
     <div class="container">
         <header>
-            <el-form :label-width="114">
+            <el-form :label-width="120">
                 <el-row>
                     <el-col :span="6">
-                        <el-form-item label="问题发生时间">
+                        <el-form-item label="问题发现时间">
                             <date-time-range-picker-ext
-                                v-model="query.happenTime"
+                                v-model="query.discoveryTime"
                             />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="问题来源">
-                            <el-tree-select
-                                :data="dictProblemSources"
-                                :props="{ value: 'id' }"
-                                node-key="id"
-                                v-model="query.problemSourcesCode"
-                                clearable
-                                filterable
+                        <el-form-item label="问题发生时间">
+                            <date-time-range-picker-ext
+                                v-model="query.happenTime"
                             />
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                        <el-form-item label="业务类别">
-                            <el-select
-                                v-model="query.businessTypeCode"
-                                clearable
-                            >
-                                <el-option
-                                    v-for="item in dict.businessType"
-                                    :key="item.id"
-                                    :label="item.dictLabel"
-                                    :value="item.dictValue"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="涉嫌问题">
-                            <el-select v-model="query.involveProblem" clearable>
-                                <el-option
-                                    v-for="item in dict.suspectProblem"
-                                    :key="item.id"
-                                    :label="item.dictLabel"
-                                    :value="item.dictLabel"
-                                />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="问题内容">
-                            <el-input
-                                placeholder="请输入问题内容"
-                                v-model="query.thingDesc"
-                                clearable
+                        <el-form-item label="问题录入时间">
+                            <date-time-range-picker-ext
+                                v-model="query.crtTime"
                             />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="涉及单位">
-                            <depart-tree-select
-                                v-model="query.involveDepartId"
-                                :check-strictly="false"
+                </el-row>
+                <div class="form-row flex">
+                    <label class="text-center">问题信息</label>
+                    <div class="flex wrap query-box">
+                        <el-input
+                            placeholder="问题编号 / 样本源头编号"
+                            v-model="query.originId"
+                            clearable
+                            style="width: 200px"
+                            size="small"
+                        />
+                        <el-input
+                            placeholder="事情简要描述"
+                            v-model="query.thingDesc"
+                            clearable
+                            style="width: 280px"
+                            size="small"
+                        />
+                        <el-select
+                            size="small"
+                            style="width: 146px"
+                            placeholder="业务类别"
+                            clearable
+                            v-model="query.businessTypeCode"
+                        >
+                            <el-option
+                                v-for="item in dict.businessType"
+                                :key="item.id"
+                                :label="item.dictLabel"
+                                :value="item.dictValue"
                             />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="办理单位">
-                            <depart-tree-select
-                                v-model="query.handleThreeDepartId"
-                                :check-strictly="false"
+                        </el-select>
+                        <el-tree-select
+                            :data="dictProblemSources"
+                            :props="{ value: 'id' }"
+                            node-key="id"
+                            v-model="query.problemSourcesCode"
+                            clearable
+                            filterable
+                            size="small"
+                            style="width: 180px"
+                            placeholder="问题来源"
+                        />
+                        <el-select
+                            size="small"
+                            style="width: 146px"
+                            placeholder="专项督察"
+                            clearable
+                            v-model="query.specialSupervision"
+                        >
+                            <el-option
+                                v-for="item in dict.specialSupervision"
+                                :key="item.id"
+                                :label="item.dictLabel"
+                                :value="item.dictValue"
                             />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="办理状态">
-                            <dict-select
-                                name="processingStatus"
-                                v-model="query.processingStatus"
+                        </el-select>
+                        <el-input
+                            placeholder="通报期数"
+                            size="small"
+                            style="width: 146px"
+                            v-model="query.reportNumber"
+                            clearable
+                        />
+                        <div style="width: 180px">
+                            <depart-tree-select
+                                v-model="query.involveDepartId"
+                                placeholder="涉及单位"
+                                size="small"
                             />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6"> </el-col>
-                </el-row>
+                        </div>
+                    </div>
+                </div>
                 <div class="form-row flex">
-                    <label class="text-center">其他选项</label>
+                    <label class="text-center">核查情况</label>
                     <div class="flex wrap query-box">
+                        <div style="width: 180px">
+                            <depart-tree-select
+                                v-model="query.handleDepartId"
+                                placeholder="办理单位"
+                                size="small"
+                            />
+                        </div>
                         <el-select
                             size="small"
                             style="width: 120px"
-                            placeholder="核查情况"
+                            placeholder="是否属实"
                             clearable
                             v-model="query.checkStatus"
                         >
@@ -102,39 +122,141 @@
                             />
                         </el-select>
                         <el-select
-                            placeholder="处置结果"
                             size="small"
-                            style="width: 180px"
-                            v-model="query.handleResultCode"
+                            style="width: 120px"
+                            placeholder="是否整改"
                             clearable
-                            multiple
+                            v-model="query.isRectifyCode"
                         >
+                            <el-option
+                                v-for="item in dict.isRectify"
+                                :key="item.id"
+                                :label="item.dictLabel"
+                                :value="item.dictValue"
+                            />
+                        </el-select>
+                        <div class="flex gap-4">
+                            <el-select
+                                v-model="query.blameKey"
+                                style="width: 120px"
+                                @change="delete query.blameValue"
+                                size="small"
+                            >
+                                <el-option value="name" label="姓名" />
+                                <el-option value="empNo" label="警号" />
+                                <el-option value="idCode" label="身份证" />
+                            </el-select>
+                            <el-input
+                                placeholder="涉及人员"
+                                v-model="query.blameValue"
+                                clearable
+                                size="small"
+                                style="width: 160px"
+                            />
+                        </div>
+                        <el-select placeholder="处置结果"
+                                v-model="query.handleResultCode"
+                                clearable
+                                size="small"
+                                style="width: 280px" multiple>
                             <el-option
                                 v-for="item in dict.handleResult"
-                                :key="item.dictValue"
+                                :key="item.id"
                                 :label="item.dictLabel"
                                 :value="item.dictValue"
                             />
                         </el-select>
                     </div>
                 </div>
-            </el-form>
-            <div class="mb-25 flex between">
-                <div>
-                    <el-button
-                        type="primary"
-                        @click="addShow = true"
-                        v-perms="['negative:add']"
-                        ><template #icon>
-                            <icon name="el-icon-Plus" /> </template
-                        >问题下发</el-button
-                    >
+                <div class="form-row flex">
+                    <label class="text-center">其他选项</label>
+                    <div class="flex wrap query-box">
+                        <el-select
+                            size="small"
+                            style="width: 120px"
+                            placeholder="办理状态"
+                            clearable
+                            v-model="query.processingStatus"
+                            multiple
+                        >
+                            <el-option
+                                v-for="item in dict.processingStatus"
+                                :key="item.id"
+                                :label="item.dictLabel"
+                                :value="item.dictValue"
+                            />
+                        </el-select>
+                        <el-select
+                            size="small"
+                            style="width: 150px"
+                            placeholder="流程阶段"
+                            clearable
+                            v-model="query.flowKey"
+                        >
+                            <el-option
+                                v-for="item in flowNodes"
+                                :key="item.flowKey"
+                                :label="item.flowName"
+                                :value="item.flowKey"
+                            />
+                        </el-select>
+                        <el-select
+                            size="small"
+                            style="width: 120px"
+                            placeholder="是否超时"
+                            clearable
+                            v-model="query.timeoutFlag"
+                        >
+                            <el-option label="未超时" :value="false" />
+                            <el-option label="已超时" :value="true" />
+                        </el-select>
+                        <el-select
+                            size="small"
+                            style="width: 120px"
+                            placeholder="申请延期"
+                            clearable
+                            v-model="query.extensionFlag"
+                        >
+                            <el-option label="已申请" :value="true" />
+                            <el-option label="未申请" :value="false" />
+                        </el-select>
+                        <el-select
+                            size="small"
+                            style="width: 146px"
+                            placeholder="下发单位的层级"
+                            clearable
+                            v-model="query.crtDepartLevel"
+                        >
+                            <el-option label="市局下发" :value="0" />
+                            <el-option label="二级机构下发" :value="2" />
+                        </el-select>
+                        <div class="flex gap-4">
+                            <el-select
+                                v-model="query.responderKey"
+                                style="width: 120px"
+                                @change="delete query.responderValue"
+                                size="small"
+                            >
+                                <el-option value="name" label="姓名" />
+                                <el-option value="phone" label="电话" />
+                            </el-select>
+                            <el-input
+                                placeholder="投诉反映人"
+                                v-model="query.responderValue"
+                                clearable
+                                size="small"
+                                style="width: 160px"
+                            />
+                        </div>
+                    </div>
                 </div>
+            </el-form>
+            <div class="flex end mt-20 mb-26">
                 <div>
                     <el-button type="primary" @click="getList">
-                        <template #icon>
-                            <icon name="el-icon-Search" />
-                        </template>
+                        <template #icon
+                            ><icon name="el-icon-Search"
+                        /></template>
                         查询</el-button
                     >
                     <el-button @click="reset">重置</el-button>
@@ -197,7 +319,11 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column label="问题发现时间" prop="discoveryTime" width="160" />
+                <el-table-column
+                    label="问题发现时间"
+                    prop="discoveryTime"
+                    width="150"
+                />
                 <el-table-column label="问题来源" prop="problemSources" />
                 <el-table-column label="业务类别" prop="businessTypeName" />
                 <el-table-column label="涉嫌问题">
@@ -223,7 +349,12 @@
                         >
                     </template>
                 </el-table-column>
-                <el-table-column label="核查情况" prop="checkStatusName" width="100" align="center" />
+                <el-table-column
+                    label="核查情况"
+                    prop="checkStatusName"
+                    width="100"
+                    align="center"
+                />
                 <el-table-column label="办理状态">
                     <template #default="{ row }">
                         <el-tag>{{
@@ -234,6 +365,25 @@
                         }}</el-tag>
                     </template>
                 </el-table-column>
+                <el-table-column label="流程限时" width="150" align="center">
+                    <template #default="{ row }">
+                        <countdown
+                            :time="row.remainingDuration"
+                            v-if="
+                                row.remainingDuration &&
+                                row.processingStatus !==
+                                    ProcessingStatus.COMPLETED
+                            "
+                        />
+                        <el-tag
+                            v-else-if="row.handleTimeout"
+                            type="danger"
+                            effect="dark"
+                            >办理超时
+                            {{ formatTimeText(row.handleTimeout) }}</el-tag
+                        >
+                    </template>
+                </el-table-column>
                 <el-table-column label="流程节点">
                     <template #default="{ row }">
                         <el-tag v-if="row.flowKey">{{
@@ -282,8 +432,8 @@
 </template>
 <script lang="ts" setup>
 import { listTodos } from "@/api/work";
-
-import { getDictLable, getInvolveProblem } from "@/utils/util";
+import { ProcessingStatus } from "@/enums/flowEnums";
+import { getDictLable, getInvolveProblem, formatTimeText } from "@/utils/util";
 
 import useCatchStore from "@/stores/modules/catch";