From 83e4cd30c36ff2a456906485cdb70770fd597eb4 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Wed, 6 Aug 2025 17:20:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E6=A1=88=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B8=E6=9F=A5=E7=BA=BF=E7=B4=A2=E6=95=B0=E6=8D=AE=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict.ts                        |   6 +
 src/components/date-time-range-picker-ext.vue |   4 +-
 src/components/depart-tree-select.vue         |   2 +-
 src/components/handle-result12337-select.vue  |  50 ++++++++
 src/components/home/work/my-todo.vue          |   2 +-
 src/components/negative/verify.vue            |  19 ++-
 src/views/data/Ajhc.vue                       | 109 +++++++++++++++++-
 src/views/mobileSupervise/TestingAlcohol.vue  |   9 ++
 8 files changed, 189 insertions(+), 12 deletions(-)
 create mode 100644 src/components/handle-result12337-select.vue

diff --git a/src/api/system/dict.ts b/src/api/system/dict.ts
index 8823149..caa6487 100644
--- a/src/api/system/dict.ts
+++ b/src/api/system/dict.ts
@@ -64,4 +64,10 @@ export function listDictProblemSourceTree() {
     return request.get({
         url: `/dict/problemSource`
     });
+}
+
+export function list12337HandleResult() {
+    return request.get({
+        url: `/dict/12337HandleResult`
+    });
 }
\ No newline at end of file
diff --git a/src/components/date-time-range-picker-ext.vue b/src/components/date-time-range-picker-ext.vue
index 8e11a61..5c3a9a8 100644
--- a/src/components/date-time-range-picker-ext.vue
+++ b/src/components/date-time-range-picker-ext.vue
@@ -56,6 +56,4 @@ const shortcuts = [
         },
     }
 ];
-</script>
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/components/depart-tree-select.vue b/src/components/depart-tree-select.vue
index f9bcf5b..86a28b3 100644
--- a/src/components/depart-tree-select.vue
+++ b/src/components/depart-tree-select.vue
@@ -18,7 +18,7 @@ const props = defineProps({
     },
     size:{
       type: String,
-      default: 'small'
+      default: ''
     }
 })
 
diff --git a/src/components/handle-result12337-select.vue b/src/components/handle-result12337-select.vue
new file mode 100644
index 0000000..befa01c
--- /dev/null
+++ b/src/components/handle-result12337-select.vue
@@ -0,0 +1,50 @@
+<template>
+    <el-select @change="change" filterable>
+        <el-option-group
+          v-for="group in options"
+          :key="group.label"
+          :label="group.label"
+        >
+          <el-option
+            v-for="item in group.options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+      </el-option-group>
+    </el-select>
+</template>
+<script setup>
+import { list12337HandleResult } from '@/api/system/dict'
+
+
+const emit = defineEmits(['select']);
+const options = ref([])
+
+onMounted(() => {
+  list12337HandleResult().then(data => {
+    options.value = data
+  })  
+})
+
+function change(value) {
+  let result = {};
+  if (value) {
+    for(const item of options.value) {
+      const obj = item.options.find(option => option.value === value);
+      if (obj) {
+        result = {
+          text: obj.text,
+          value: obj.value,
+          group: item.label
+        }
+        break;
+      }
+    }
+  }
+  emit('select', result)
+}
+</script>
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/components/home/work/my-todo.vue b/src/components/home/work/my-todo.vue
index 3eacef2..7bb99b8 100644
--- a/src/components/home/work/my-todo.vue
+++ b/src/components/home/work/my-todo.vue
@@ -138,7 +138,7 @@
                         }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="操作" width="90">
+                <el-table-column label="操作" width="90"  fixed="right">
                     <template #default="{ row }">
                         <el-button
                             type="primary"
diff --git a/src/components/negative/verify.vue b/src/components/negative/verify.vue
index 103e4f8..9443b2d 100644
--- a/src/components/negative/verify.vue
+++ b/src/components/negative/verify.vue
@@ -192,6 +192,19 @@
           :autosize="{ minRows: 4 }"
       />
     </el-form-item>
+    <el-form-item
+        label="处理结论结果"
+        prop="handleResult12337"
+        v-if="negative.problemSourcesCode === ProblemSources.XF12337"
+        :rules="{
+                required: true,
+                message: '请选择12337处理结论结果',
+                trigger: ['blur'],
+            }"
+    >
+      <handle-result12337-select v-model="form.handleResult12337" style="width: 280px" @select="handleResult12337" />
+      <span class="ml-20">{{ form.handleResult12337Group }}</span>
+    </el-form-item>
 
     <template v-if="form.checkStatus !== InspectCase.UNABLE">
       <div
@@ -1925,6 +1938,10 @@ function validateHandlePolices(rule, value, cb) {
   }
 }
 
+function handleResult12337(item) {
+  form.value.handleResult12337Group = item.group;
+}
+
 const formRef = ref(null);
 
 async function validate() {
@@ -1960,7 +1977,7 @@ async function validate() {
 function getData() {
   return form.value;
 }
-console.log('dict.superviseMeasures',dict)
+
 defineExpose({
   validate,
   getData,
diff --git a/src/views/data/Ajhc.vue b/src/views/data/Ajhc.vue
index 8eb566d..63f1da0 100644
--- a/src/views/data/Ajhc.vue
+++ b/src/views/data/Ajhc.vue
@@ -308,8 +308,87 @@
         </footer>
     </el-dialog>
 
-    <el-dialog title="任务分发" v-model="distributeShow" width="50vw" top="5vh">
-        <el-form :label-width="120" ref="formRef" :model="form">
+    <el-dialog title="问题下发" v-model="distributeShow" width="50vw" top="5vh">
+        <el-form
+            :label-width="120"
+            ref="formRef"
+            :model="form"
+            v-loading="loading"
+        >
+            <el-form-item label="指定办理单位" prop="handleDepartId">
+                <div class="flex gap">
+                    <div style="width: 280px">
+                        <depart-tree-select v-model="form.handleDepartId" />
+                    </div>
+                    <div class="tips mt-10">
+                        <p>指定具体办理单位 指将问题分派给哪个单位办理。</p>
+                    </div>
+                </div>
+            </el-form-item>
+            <el-form-item
+                label="业务类别"
+                prop="businessTypeCode"
+                :rules="{
+                    required: true,
+                    message: '请选择业务类别',
+                    trigger: ['blur'],
+                }"
+            >
+                <el-select
+                    v-model="form.businessTypeCode"
+                    @change="
+                        (val) =>
+                            (form.businessTypeName = dict.businessType.filter(
+                                (item) => item.dictValue === val
+                            )[0].dictLabel)
+                    "
+                    style="width: 280px"
+                >
+                    <el-option
+                        v-for="item in dict.businessType"
+                        :key="item.id"
+                        :label="item.dictLabel"
+                        :value="item.dictValue"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item
+                label="涉嫌问题"
+                prop="involveProblem"
+                :rules="{
+                    required: true,
+                    message: '请选择涉嫌问题',
+                    trigger: ['blur'],
+                }"
+            >
+                <el-select
+                    v-model="form.involveProblem"
+                    multiple
+                    clearable
+                    style="width: 280px"
+                >
+                    <el-option
+                        v-for="item in dict.suspectProblem"
+                        :key="item.id"
+                        :label="item.dictLabel"
+                        :value="item.dictValue"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="涉及警种" prop="policeType">
+                <el-select
+                    v-model="form.policeType"
+                    clearable
+                    style="width: 280px"
+                >
+                    <el-option
+                        v-for="item in dict.policeType"
+                        :key="item.id"
+                        :label="item.dictLabel"
+                        :value="item.dictValue"
+                    />
+                </el-select>
+            </el-form-item>
             <el-form-item
                 label="办理时限"
                 prop="timeLimit"
@@ -325,6 +404,24 @@
                     v-model:maxExtensionDuration="form.maxExtensionDuration"
                 />
             </el-form-item>
+            <el-form-item
+                label="下发流程"
+                prop="distributionFlow"
+                :rules="{
+                    required: true,
+                    message: '请选择下发流程',
+                }"
+            >
+                <el-radio-group v-model="form.distributionFlow" class="block">
+                    <el-radio
+                        v-for="item in dict.distributionFlow"
+                        :key="item.dictCode"
+                        :value="item.dictValue"
+                        >{{ item.dictLabel
+                        }}</el-radio
+                    >
+                </el-radio-group>
+            </el-form-item>
             <el-form-item
                 label="审核流程"
                 prop="approvalFlow"
@@ -339,8 +436,8 @@
                         :key="item.dictCode"
                         :value="item.dictValue"
                         >{{ item.dictLabel
-                        }}{{ item.remark ? `(${item.remark})` : "" }}
-                    </el-radio>
+                        }}{{ item.remark ? `(${item.remark})` : "" }}</el-radio
+                    >
                 </el-radio-group>
                 <div class="tips mt-10">
                     <p>
@@ -533,8 +630,6 @@ async function handleAction(row) {
   negativeShow.value = true
 }
 
-
-
 const detailShow = ref(false);
 const activeRow = ref({});
 
@@ -542,4 +637,6 @@ function handleDetail(row) {
     activeRow.value = row;
     detailShow.value = true;
 }
+
+const loading = ref(false)
 </script>
diff --git a/src/views/mobileSupervise/TestingAlcohol.vue b/src/views/mobileSupervise/TestingAlcohol.vue
index fbc3e29..0e010be 100644
--- a/src/views/mobileSupervise/TestingAlcohol.vue
+++ b/src/views/mobileSupervise/TestingAlcohol.vue
@@ -561,6 +561,11 @@
                     prop="testingTime"
                     width="160"
                 />
+                <el-table-column
+                    label="是否违规宴请"
+                    prop="isIllegalBanquet"
+                    width="120"
+                />
                 <el-table-column label="饮酒情况/未检测原因" show-overflow-tooltip>
                     <template #default="{ row }">
                         <el-tag type="success" v-if="row.drinkResult === '未饮酒'">未饮酒</el-tag>
@@ -641,6 +646,10 @@
                     <label>酒精含量</label>
                     <span>{{ activePeople.alcoholContent }} mg/100ml</span>
                 </div>
+                <div class="col col-24">
+                    <label>是否违规宴请</label>
+                    <span>{{ activePeople.isIllegalBanquet }}</span>
+                </div>
                 <div class="col col-24" v-if="activePeople.unTestingDesc">
                     <label>未检测原因</label>
                     <span>{{ activePeople.unTestingDesc }} mg/100ml</span>