diff --git a/src/api/data/complaintCollection.ts b/src/api/data/complaintCollection.ts
index 7c0cffd..e3f543e 100644
--- a/src/api/data/complaintCollection.ts
+++ b/src/api/data/complaintCollection.ts
@@ -127,4 +127,14 @@ export function forceTermination(body) {
     });
 }
 
+/**
+ * 获取投诉详情（用于修改弹窗回显）
+ */
+export function getComplaintCollectionDetail(body) {
+    return request.post({
+        url: `/data/complaintCollection/getComplaintCollectionDetail`,
+        body
+    });
+}
+
 
diff --git a/src/components/data/complaintformdialog.vue b/src/components/data/complaintformdialog.vue
index ec94461..0ce8f1e 100644
--- a/src/components/data/complaintformdialog.vue
+++ b/src/components/data/complaintformdialog.vue
@@ -208,7 +208,7 @@
                     :label="item.dictLabel"
                 >
                   <!-- 复选框展示 -->
-                  <el-checkbox :model-value="model.involveProblemIdList.includes(item.dictValue)">
+                  <el-checkbox :model-value="(model.involveProblemIdList || []).includes(item.dictValue)">
                     {{ item.dictLabel }}
                   </el-checkbox>
                 </el-option>
@@ -328,7 +328,7 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="visibleProxy = false" size="large">取消</el-button>
-        <el-button type="primary" @click="onSubmit" size="large">
+        <el-button type="primary" @click="onSubmit" size="large" :loading="submitLoading">
           {{ mode === 'add' ? '添加' : '修改' }}
         </el-button>
       </div>
@@ -352,14 +352,69 @@
 
 <script setup>
 import {computed, ref, watch} from "vue";
-import {maileRepeatt} from "@/api/data/complaintCollection.ts";
-import { WarningFilled } from '@element-plus/icons-vue'
+import {maileRepeatt, getComplaintCollectionDetail, updateComplaintCollection} from "@/api/data/complaintCollection.ts";
 import dayjs from "dayjs";
 import feedback from "@/utils/feedback.ts";
-import Complaint_detail from "@/components/data/complaint_detail.vue";
 import DuplicateDrawerWithDetail from "@/views/data/DuplicateDrawerWithDetail.vue";
 import useUserStore from "@/stores/modules/user.ts";
 import {secondList, listByFirstHost} from "@/api/system/depart";
+import useCatchStore from "@/stores/modules/catch";
+const catchStore = useCatchStore();
+
+
+// 1. 用 computed 包装 storeDict
+const storeDict = computed(() =>
+    catchStore.getDicts([
+      "businessType",
+      "suspectProblem",
+      "specialSupervision",
+      "checkStatus",
+      "policeType",
+      "timeLimit",
+      "approvalFlow",
+      "sfssSourceTable",
+      "sfssTags",
+    ]) || {}
+);
+
+// 2. 本地静态字典
+const localDict = {
+  yesNo: [
+    {id: 1, dictLabel: "是", dictValue: "1"},
+    {id: 2, dictLabel: "否", dictValue: "0"},
+  ],
+  handleMethodType: [
+    {id: 1, dictLabel: "自办", dictValue: "0"},
+    {id: 2, dictLabel: "下发", dictValue: "1"},
+  ],
+};
+
+// 3. sourceTableAndLevel 依赖 storeDict.value
+const sourceTableAndLevel = computed(() => {
+  const list = storeDict.value?.sfssSourceTable || [];
+  if (!list || list.length === 0) return [];
+  // 一级：remark 为空
+  const parents = list.filter(d => !d.remark);
+  // 二级：remark 有值
+  const children = list.filter(d => d.remark);
+  return parents.map(p => ({
+    label: p.dictLabel,
+    value: String(p.dictValue),
+    children: children
+        .filter(c => String(c.remark) === String(p.dictValue))
+        .map(c => ({
+          label: c.dictLabel,
+          value: String(c.dictValue),
+        })),
+  }));
+});
+
+// 4. dict 合并
+const dict = computed(() => ({
+  ...storeDict.value,
+  ...localDict,
+  sourceTableAndLevel: sourceTableAndLevel.value,
+}));
 
 const HostLevel = {
   FIRST: '1',
@@ -373,13 +428,16 @@ const props = defineProps({
   modelValue: Boolean,
   mode: { type: String, default: "add" },
   model: { type: Object, required: true },
-  dict: { type: Object, required: true },
   rules: { type: Object, required: true },
+  id: { type: String, default: "" },
+  loading: { type: Boolean, default: false },
+  negativeId: { type: String, default: "" },
 });
 
-const emit = defineEmits(["update:modelValue", "submit"]);
+const emit = defineEmits(["update:modelValue", "submit", "updateSuccess"]);
 
 const formRef = ref();
+const submitLoading = ref(false);
 
 const visibleProxy = computed({
   get: () => props.modelValue,
@@ -388,7 +446,7 @@ const visibleProxy = computed({
 
 watch(
     () => visibleProxy.value,
-    (v) => {
+    async (v) => {
       if (v) {
         props.model.originIdSkip = false
         props.model.responderNameSkip = false
@@ -404,6 +462,47 @@ watch(
         duplicateList.value = []
 
         getDeparts()
+
+        if (props.mode === 'edit' && (props.id || props.negativeId)) {
+          try {
+            const res = await getComplaintCollectionDetail({ id: props.id, negativeId: props.negativeId });
+            const r = res?.data ?? res ?? {};
+
+            props.model.id = r.id ?? '';
+            props.model.sourceTable = r.sourceTable ?? '';
+            props.model.sourceTableSubOne = r.sourceTableSubOne ?? '';
+            props.model.sourcePath = [r.sourceTable, r.sourceTableSubOne].filter(Boolean);
+            props.model.originId = r.originId ?? '';
+            props.model.discoveryTime = r.discoveryTime ?? '';
+            props.model.responderName = r.responderName ?? '';
+            props.model.responderIdCode = r.responderIdCode ?? '';
+            props.model.responderPhone = r.responderPhone ?? '';
+            props.model.secondDepartId = r.secondDepartId ?? '';
+            props.model.secondDepartName = r.secondDepartName ?? '';
+            props.model.thingDesc = r.thingDesc ?? '';
+            props.model.repeatt = r.repeatt ?? '';
+            props.model.leadApproval = r.leadApproval ?? '';
+            props.model.handleMethod = r.handleMethod ?? '';
+            props.model.involveProblemIdList = splitToArray(r.involveProblemIdList ?? r.involveProblem);
+            props.model.tags = splitToArray(r.tags ?? r.tag);
+            props.model.businessTypeName = r.businessTypeName ?? '';
+            props.model.businessTypeCode = r.businessTypeCode ?? '';
+            props.model.thingFiles = normalizeThingFiles(r.thingFiles);
+            props.model.hostLevel = r.hostLevel ?? '3';
+            props.model.departId = r.departId ?? '';
+            props.model.departName = r.departName ?? '';
+            props.model.timeLimit = r.timeLimit ?? '';
+            props.model.maxSignDuration = r.maxSignDuration ?? null;
+            props.model.maxHandleDuration = r.maxHandleDuration ?? null;
+            props.model.maxExtensionDuration = r.maxExtensionDuration ?? null;
+            props.model.approvalFlow = r.approvalFlow ?? '';
+            props.model.negativeId = r.negativeId ?? '';
+          } catch (e) {
+            console.error("获取详情失败", e);
+            feedback.notifyError("获取数据失败，请重试");
+            visibleProxy.value = false;
+          }
+        }
       }
     }
 );
@@ -470,15 +569,86 @@ watch(
 
 function fillFiledName() {
   const code = props.model.businessTypeCode;
-  const hit = props.dict.businessType?.find(
+  const hit = dict.value?.businessType?.find(  // 添加可选链
       (d) => String(d.dictValue) === String(code)
   );
   props.model.businessTypeName = hit?.dictLabel || "";
 }
 
+function splitToArray(val) {
+  if (!val) return [];
+  if (Array.isArray(val)) return val;
+  if (typeof val === 'string') {
+    return val.split(/[,，]/).map(s => s.trim()).filter(Boolean);
+  }
+  return [];
+}
+
+function normalizeThingFiles(val) {
+  if (!val) return [];
+  if (Array.isArray(val)) return val.map(f => ({...f, loading: false, percent: 100}));
+  if (typeof val === 'string' && val.trim().startsWith('[')) {
+    try {
+      return JSON.parse(val).map(f => ({...f, loading: false, percent: 100}));
+    } catch {}
+  }
+  if (typeof val === 'string') {
+    return val.split(/[,，]/).map(s => s.trim()).filter(Boolean).map(p => ({
+      filePath: p,
+      fileName: p.split('/').pop() || p,
+      loading: false,
+      percent: 100,
+    }));
+  }
+  return [];
+}
+
 async function onSubmit() {
   fillFiledName();
-  emit("submit");
+
+  // 添加模式：保持原样，emit 事件让父组件处理
+  if (props.mode === 'add') {
+    emit("submit");
+    return;
+  }
+
+  // 修改模式：内部处理 API 调用
+  submitLoading.value = true;
+  try {
+    const body = {
+      id: props.model.id,
+      sourceTable: props.model.sourceTable,
+      sourceTableSubOne: props.model.sourceTableSubOne,
+      originId: props.model.originId,
+      originIdSkip: props.model.originIdSkip,
+      discoveryTime: props.model.discoveryTime,
+      responderName: props.model.responderName,
+      responderNameSkip: props.model.responderNameSkip,
+      responderIdCode: props.model.responderIdCode,
+      responderIdCodeSkip: props.model.responderIdCodeSkip,
+      responderPhone: props.model.responderPhone,
+      responderPhoneSkip: props.model.responderPhoneSkip,
+      secondDepartId: props.model.secondDepartId,
+      secondDepartName: props.model.secondDepartName,
+      thingDesc: props.model.thingDesc,
+      repeatt: props.model.repeatt,
+      handleMethod: props.model.handleMethod,
+      involveProblemIdList: props.model.involveProblemIdList || [],
+      tags: props.model.tags || [],
+      businessTypeCode: props.model.businessTypeCode,
+      businessTypeName: props.model.businessTypeName,
+      negativeId: props.model.negativeId
+    };
+
+    await updateComplaintCollection(body);
+    feedback.msgSuccess("修改成功");
+    visibleProxy.value = false;
+    emit("updateSuccess");
+  } catch (e) {
+    console.error("修改失败", e);
+  } finally {
+    submitLoading.value = false;
+  }
 }
 
 // 查重
diff --git a/src/views/data/ComplaintCollection.vue b/src/views/data/ComplaintCollection.vue
index 00e10f1..296d0fa 100644
--- a/src/views/data/ComplaintCollection.vue
+++ b/src/views/data/ComplaintCollection.vue
@@ -377,7 +377,6 @@
       v-model="addShow"
       mode="add"
       :model="addForm"
-      :dict="dict"
       :rules="addRules"
       @submit="submitAdd"
   />
@@ -387,8 +386,9 @@
       v-model="updateShow"
       mode="edit"
       :model="updateForm"
-      :dict="dict"
       :rules="addRules"
+      :id="updateId"
+      :loading="updateLoading"
       @submit="submitUpdate"
   />
 
@@ -622,114 +622,17 @@ watch(
 
 // region 修改相关
 const updateShow = ref(false);
+const updateId = ref("");
+const updateLoading = ref(false);
 const updateForm = ref({
-  // ✅ 至少要有下面这 3 个字段（子组件会用到）
-  sourcePath: [],
-  sourceTable: "",
-  sourceTableSubOne: "",
-
-  // 其他字段给个默认值，避免表单里 v-model 报 undefined
   id: "",
-  originId: "",
-  discoveryTime: "",
-  responderName: "",
-  responderIdCode: "",
-  responderPhone: "",
-  secondDepartId: "",
-  secondDepartName: "",
-  thingDesc: "",
-  repeatt: "",
-  leadApproval: "",
-  handleMethod: "",
-  involveProblemIdList: [],
-  tags: [],
-  thingFiles: [],
-  // 办理单位相关字段
-  hostLevel: '3',
-  departId: '',
-  departName: '',
-  // 办理时限相关字段
-  timeLimit: '',
-  maxSignDuration: null,
-  maxHandleDuration: null,
-  maxExtensionDuration: null,
-  // 审批流程
-  approvalFlow: '',
-})
-
-function normalizeThingFiles(val) {
-  if (!val) return []
-  if (Array.isArray(val)) return val
-
-  // 后端可能返回 JSON 字符串
-  if (typeof val === 'string' && val.trim().startsWith('[')) {
-    try {
-      return JSON.parse(val)
-    } catch { /* ignore */
-    }
-  }
-
-  // 后端可能返回 "path1,path2"
-  if (typeof val === 'string') {
-    return val.split(/[,，]/).map(s => s.trim()).filter(Boolean).map(p => ({
-      filePath: p,
-      fileName: p.split('/').pop() || p,
-      loading: false,
-      percent: 100,
-    }))
-  }
-
-  return []
-}
+});
 
 // 修改按钮点击事件
-const handleUpdate = async (row) => {
-  const r = JSON.parse(JSON.stringify(row || {}))
-  console.log(r)
-  updateForm.value = {
-    // id 必须带
-    id: r.id ?? '',
-    // ✅ 回显来源：cascader 只认 sourcePath
-    sourceTable: r.sourceTable ?? '',
-    sourceTableSubOne: r.sourceTableSubOne ?? '',
-    sourcePath: [r.sourceTable, r.sourceTableSubOne].filter(Boolean),
-    // 其它字段正常回显
-    originId: r.originId ?? '',
-    discoveryTime: r.discoveryTime ?? '',
-    responderName: r.responderName ?? '',
-    responderIdCode: r.responderIdCode ?? '',
-    responderPhone: r.responderPhone ?? '',
-    secondDepartId: r.secondDepartId ?? '',
-    secondDepartName: r.secondDepartName ?? '',
-    thingDesc: r.thingDesc ?? '',
-    repeatt: r.repeatt ?? '',
-    leadApproval: r.leadApproval ?? '',
-    handleMethod: r.handleMethod ?? '',
-    // 多选字段
-    involveProblemIdList: splitToArray(r.involveProblemIdList ?? r.involveProblem),
-    tags: splitToArray(r.tags ?? r.tag),
-    businessTypeName: r.businessTypeName ?? '',
-    businessTypeCode: r.businessTypeCode ?? '',
-    thingFiles: normalizeThingFiles(r.thingFiles).map(f => ({
-      ...f,
-      loading: false,
-      percent: 100,
-      uid: f.uid || `${f.filePath}-${Math.random()}`,
-    })),
-    // 办理单位相关字段
-    hostLevel: r.hostLevel ?? '3',
-    departId: r.departId ?? '',
-    departName: r.departName ?? '',
-    // 办理时限相关字段
-    timeLimit: r.timeLimit ?? '',
-    maxSignDuration: r.maxSignDuration ?? null,
-    maxHandleDuration: r.maxHandleDuration ?? null,
-    maxExtensionDuration: r.maxExtensionDuration ?? null,
-    // 审批流程
-    approvalFlow: r.approvalFlow ?? '',
-    negativeId: r.negativeId ?? ''
-  };
-  updateShow.value = true
+const handleUpdate = (row) => {
+  debugger
+  updateId.value = row.id;
+  updateShow.value = true;
 }
 const submitUpdate = async () => {
   const body = {
@@ -743,18 +646,6 @@ const submitUpdate = async () => {
   }
 }
 
-function splitToArray(val) {
-  if (!val) return []
-  if (Array.isArray(val)) return val
-  if (typeof val === 'string') {
-    return val
-        .split(/[,，]/)
-        .map(s => s.trim())
-        .filter(Boolean)
-  }
-  return []
-}
-
 
 // endregion
 
diff --git a/src/views/work/Query.vue b/src/views/work/Query.vue
index 417013a..47750af 100644
--- a/src/views/work/Query.vue
+++ b/src/views/work/Query.vue
@@ -1106,6 +1106,17 @@
         </footer>
     </el-dialog>
 
+
+  <data-complaintformdialog
+      v-model="complaintEditShow"
+      mode="edit"
+      :negativeId="complaintEditId"
+      :model="complaintModel"
+      :dict="dict"
+      :rules="complaintRules"
+      @updateSuccess="getList"
+  />
+
 </template>
 <script setup>
 import moment from "moment";
@@ -1128,6 +1139,7 @@ import {computed, watch} from "vue";
 import {getListData} from "@/api/superviseReport/superviseReport";
 import {ArrowDown, ArrowUp} from "@element-plus/icons-vue";
 import useUserStore from "@/stores/modules/user.ts";
+import {delComplaintCollection} from "@/api/data/complaintCollection.ts";
 const userStore = useUserStore();
 
 const catchStore = useCatchStore();
@@ -1288,8 +1300,15 @@ async function handleReportGenerate() {
 
 
 async function handleDel(row) {
-    await feedback.confirm(`确定删除该数据？`);
+  await feedback.confirm(`确定删除该数据？`);
+  if (row.sourceType == '2') {
+    const body = {
+      negativeId: row.id
+    }
+    await delComplaintCollection(body)
+  }else {
     await delNegative(row.id);
+  }
     feedback.msgSuccess("操作成功");
     getList();
 }
@@ -1299,7 +1318,13 @@ const formData = ref({});
 const formRef = ref(null);
 
 function handleEdit(row) {
-    console.log(row);
+  debugger
+    console.log(row.sourceType);
+  if (row.sourceType == '2') {
+    complaintEditShow.value = true;
+    complaintEditId.value = row.id;
+    complaintModel.value = { ...row };
+  }else {
     editShow.value = true;
     formData.value = { ...row };
     if (row.involveProblem) {
@@ -1308,6 +1333,7 @@ function handleEdit(row) {
     } else {
         formData.value.involveProblem = [];
     }
+  }
 }
 
 async function handleSumbit() {
@@ -1399,6 +1425,12 @@ function handleChangeProblem(node, problem) {
     problem.twoLevelContent = node.parent.label;
   }
 }
+
+// 整合投诉举报修改页面到这里
+const complaintEditShow = ref(false);
+const complaintEditId = ref("");
+const complaintModel = ref({});
+const complaintRules = ref({});  // 根据需要定义验证规则
 </script>
 <style lang="scss" scoped>
 :deep() {