From 9039840986db7f206c2df1d85e118f84ff1b97c1 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Sat, 12 Jul 2025 16:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeploymentDisposal/autompvGroup/index.vue | 378 ++++++------
 .../components/TagSelectorDialogPeo.vue       | 406 ------------
 .../mpvGroup/components/addForm.vue           | 580 +++++-------------
 .../mpvGroup/components/addFormPeo.vue        | 460 --------------
 .../mpvGroup/components/addcjlr.vue           |  67 ++
 .../mpvGroup/components/approvalInfo.vue      | 300 ---------
 .../mpvGroup/components/dialogList.vue        | 119 ----
 .../mpvGroup/components/infoForm.vue          | 518 ----------------
 .../mpvGroup/components/selectionList.vue     | 277 ---------
 .../DeploymentDisposal/mpvGroup/index.vue     | 266 +++-----
 .../DeploymentDisposal/mpvPeo/index.vue       |   1 -
 .../DeploymentDisposal/mpvPeoSh/index.vue     |   1 -
 12 files changed, 519 insertions(+), 2854 deletions(-)
 delete mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/TagSelectorDialogPeo.vue
 delete mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addFormPeo.vue
 create mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addcjlr.vue
 delete mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/approvalInfo.vue
 delete mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/dialogList.vue
 delete mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/infoForm.vue
 delete mode 100644 src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/selectionList.vue

diff --git a/src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index.vue
index ed9eeea..05d6195 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/autompvGroup/index.vue
@@ -1,139 +1,131 @@
 <template>
   <div>
     <div class="titleBox">
-      <PageTitle title="布控审批">
-        <div class="sub-nav">
-          <el-tabs v-model="activeSubNav" @click="handleType">
-            <el-tab-pane label="我的发起" name="myInitiate"></el-tab-pane>
-            <el-tab-pane label="我的审核" name="myAudit"></el-tab-pane>
-            <el-tab-pane label="我的审批" name="myApprove"></el-tab-pane>
-            <el-tab-pane label="我的签收" name="mySign"></el-tab-pane>
-            <el-tab-pane label="我的处置" name="myHandle"></el-tab-pane>
-          </el-tabs>
-        </div>
+      <PageTitle title="重点群体审批">
+        <el-popover placement="bottom" :visible="visible" :width="400" trigger="click">
+          <template #reference>
+            <el-button type="primary" @click="(visible = !visible), (visiblefp = false)" size="small">布控申请
+            </el-button>
+          </template>
+          <div class="flex just-center">
+            <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm" @click="handleApplication(it)">{{it.zdmc }}</el-button>
+          </div>
+        </el-popover>
+        <el-popover placement="bottom" :visible="visiblefp" :width="400" trigger="click">
+          <template #reference>
+            <el-button size="small" type="primary" @click="(visiblefp = !visiblefp), (visible = false)">指定分配</el-button>
+          </template>
+          <div>
+            <el-input readonly v-model="obj.fpmc" @click="chooseUserVisible = true" placeholder="请选择民警"></el-input>
+            <div class="flex just-center mt10">
+              <el-button @click="(visiblefp = false), (obj = {})" size="small">取消</el-button>
+              <el-button type="primary" @click="handlefp" size="small">分配</el-button>
+            </div>
+          </div>
+        </el-popover>
+        <el-button size="small" type="primary" @click="handleZxs">转线索</el-button>
+        <el-button size="small" type="primary" @click="handleMove">移交管控</el-button>
+        <el-button type="primary" size="small" @click="addEdit('add', null)">
+          <el-icon style="vertical-align: middle">
+            <CirclePlus />
+          </el-icon>
+          <span style="vertical-align: middle">新增</span>
+        </el-button>
       </PageTitle>
     </div>
     <!-- 搜索 -->
     <div ref="searchBox">
-      <Search
-        :searchArr="searchConfiger"
-        @submit="onSearch"
-        :key="pageData.keyCount"
-      >
-      </Search>
+      <Search :searchArr="searchConfiger" @submit="onSearch" />
     </div>
     <!-- 表格 -->
     <div class="tabBox">
-      <MyTable
-        :tableData="pageData.tableData"
-        :tableColumn="pageData.tableColumn"
+      <MyTable 
+        :tableData="pageData.tableData" 
+        :tableColumn="pageData.tableColumn" 
         :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount"
-        :tableConfiger="pageData.tableConfiger"
+        :key="pageData.keyCount" 
+        :tableConfiger="pageData.tableConfiger" 
         :controlsWidth="pageData.controlsWidth"
         @chooseData="chooseData"
       >
         <template #jbxx="{ row }">
-          <div>
-            <img src="" alt="" />
-            <ul>
-              <li>群体名称：{{ row.qtMc }}</li>
-              <!-- <li>所属辖区：</li> -->
-              <li class="rowClass">
-                风险等级：
-                <DictTag
-                  :tag="false"
-                  :value="row.qtFxdj"
-                  :options="D_GS_ZDQT_FXDJ"
-                />
+          <div class="flex">
+            <img src="" alt="" style="width: 80px;height: 90px;" />
+             <ul class="tl ml10" style="flex:1 0 0">
+              <li class="one_text_detail">群体名称：{{ row.qtMc }}</li>
+              <li class="one_text_detail">群体级别：{{ row.qtjb }}</li>
+              <li class="flex one_text_detail">风险等级：
+                <DictTag :tag="false" :value="row.qtFxdj" :options="D_GS_ZDQT_FXDJ" />
               </li>
-              <li>创建时间：{{ row.xtCjsj }}</li>
+              <li class="one_text_detail">创建时间：{{ row.xtCjsj }}</li>
             </ul>
           </div>
-          <div class="flex">
-            <el-button
-              :key="index"
-              type="primary"
-              size="small"
-              v-for="(item, index) in row.bqList"
-            >
-              {{ item.bqMc }}</el-button
-            >
+           <div class="ww100 one_text_detail">
+            <el-button type="primary" size="small" v-for="(item, index) in row.bqList" :key="index">{{ item.bqMc }}</el-button>
           </div>
         </template>
         <template #bgxx="{ row }">
-          <div>背景资料：{{ row.qtBjzl }}</div>
-          <div>创建单位：{{ row.xtCjbmmc }}</div>
+          <div class="flex one_text_detail">背景资料：{{ row.qtBjzl }}</div>
+          <div class="flex one_text_detail">创建单位：{{ row.xtCjbmmc }}</div>
         </template>
         <template #gkxx="{ row }">
-          <div>管辖单位：{{ row.gxSsdwmc }}</div>
-          <div>列控原因：{{ row.zdrLkyy }}</div>
-          <div>开始时间：{{ row.startTime }}</div>
-          <div>截至时间：{{ row.endTime }}</div>
+          <div class="flex one_text_detail">管辖单位：{{ row.gxSsbmmc }}</div>
+          <div class="flex one_text_detail">列控原因：{{ row.zdrLkyy }}</div>
+          <div class="flex one_text_detail">开始时间：{{ row.zdrRkkssj }}</div>
+          <div class="flex one_text_detail">截至时间：{{ row.zdrRkjssj }}</div>
         </template>
-        <template #wkrs="{ row }">
-          <span style="color: #0072ff">{{ row.wkrs }}</span>
+        <template #zdryList="{ row }">
+          <span style="color: #0072ff">{{ row.zdryList ? row.zdryList.length : 0 }}</span>
         </template>
         <template #qtZt="{ row }">
-          <DictTag :tag="false" :value="row.qtZt" :options="D_GS_ZDR_BK_ZT" />
+          <DictTag :tag="false" :value="row.qtZt" :options="D_GS_ZDQT_ZT" />
         </template>
-
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link
-            size="small"
-            type="primary"
-            @click="autoEdit('auto', row)"
-            v-if="row.qtZt === '02' && activeSubNav === 'myAudit'"
-            >审核</el-link
-          >
-          <el-link
-            size="small"
-            type="success"
-            @click="autoEdit('approval', row)"
-            v-if="row.qtZt === '04' && activeSubNav === 'myApprove'"
-            >审批</el-link
-          >
-          <el-link size="small" type="info" @click="autoEdit('detail', row)"
-            >详情</el-link
-          >
+          <el-link size="small">审核</el-link>
+          <el-link size="small">审批</el-link>
+          <el-link size="small" type="success" @click="addEdit('detail', row)">详情</el-link>
         </template>
       </MyTable>
-      <Pages
-        @changeNo="changeNo"
-        @changeSize="changeSize"
-        :tableHeight="pageData.tableHeight"
-        :pageConfiger="{
-          ...pageData.pageConfiger,
-          total: pageData.total
-        }"
-      ></Pages>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
     </div>
-    <!-- 详情 -->
-    <MpvGroupInfo ref="MpvGroupInfoRef" />
+    <!-- 编辑 - 新增-->
+    <EditForm v-if="show" @updateDate="getList" ref="editFormDiloag" :dic="{D_BZ_XB,D_GS_ZDQT_LB,D_GS_ZDQT_FXDJ,D_GS_ZDR_CZZT}" />
+    <!-- 选择用户 -->
+    <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" />    <!-- 转线索 -->
+    <ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList" :dic="{ D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX }"></ZxsForm>
   </div>
 </template>
 
 <script setup>
+import ZxsForm from "../mpvGroup/components/zxsForm.vue";
+import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
-import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
-import { reactive, ref, onMounted, getCurrentInstance } from "vue";
-import { setItem, getItem } from "@/utils/storage";
-import { selectUserDeptPage } from "@/api/user-manage";
-import MpvGroupInfo from "../mpvGroup/components/infoForm.vue";
-
+import EditForm from "../mpvGroup/components/addForm.vue";
+import { qcckGet, qcckPost } from "@/api/qcckApi.js";
+import { ElMessage } from "element-plus";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
-const { D_GS_ZDQT_FXDJ, D_GS_ZDR_RYJB, D_GS_ZDR_BK_ZT } = proxy.$dict("D_GS_ZDQT_FXDJ","D_GS_ZDR_RYJB","D_GS_ZDR_BK_ZT" ); //获取字典数据
-const deptList = ref([]); //部门列表
+const { D_GS_ZDR_CZZT,D_GS_BK_SQLX, D_GS_ZDQT_FXDJ, D_GS_ZDR_RYJB, D_GS_ZDQT_LB, D_GS_ZDR_BK_ZT, D_GS_BQ_LX, D_GS_ZDQT_ZT, D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDR_CZZT","D_GS_BK_SQLX", "D_GS_ZDQT_FXDJ", "D_GS_ZDR_RYJB", "D_GS_ZDQT_LB", "D_GS_ZDR_BK_ZT", "D_GS_BQ_LX", "D_GS_ZDQT_ZT", "D_BZ_SF", "D_BZ_XB", "D_GS_XS_LY", "D_BZ_SSZT", "D_GS_XS_LX", "D_GS_XS_QTLX"); //获取字典数据
+const showzxs = ref(false);
+const queryFrom = ref({});
+const ids = ref([]);
+const choosList = ref([]);
+const show = ref(false);
+const chooseUserVisible = ref(false); //审批流程
+const roleIds = ref([]); //角色id
+const editFormDiloag = ref();
 const searchBox = ref(); //搜索框
-const userId = getItem("USERID");
-const MpvGroupInfoRef = ref(null);
-
-// 子导航激活状态
-const activeSubNav = ref("myAudit");
+const visible = ref(false);
+const visiblefp = ref(false);
+const zxsDilof = ref();
+const obj = ref({});
 const searchConfiger = ref([
   {
     label: "群体名称",
@@ -154,63 +146,59 @@ const searchConfiger = ref([
     placeholder: "请选择重点人人员级别",
     showType: "select",
     options: D_GS_ZDR_RYJB
+  },
+  {
+    label: "群体类别",
+    prop: "qtLb",
+    placeholder: "请选择群体类别",
+    showType: "select",
+    options: D_GS_ZDQT_LB
+  },
+  {
+    label: "布控状态",
+    prop: "zdrBkZt",
+    placeholder: "请输入布控装态",
+    showType: "select",
+    options: D_GS_ZDR_BK_ZT
+  },
+  {
+    label: "布控类型",
+    prop: "bkzt",
+    placeholder: "请输入布控类型",
+    showType: "select",
+    options: D_GS_BQ_LX
   }
 ]);
-const queryFrom = ref({});
-const userInfo = ref({});
+
 const pageData = reactive({
-  tableData: [], //表格数据
+  tableData: [],
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
-    showSelectType: "null",
+    showSelectType: "checkBox",
     loading: false
   },
   total: 0,
   pageConfiger: {
     pageSize: 20,
     pageCurrent: 1
-  }, //分页
-  controlsWidth: "240", //操作栏宽度
-
+  },
+  controlsWidth: 220,
   tableColumn: [
-    { label: "群体基本信息", prop: "jbxx", showSolt: true },
-    { label: "背景信息", prop: "bgxx", showSolt: true },
-    { label: "管控信息", prop: "gkxx", showSolt: true },
-    { label: "稳控人数", prop: "wkrs", showSolt: true, width: 80 },
+    { label: "群体基本信息", prop: "jbxx", showSolt: true,width:300 },
+    { label: "背景信息", prop: "bgxx", showSolt: true,width:300 },
+    { label: "管控信息", prop: "gkxx", showSolt: true,width:300 },
+    { label: "稳控人数", prop: "zdryList", showSolt: true },
     { label: "状态", prop: "qtZt", showSolt: true }
   ]
 });
+
 onMounted(() => {
   tabHeightFn();
-  getUserInfo();
-  getdepartmentList();
+  getList();
 });
 
-// 获取部门列表
-const getdepartmentList = () => {
-  selectUserDeptPage().then((res) => {
-    deptList.value = res?.records.map((item) => ({
-      label: item.deptName,
-      value: item.deptId
-    }));
-  });
-};
-const getUserInfo = async () => {
-  await qcckGet({}, `/mosty-base/sysUser/getUserInfo/${userId}`).then((res) => {
-    userInfo.value = res;
-    setItem("userInfo", res);
-    getList();
-  });
-};
 
-//选择类型
-const handleType = () => {
-  pageData.keyCount++;
-  pageData.pageConfiger.pageCurrent = 1;
-
-  getList();
-};
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
@@ -228,77 +216,93 @@ const changeSize = (val) => {
 };
 
 // 获取列表
-const getList = (val) => {
+const getList = () => {
   pageData.tableConfiger.loading = true;
-  let data = {
-    ...pageData.pageConfiger,
-    ...queryFrom.value,
-    [activeSubNav.value === "myAudit" ? "bkshrSfzh" : "bksprSfzh"]:
-      userInfo.value.idEntityCard
-  };
-  let url = "/mosty-gsxt/tbGsxtZdqt/selectPage";
-  qcckGet(data, url)
-    .then((res) => {
-      pageData.tableData = res.records || [];
-      pageData.total = res.total;
-      pageData.tableConfiger.loading = false;
-    })
-    .catch(() => {
-      pageData.tableConfiger.loading = false;
-    });
+  let data = { ...pageData.pageConfiger, ...queryFrom.value,qtZt:'02' };
+  qcckGet(data, "/mosty-gsxt/tbGsxtZdqt/selectPage").then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
 };
 
 // 详情
-const autoEdit = (type, row) => {
-  MpvGroupInfoRef.value.init(type, row);
+const addEdit = (type, row) => {
+  show.value = true;
+  visible.value = false;
+  nextTick(() => {
+    editFormDiloag.value.init(type, row);
+  });
+};
+
+const chooseData = (data) => {
+  ids.value = Array.isArray(data) ? data.map((item) => item.id) : [];
+  choosList.value = Array.isArray(data) ? data : [];
+};
+// 选择申请数据数据
+const handleApplication = () => {
+  if (ids.value.length === 0)return ElMessage.error("请先选择需要布控的重点群体");
+  qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdqt/addBksq").then(() => {
+    ElMessage.success("申请成功");
+    visible.value = false;
+    getList();
+  }).catch(() => {
+    ElMessage.error("布控申请失败");
+  });
+};
+
+const handleUserSelected = (val) => {
+  obj.value.fpmc = val[0].userName;
+  obj.value.fpid = val[0].id;
+};
+
+const handlefp = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要分配的重点群体");
+  qcckPost({ ids: ids.value, uid: obj.value.fpid },"/mosty-gsxt/tbGsxtZdqt/addGkmj").then(() => {
+    ElMessage.success("分配成功");
+    visible.value = false;
+    visiblefp.value = false;
+    getList();
+  }).catch(() => {
+    ElMessage.error("分配失败");
+  });
+};
+// 移交管控
+const handleMove = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要移交管控的重点群体");
+  proxy.$confirm("是否确定移交？", "警告", { type: "warning" }).then(() => {
+    qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdqt/addSfyj").then(() => {
+      ElMessage.success("移交管控成功");
+      getList();
+    }).catch(() => {
+      ElMessage.error("移交管控失败");
+    });
+  }).catch(() => { });
+};
+
+const handleZxs = () => {
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要转线索的重点群体");
+  showzxs.value = true;
+  nextTick(() => {
+    zxsDilof.value.init(choosList.value);
+  });
 };
 
 // 表格高度计算
 const tabHeightFn = () => {
-  pageData.tableHeight =
-    window.innerHeight - searchBox.value.offsetHeight - 260;
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
   window.onresize = function () {
     tabHeightFn();
   };
 };
+defineExpose({});
 </script>
 
-<style lang="scss" scoped>
-.main-nav {
-  padding: 16px;
-  background-color: #fff;
+<style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
 }
 
-.nav-btn {
-  margin-right: 10px;
-  border: none;
-  background: none;
-
-  &.active {
-    background-color: #409eff;
-    color: #fff;
-  }
-}
-
-.sub-nav {
-  background-color: #fff;
-  padding: 0 16px;
-}
-
-:deep(.el-tabs__header) {
-  margin-bottom: 0;
-}
-
-:deep(.el-tabs__nav-wrap::after) {
-  height: 1px;
-}
-
-.btns {
-  height: 52px;
-  padding: 10px;
-  box-sizing: border-box;
-}
-::v-deep .el-tabs__nav-wrap::after {
-  background: none;
-}
 </style>
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/TagSelectorDialogPeo.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/TagSelectorDialogPeo.vue
deleted file mode 100644
index 7443240..0000000
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/TagSelectorDialogPeo.vue
+++ /dev/null
@@ -1,406 +0,0 @@
-<template>
-  <el-dialog
-    :title="titleValue"
-    width="1500px"
-    :model-value="modelValue"
-    append-to-body
-    @close="closed"
-  >
-    <div class="table_class">
-      <div style="width: 48%">
-        <el-tabs v-model="activeTab" type="card" @tab-click="handleTabClick">
-          <el-tab-pane
-            v-for="tab in tabs"
-            :key="tab.dm"
-            :label="tab.label"
-            :name="tab.dm"
-          >
-            <!-- 添加 v-if 条件 -->
-            <template v-if="activeTab !== '03'">
-              <el-button
-                v-for="(it, idx) in props.dic.D_GS_BQ_LB"
-                :key="idx"
-                :type="type == it.zdmc ? 'success' : ''"
-                @click="chooseListType(it.zdmc)"
-              >
-                <span style="vertical-align: middle">{{ it.zdmc }}</span>
-              </el-button>
-            </template>
-            <el-table
-              v-loading="loading"
-              ref="multipleUserRef"
-              @selection-change="handleSelectionChange"
-              :data="tableData"
-              border
-              :row-key="keyid"
-              style="width: 100%"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-                :reserve-selection="true"
-              />
-              <el-table-column prop="bqMc" align="center" label="标签名称" />
-              <el-table-column prop="bqDm" align="center" label="标签代码" />
-              <el-table-column prop="bqZl" align="center" label="标签种类">
-                <template #default="{ row }">
-                  <DictTag
-                    :value="row.bqZl"
-                    :tag="false"
-                    :options="props.dic.D_GS_BQ_ZL"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column prop="bqLx" align="center" label="标签类型">
-                <template #default="{ row }">
-                  <DictTag
-                    :value="row.bqLx"
-                    :tag="false"
-                    :options="props.dic.D_GS_BQ_LX"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column prop="bqLb" align="center" label="标签类别">
-                <template #default="{ row }">
-                  <DictTag
-                    :value="row.bqLb"
-                    :tag="false"
-                    :options="props.dic.D_GS_BQ_LB"
-                  />
-                </template>
-              </el-table-column>
-            </el-table>
-            <div class="fenye">
-              <el-pagination
-                class="pagination"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="listQuery.current"
-                :page-sizes="[10, 20, 50, 100]"
-                :page-size="listQuery.size"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="total"
-              ></el-pagination>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
-      </div>
-
-      <div style="width: 48%">
-        <div class="selected-tabBox">
-          <el-table
-            :data="selectedData"
-            border
-            :row-key="keyid"
-            style="width: 100%"
-          >
-            <el-table-column prop="bqMc" align="center" label="标签名称" />
-            <el-table-column prop="bqDm" align="center" label="标签代码" />
-            <el-table-column prop="bqZl" align="center" label="标签种类">
-              <template #default="{ row }">
-                <DictTag
-                  :value="row.bqZl"
-                  :tag="false"
-                  :options="props.dic.D_GS_BQ_ZL"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column prop="bqLx" align="center" label="标签类型">
-              <template #default="{ row }">
-                <DictTag
-                  :value="row.bqLx"
-                  :tag="false"
-                  :options="props.dic.D_GS_BQ_LX"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column prop="bqLb" align="center" label="标签类别">
-              <template #default="{ row }">
-                <DictTag
-                  :value="row.bqLb"
-                  :tag="false"
-                  :options="props.dic.D_GS_BQ_LB"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column label="操作">
-              <template #default="{ row }">
-                <el-button
-                  type="danger"
-                  @click="handleRemoveFromSelectedData(row)"
-                  >移除</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div class="fenye">
-          <el-pagination
-            class="pagination"
-            @size-change="handleSizeChangeRight"
-            @current-change="handleCurrentChangeRight"
-            :current-page="listQuery.current"
-            :page-sizes="[10, 20, 50, 100]"
-            :page-size="listQuery.sizeRight"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="selectedData.length"
-          ></el-pagination>
-        </div>
-      </div>
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="closed">取消</el-button>
-        <el-button type="primary" @click="onComfirm">确认</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup>
-import { defineProps, ref, onMounted, nextTick } from "vue";
-import { qcckGet } from "@/api/qcckApi.js";
-
-const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    required: true
-  },
-  dic: {
-    type: Object,
-    default: () => {}
-  },
-  bqDl: {
-    type: String,
-    default: "01"
-  },
-  bqLx: {
-    type: String,
-    default: "01"
-  },
-  titleValue: {
-    type: String,
-    default: "选择大类"
-  },
-  LeaderType: {
-    type: String,
-    default: ""
-  },
-  // 是否单选
-  Single: {
-    type: Boolean,
-    default: false
-  },
-  roleIds: {
-    type: Array,
-    default: []
-  }
-});
-
-const tabs = ref([]);
-const activeTab = ref("");
-const total = ref(0);
-const listQuery = ref({
-  current: 1,
-  size: 20,
-  bqZl: activeTab.value
-});
-const loading = ref(false);
-const tableData = ref([]);
-const selectedData = ref([]);
-const multipleUserRef = ref(null);
-const emits = defineEmits(["update:modelValue", "chooseDate"]);
-const type = ref("标签大类");
-onMounted(() => {
-  tabs.value = props.dic.D_GS_BQ_ZL;
-  activeTab.value = tabs.value?.[0]?.dm || "01";
-  handleFilter();
-});
-// 选择列表的大类和细类
-const chooseListType = (val) => {
-  type.value = val;
-  listQuery.current = 1;
-  getDataList();
-};
-const closed = () => {
-  emits("update:modelValue", false);
-};
-
-const reset = () => {
-  listQuery.value = { current: 1, size: 20, bqZl: activeTab.value };
-  getDataList();
-};
-
-const keyid = (row) => {
-  return row.id;
-};
-
-// 为用户分配角色
-const onComfirm = () => {
-  emits("chooseDate", selectedData.value);
-  let data = { type: props.LeaderType, userList: selectedData.value };
-  emits("chooseDateLeader", data);
-  closed();
-};
-//数据回显
-const setValues = (list) => {
-  selectedData.value = list.map((item) => {
-    // 统一id字段处理逻辑
-    if (item.bqId) {
-      return { ...item, id: item.bqId };
-    }
-
-    return item;
-  });
-
-  nextTick(() => {
-    multipleUser();
-  });
-};
-/**
- * pageSize 改变触发
- */
-const handleSizeChange = (currentSize) => {
-  listQuery.value.size = currentSize;
-  getDataList();
-};
-
-/**
- * 页码改变触发
- */
-const handleCurrentChange = (currentPage) => {
-  listQuery.value.current = currentPage;
-  getDataList();
-};
-
-// 查询标签组合列表
-const getDataList = () => {
-  listQuery.value.bqZl = activeTab.value;
-  loading.value = true;
-  //根据顶部标签切换不同的接口
-  let url =
-    activeTab.value == "01"
-      ? "/mosty-gsxt/tbGsxtBqgl/selectPage"
-      : activeTab.value == "02"
-      ? "/mosty-gsxt/tbGsxtBqgl/selectPage"
-      : "/mosty-gsxt/tbGsxtBqzh/selectPage";
-  let params = {};
-  console.log(activeTab.value, "activeTab.value");
-  if (activeTab.value === "01") {
-    params.bqLx = "01";
-  } else if (activeTab.value === "02") {
-    params.bqLx = "02";
-  } // activeTab.value 等于 "03" 时不传递参数
-  if (type.value === "标签大类") {
-    params.bqLb = "01";
-  } else if (type.value === "标签细类") {
-    params.bqLb = "02";
-  }
-  qcckGet(params, url).then((res) => {
-    // 添加 bqZl 字段
-    tableData.value = res?.records?.map((item) => ({
-      bqDm: item.bqDm,
-      bqId: item.id ? item.id : item.bqId ? item.bqId : row.bqDlId,
-      bqLb: item.bqLb,
-      bqLx: item.bqLx,
-      bqMc: item.bqMc,
-      bqZl: activeTab.value
-    }));
-    total.value = Number(res.total);
-    loading.value = false;
-    //确保在这里调用 multipleUser
-    multipleUser();
-  });
-};
-
-// 修改 multipleUser 函数
-function multipleUser() {
-  nextTick(() => {
-    if (multipleUserRef.value && tableData.value.length > 0) {
-      tableData.value.forEach((item) => {
-        if (selectedData.value.some((selected) => selected.bqId == item.bqId)) {
-          // 因为 multipleUserRef 是数组，需要确定正确的索引
-          // 如果你只有一个表格，可以使用 [0]
-          multipleUserRef.value[0]?.toggleRowSelection(item, true);
-        }
-      });
-    }
-  });
-}
-
-const handleFilter = () => {
-  listQuery.value.current = 1;
-
-  getDataList();
-};
-
-const handleTabClick = () => {
-  reset();
-};
-
-const handleAddToSelectedData = (row) => {
-  console.log(row, selectedData.value, "handleAddToSelectedData row");
-  if (selectedData.value.some((item) => item.bqId === row.bqId)) {
-    return;
-  }
-  if (props.Single && selectedData.value.length > 0) {
-    selectedData.value = [];
-  }
-  selectedData.value.push({
-    bqDm: row.bqDm,
-    bqId: row.id ? row.id : row.bqId ? row.bqId : row.bqDlId,
-    bqLb: row.bqLb,
-    bqLx: row.bqLx,
-    bqMc: row.bqMc,
-    bqZl: activeTab.value
-  });
-};
-
-const handleRemoveFromSelectedData = (row) => {
-  const index = selectedData.value.findIndex((item) => item.bqId === row.bqId);
-  if (index !== -1) {
-    selectedData.value.splice(index, 1);
-  }
-  // 取消左侧表格中对应行的选中状态
-  multipleUserRef.value.toggleRowSelection(row, false);
-};
-
-const multipleSelectionUser = ref([]);
-const handleSelectionChange = (val) => {
-  multipleSelectionUser.value = val;
-  multipleSelectionUser.value.forEach((row) => {
-    handleAddToSelectedData(row);
-  });
-};
-// 必须暴露方法父组件才能调用
-defineExpose({
-  setValues
-});
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/css/layout.scss";
-@import "@/assets/css/element-plus.scss";
-
-.selected-tabBox {
-  margin-top: 56px;
-}
-</style>
-
-<style>
-.tabBoxRadio .el-checkbox__inner {
-  border-radius: 50% !important;
-}
-.tabBoxRadio .el-table__header-wrapper .el-checkbox {
-  display: none;
-}
-:deep(.el-dialog) {
-  background: #fff !important;
-  border-radius: 8px !important;
-  /* 其他样式 */
-}
-.table_class {
-  display: flex;
-  justify-content: space-between;
-}
-</style>
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue
index ffb52d5..70ed5d5 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue
@@ -1,474 +1,224 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">重点群体管理 </span>
+      <span class="title">{{ title }} 重点群体管理 </span>
       <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
+        <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button>
       </div>
     </div>
     <div class="form_cnt">
-      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
-        <template #qtXx>
-          <el-divider content-position="left">群体信息</el-divider>
-        </template>
-        <template #qtGlXx>
-          <el-divider content-position="left">群体管理信息</el-divider>
-        </template>
-        <template #spXx>
-          <el-divider content-position="left">审批信息</el-divider>
-          <ApprovalInfo ref="approvalInfoRef" />
-        </template>
-        <template #xzRy>
-          <div class="btns">
-            <el-button type="primary" @click="handleAddEdit('add', '')">新增</el-button>
-            <el-button type="primary" @click="selectionAdd()">选择重点人员</el-button>
-          </div>
-          <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :key="pageData.keyCount"
-            :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth" @chooseData="chooseData">
-            <template #ryxx="{ row }">
-              <div>
-                <img src="" alt="" />
-                <ul>
-                  <li>姓名：{{ row.rySfzh }}</li>
-                  <li class="rowClass">
-                    性别：
-                    <DictTag :tag="false" :value="row.ryXb" :options="D_BZ_XB" />
-                  </li>
-                  <li class="rowClass">
-                    籍贯：
-                    <DictTag :tag="false" :value="row.ryJg" :options="D_BZ_XZQHDM" />
-                  </li>
-                  <li>身份证：{{ row.rySfzh }}</li>
-                  <li>出生日期：{{ row.ryCsrq }}</li>
-                  <li class="rowClass">
-                    民族：
-                    <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
-                  </li>
-                </ul>
-              </div>
-              <div class="flex">
-                <el-button type="primary" size="small"> 涉恐人员</el-button>
-                <el-button type="primary" size="small"> 涉稳人员</el-button>
-                <el-button type="primary" size="small"> 在逃人员</el-button>
-              </div>
-            </template>
-            <template #jzxx="{ row }">
-              <div class="rowClass">
-                户籍地区划：
-                <DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" />
-              </div>
-              <div>户籍派出所：{{ row.hjdPcsmc }}</div>
-              <div>户籍地详址：{{ row.hjdXz }}</div>
-            </template>
-            <template #gxdw="{ row }">
-              <div>管辖单位：{{ row.gxSsbmmc }}</div>
-              <div class="rowClass">
-                人员级别：
-                <DictTag :tag="false" :value="row.zdrRyjb" :options="D_GS_ZDR_RYJB" />
-              </div>
-              <div>管控原因：{{ zdrLkyy }}</div>
-              <div class="rowClass">
-                管控状态：
-                <DictTag :tag="false" :value="row.zdrBkZt" :options="D_GS_ZDR_BK_ZT" />
-              </div>
-            </template>
-            <template #zdrCzzt="{ row }">
-              <DictTag :tag="false" :value="row.zdrCzzt" :options="D_GS_ZDR_CZZT" />
-            </template>
-            <template #xtSjzt="{ row }">
-              <div>
-                {{
-                  row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存"
-                }}
-              </div>
-            </template>
-            <template #controls="{ row, index }">
-              <el-button size="small" type="primary" @click="handleAddEdit('edit', row)" link>编辑</el-button>
-              <el-button size="small" type="danger" @click="deleteData(index)" link>删除</el-button>
-            </template>
-          </MyTable>
-        </template>
-        <template #bqInfo>
-          <el-divider content-position="left">标签信息</el-divider>
-        </template>
-        <!-- 人员标签模型-->
+       <FormMessage :disabled="disabled" v-model="listQuery" labelWidtth="" :formList="formData" labelWidth="120px" ref="elform" :rules="rules">
         <template #bqList>
-          <el-button @click="open('01')">选择</el-button>
-          <div class="boxlist">
-            <MyTable :tableData="tableDate.bqList" :tableColumn="tableDate.tableColumn"
-              :tableHeight="tableDate.tableHeight" :key="tableDate.keyCount" :tableConfiger="tableDate.tableConfiger"
-              :controlsWidth="tableDate.controlsWidth">
-              <template #bqLb="{ row }">
-                <DictTag :value="row.bqLb" :tag="false" :options="D_GS_BQ_LB" />
-              </template>
-              <template #bqLx="{ row }">
-                <DictTag :value="row.bqLx" :tag="false" :options="D_GS_BQ_LX" />
-              </template>
-              <template #bqZl="{ row }">
-                <DictTag :value="row.bqZl" :tag="false" :options="D_GS_BQ_ZL" />
-              </template>
-              <!-- 操作 -->
-              <template #controls="{ row }">
-                <el-link type="danger" @click="delDictItem(row.bqId)">删除</el-link>
-              </template>
-            </MyTable>
-          </div>
-        </template>
-
-        <!-- 两群采集录入-->
+          <div class="marks pointer" @click="chooseMarksVisible = true">
+            <span style="color: rgb(175 178 184);padding-left: 10px;" v-if="!listQuery.bqList || listQuery.bqList.length == 0 ">请选择标签</span>
+            <span v-else >
+              <el-tag @close.stop="closeTag(idx)" type="success" closable v-for="(it,idx) in listQuery.bqList" :key="idx">{{ it.bqMc }}</el-tag >
+            </span>
+        </div>
+        </template>  
         <template #lqxxList>
-          <el-button @click="openDialog('01')">新增</el-button>
-          <div class="boxlist">
-            <MyTable :tableData="tableDate.lqxxList" :tableColumn="tableDate.tableLqColumn"
-              :tableHeight="tableDate.tableHeight" :key="tableDate.keyCount" :tableConfiger="tableDate.tableConfiger"
-              :controlsWidth="tableDate.controlsWidth">
-              <!-- 操作 -->
-              <template #controls="{ row, index }">
-                <el-link type="danger" @click="delDictItem(index)">删除</el-link>
-              </template>
-            </MyTable>
+          <div class="ww100">
+            <div class="ww100 mb10"><el-button type="primary" @click="handleCjlr('add',null)">新增</el-button></div>
+            <div style="width:99.5%">
+              <MyTable
+                :tableData="listQuery.lqxxList"
+                :tableColumn="pageData.qcjListColumn"
+                :key="pageData.keyCountCj"
+                :tableConfiger="pageData.qcjConfiger"
+                :controlsWidth="pageData.controlsWidth">
+                <template #controls="{ row }">
+                  <el-link type="danger" @click="delDictItem(row.bqId)">删除</el-link>
+                </template>
+              </MyTable>
+            </div>
           </div>
         </template>
-      </FormMessage>
+       </FormMessage>
+      <div><span class="mr10">管理重点人 : </span><el-button @click="chooseVisible_RY = true" type="primary" >选择</el-button></div>
+      <div class="boxlist">
+        <MyTable
+          :tableData="listQuery.zdryList"
+          :tableColumn="pageData.zdryColumn"
+          :key="pageData.keyCount"
+          :tableConfiger="pageData.tableConfiger"
+          :controlsWidth="pageData.controlsWidth">
+          <template #ryXb	="{ row }">
+            <DictTag :value="row.ryXb	" :tag="false" :options="props.dic.D_BZ_XB" />
+          </template>
+          <template #controls="{ row }">
+            <el-link type="danger" @click="deleteRow(row)">删除</el-link>
+          </template>
+        </MyTable>
+      </div>
     </div>
-    <!-- 列表弹窗 -->
-    <DialogList :Single="false" :roleIds="roleIds" v-if="chooseShow" @chooseDate="chooseDate" :titleValue="chooseTitle"
-      v-model="chooseShow" :bqLx="chooseType" bqDl="02"></DialogList>
-    <addFormPeo ref="addFormDiloag" @chooseDate="addFormPeoDate" @handleEditDate="handleEditDate" />
-
-    <selectionList :Single="false" :roleIds="selectroleId" v-if="selectionValue" @chooseDate="chooseSelectDate"
-      :titleValue="chooseTitle" v-model="selectionValue">
-    </selectionList>
-    <!-- 列表弹窗 -->
-    <TagSelectorDialog v-model="choose" ref="tagDialog" @chooseDate="handleTagSelect"
-      :dic="{ D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX }" />
   </div>
+  <!-- 采集录入 -->
+  <Addcjlr ref="cjlrDialog" @change="addEdteCj"></Addcjlr>
+  <!-- 标签选择 -->
+  <ChooseMarks v-model="chooseMarksVisible" @choosed="addMarks" :roleIds="roleIds" />
+  <!-- 选择布控人员 -->
+  <BkryDialod v-model="chooseVisible_RY" @choosed="choosedPeo" @choosedAdd="choosedAdd" :roleIds="roleIds_RY" />
 </template>
 
 <script setup>
+import Addcjlr from './addcjlr.vue'
+import BkryDialod from '@/components/ChooseList/ChooseZdr/index.vue';
+import ChooseMarks from "@/components/ChooseList/ChooseMarks/index.vue";
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
-import DialogList from "./dialogList.vue";
-import selectionList from "./selectionList.vue";
-import addFormPeo from "./addFormPeo.vue";
-import ApprovalInfo from "./approvalInfo.vue";
-import TagSelectorDialog from "./TagSelectorDialogPeo.vue";
-import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-
-import {
-  ref,
-  defineExpose,
-  reactive,
-  onMounted,
-  defineEmits,
-  getCurrentInstance,
-  nextTick
-} from "vue";
+import { qcckGet, qcckPost } from "@/api/qcckApi.js";
+import {ref,defineExpose,reactive,onMounted,defineEmits,getCurrentInstance } from "vue";
+const { proxy } = getCurrentInstance();
 const emit = defineEmits(["updateDate"]);
 const props = defineProps({
   dic: Object
 });
-const { proxy } = getCurrentInstance();
-const {
-  D_BZ_SF,
-  D_GS_ZDQT_FXDJ,
-  D_GS_ZDQT_LB,
-  D_BZ_XB,
-  D_GS_ZDR_RYJB,
-  D_BZ_MZ,
-  D_BZ_XZQHDM,
-  D_GS_ZDR_BK_ZT,
-  D_GS_ZDR_CZZT,
-  D_GS_BQ_ZL,
-  D_GS_BQ_LB,
-  D_GS_BQ_LX
-} = proxy.$dict(
-  "D_BZ_SF",
-  "D_GS_ZDQT_FXDJ",
-  "D_GS_ZDQT_LB",
-  "D_BZ_XB",
-  "D_GS_ZDR_RYJB",
-  "D_BZ_MZ",
-  "D_BZ_XZQHDM",
-  "D_GS_ZDR_BK_ZT",
-  "D_GS_ZDR_CZZT",
-  "D_GS_BQ_ZL",
-  "D_GS_BQ_LB",
-  "D_GS_BQ_LX"
-); //获取字典数据
-const dialogTitle = ref("新增信息"); //弹窗标题
-const tagDialog = ref();
-
-const roleIds = ref([]); //选择角色
-const selectroleId = ref([]); //选择角色
-const approvalInfoRef = ref(null);
-
+const cjlrDialog = ref()
+const chooseMarksVisible = ref(false)
+const chooseVisible_RY = ref(false)
+const roleIds = ref([])
+const roleIds_RY = ref([])
+const addPerson = ref([]) //单独新增的数据
 const dialogForm = ref(false); //弹窗
-const formRef = ref();
-const activeName = ref("first");
+const rules = reactive({
+  qtMc: [{ required: true, message: "请输入群体名称", trigger: "blur" }],
+  qtFxdj: [{ required: true, message: "请选择风险等级", trigger: "qtFxdj" }],
+  qtLb: [{ required: true, message: "请选择群体类别", trigger: "qtFxdj" }],
+  qtClsj: [{ required: true, message: "请选择群体成立时间", trigger: "qtFxdj" }],
+  bqList: [{ required: true, message: "请选择群体标签", trigger: "qtFxdj" }],
+  zdrLkyy: [{ required: true, message: "请输入列控原因", trigger: "blur" }],
+});
 const formData = ref([
-  { prop: "qtXx", type: "slot", width: "100%" },
   { label: "群体名称", prop: "qtMc", type: "input" },
-  { label: "群体别名", prop: "qtBm", type: "input" },
-  { label: "群体简称", prop: "qtJc", type: "input" },
-  { label: "群体类别", prop: "qtLb", type: "select", options: D_GS_ZDQT_LB },
-  { label: "成立时间", prop: "qtClsj", type: "date", lx: "datetime" },
-  { label: "风险等级", prop: "qtFxdj", type: "select", options: D_GS_ZDQT_FXDJ },
-  { label: "背景资料", prop: "qtBjzl", type: "input" },
+  { label: "风险等级", prop: "qtFxdj", type: "select", options: props.dic.D_GS_ZDQT_FXDJ },
+  { label: "群体类别", prop: "qtLb", type: "select", options: props.dic.D_GS_ZDQT_LB },
+  { label: "群体成立时间", prop: "qtClsj", type: "date" },
+  { label: "群体标签", prop: "bqList", type: "slot", width: "100%" },
   { label: "两群采集录入", prop: "lqxxList", type: "slot", width: "100%" },
-  { label: "", prop: "qtGlXx", type: "slot", width: "100%" },
-  { label: "管辖单位", prop: "gxSsdwmc", type: "input" },
-  { label: "联系人", prop: "gkMjXm", type: "input" },
-  { label: "联系方式", prop: "gkMjLxfs", type: "input" },
-  { label: "", prop: "xzRy", type: "slot", width: "100%" },
-  { label: "", prop: "spXx", type: "slot", width: "100%" },
-  { label: "", prop: "bqInfo", type: "slot", width: "100%" },
-  { label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
+  { label: "管辖单位", prop: "gxSsbmdm", type: "department" },
+  { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
+  { label: "入库截至时间", prop: "zdrRkjssj", type: "datetime" },
+  { label: "列控原因", prop: "zdrLkyy", type: "textarea",width: "100%" },
 ]);
-//人员信息
 const pageData = reactive({
-  tableData: [], //表格数据
-  rykeyCount: 0,
+  keyCountCj: 0,
+  keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
     showSelectType: "checkBox",
     loading: false,
-    size: "small",
-    border: false
   },
-  total: 0,
-  pageConfiger: {
-    pageSize: 20,
-    pageCurrent: 1
-  }, //分页
-  controlsWidth: 220, //操作栏宽度
-  tableColumn: [
-    { label: "重点人员信息", prop: "ryxx", showSolt: true },
-    { label: "户籍居住信息", prop: "jzxx", showSolt: true },
-    { label: "管辖单位", prop: "gxdw", showSolt: true },
-    { label: "处置状态", prop: "zdrCzzt", showSolt: true },
-    { label: "状态", prop: "xtSjzt", showSolt: true }
-  ]
-});
-
-const addFormDiloag = ref();
-//两群信息表格，重点人标签表格
-const tableDate = reactive({
-  lqxxList: [], //两群信息表格数据
-  bqList: [], //标签表格数据
-  tableConfiger: {
-    rowHieght: 30,
+  qcjConfiger: {
+    rowHieght: 61,
     showSelectType: "null",
     loading: false,
-    haveControls: false,
-    showIndex: false
   },
-  tableHeight: 200,
-  tableLqColumn: [
-    { label: "微信群", prop: "wxqId" },
-    {
-      label: "QQ群",
-      prop: "qqqId"
-    },
-    { label: "群主昵称", prop: "qzNc" },
-    { label: "群主姓名", prop: "qzXm" },
-    { label: "联系人电话", prop: "qzLxdh" },
-    { label: "群重要内容", prop: "qZynr" },
-    { label: "操作", prop: "controls", showSolt: true }
+  controlsWidth: 220, //操作栏宽度
+  zdryColumn: [
+    { label: "姓名", prop: "ryXm"},
+    { label: "性别", prop: "ryXb", showSolt: true },
+    { label: "身份证号 ", prop: "rySfzh"},
+    { label: "户籍地", prop: "hjdXz" },
+    { label: "现居地", prop: "xzdXz"},
+    { label: "手机号", prop: "ryLxdh"},
   ],
-  tableColumn: [
-    { label: "标签名称", prop: "bqMc" },
-    { label: "标签代码", prop: "bqDm" },
-    { label: "标签种类", prop: "bqZl", showSolt: true },
-    { label: "标签类型", prop: "bqLx", showSolt: true },
-    { label: "标签类别", prop: "bqLb", showSolt: true }
+  qcjListColumn:[
+     { label: "微信群", prop: "wxqId" },
+     { label: "QQ群", prop: "qqqId" },
+     { label: "群主昵称", prop: "qzNc" },
+     { label: "群主姓名", prop: "qzXm" },
+     { label: "群主联系电话", prop: "qzLxdh" },
+     { label: "群重要内容", prop: "qZynr" },
   ]
 });
-const chooseShow = ref(false); //选择弹窗
-
-const chooseType = ref(""); //选择类型
-const chooseTitle = ref(""); //选择弹窗标题
-const dialogList = ref(null); //选择弹窗实例
-const currentEditIndex = ref(null);
-const listQuery = ref({
-  sfbqdj: []
-}); //表单
+const disabled = ref(false)
+const listQuery = ref({}); //表单
 const loading = ref(false);
-const selectionValue = ref(false);
 const elform = ref();
 const title = ref("");
-const rules = reactive({
-  xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }]
-});
-const editpeo = ref();
 onMounted(() => { });
 // 初始化数据
 const init = async (type, row) => {
   dialogForm.value = true;
-  await nextTick(); // 等待子组件挂载
-  title.value = type == "add" ? "新增" : "编辑";
-  if (row) getDataById(row.id);
-  if (type === "edit" && row) {
-    addFormDiloag.value?.setFormData?.(row); // 回显布控信息
-    approvalInfoRef.value?.setFormData?.(row); // 回显审批信息
-  } else {
-    // 如果是新增模式，清空表单（可选）
-    addFormDiloag.value?.resetForm?.();
-    approvalInfoRef.value?.resetForm?.();
-  }
+  title.value = type == "add" ? "新增" :  type == 'detail' ?  '详情':"编辑";
+  if(row) getDataById(row.id)
 };
 
-const handleTagSelect = (selectedTags) => {
-  tableDate.bqList = selectedTags.map((item) => ({
-    bqDm: item.bqDm || "",
-    bqId: item.bqId || "",
-    bqLb: item.bqLb || "",
-    bqLx: item.bqLx || "",
-    bqMc: item.bqMc || "",
-    bqZl: item.bqZl || ""
-  }));
-  listQuery.value.bqList = tableDate.bqList;
-  // 每个标签包含: bqDm, bqId, bqLb, bqLx, bqMc, bqZl 属性
-};
 // 根据id查询详情
 const getDataById = (id) => {
   qcckGet({}, "/mosty-gsxt/tbGsxtZdqt/selectVoById/" + id).then((res) => {
     listQuery.value = res;
-    pageData.tableData = res.zdryList;
-    tableDate.lqxxList = res.lqxxList;
-    tableDate.bqList = res.bkdxList;
   });
 };
-const handleAddEdit = (type, row) => {
-  addFormDiloag.value.init(type, row);
-  dialogTitle.value = "新增信息";
-};
-const selectionAdd = () => {
-  selectionValue.value = true;
-};
-// 打开弹窗
-const openDialog = (type) => {
-  chooseShow.value = true;
-  chooseType.value = type;
-  chooseTitle.value = "请录入两群信息";
-};
 
-// 打开弹窗
-const open = (type) => {
-  choose.value = true;
-  nextTick(() => {
-    tagDialog.value.setValues(listQuery.value.bqList);
+// 采集录入
+const handleCjlr = (type,row) =>{
+  cjlrDialog.value.init(type,row);
+}
+
+const addEdteCj = (val) =>{
+  if(!listQuery.value.lqxxList) listQuery.value.lqxxList = [];
+  listQuery.value.lqxxList.unshift(val.data);
+  pageData.keyCountCj++;
+}
+
+// 新增标签
+const addMarks =  (val) =>{
+  listQuery.value.bqList = val.map(v=>{
+    return { bqDm:v.bqDm, bqId:v.id, bqLb:v.bqLb, bqLx:v.bqLx, bqMc:v.bqMc }
   });
-};
-// 选择数据
-const chooseDate = (data) => {
-  tableDate.lqxxList.push(data);
-  chooseShow.value = false;
-};
+  roleIds.value = val.map(v=>v.id)
+}
 
-//重点人员新增
-const addFormPeoDate = (data) => {
-  console.log(data, "选择的数据");
-  pageData.tableData.push(data);
-  addFormDiloag.value.close();
-};
+// 删除数据
+const closeTag = (idx) =>{
+  listQuery.value.bqList.splice(idx,1)
+  roleIds.value.splice(idx,1)
+}
 
-//编辑数据
-const handleEditDate = (editedData) => {
-  const index = pageData.tableData.findIndex(
-    (item) => item.rySfzh === editedData.rySfzh // 用身份证号匹配
-  );
-  console.log(index, "编辑索引");
-  if (index !== -1) {
-    pageData.tableData[index] = { ...editedData };
-  }
-  addFormDiloag.value.close();
-};
-// 选择数据
-const chooseSelectDate = (data) => {
-  pageData.tableData.push(...data);
-  selectionValue.value = false;
-};
+// 选择人员
+const choosedPeo = (val) =>{
+  roleIds_RY.value = val.map(it=>it.id);
+  let arr = val.map(item=>{
+      let bqArr = item.bqList || [];
+      let bqs = bqArr.map(v=>{
+        return { bqZl:v.bqZl , bqId:v.bqId, bqLx:v.bqLx, bqLb:v.bqLb, bqMc:v.bqMc, bqDm:v.bqDm }
+      })
+      return { id:item.id, fjZp:item.fjZp, ryXm:item.ryXm, ryXb:item.ryXb, rySfzh:item.rySfzh, hjdXz:item.hjdXz, xzdXz:item.xzdXz, ryLxdh:item.ryLxdh, qtXnsf:item.qtXnsf,clCjh:item.clCjh, clCph:item.clCph, qtTzms:item.qtTzms, bqList:bqs }
+  })
+  listQuery.value.zdryList = [...addPerson.value,...arr]; 
+  pageData.keyCount++;
+}
+
+// 单独新增的数据
+const choosedAdd = (item) =>{
+  let obj = { id:item.id, fjZp:item.fjZp, ryXm:item.ryXm, ryXb:item.ryXb, rySfzh:item.rySfzh, hjdXz:item.hjdXz, xzdXz:item.xzdXz, ryLxdh:item.ryLxdh, qtXnsf:item.qtXnsf,clCjh:item.clCjh, clCph:item.clCph, qtTzms:item.qtTzms, bqList:item.bqList }
+  addPerson.value.push(obj) ;//缓存的数据
+  if(!listQuery.value.zdryList) listQuery.value.zdryList = [];
+  listQuery.value.zdryList.unshift(obj);
+}
+
+// 删除数据
+const deleteRow = (row) => {
+  roleIds_RY.value = roleIds_RY.value.filter(id => id != row.id);
+  addPerson.value = addPerson.value.filter(it => it.id != row.id);
+  listQuery.value.zdryList = listQuery.value.zdryList.filter(it => it.id != row.id);
+}
 
-//删除两群信息
-const delDictItem = (index) => {
-  tableDate.lqxxList.splice(index, 1);
-};
 
-const submitForm = () => {
-  // 正确调用子组件的submit方法
-  formRef.value.submit(
-    // 成功回调
-    (validData) => {
-      // 处理编辑情况
-      if (dialogTitle.value === "编辑信息") {
-        // 确保 currentEditIndex 有效
-        if (
-          currentEditIndex.value >= 0 &&
-          currentEditIndex.value < pageData.tableData.length
-        ) {
-          pageData.tableData[currentEditIndex.value] = {
-            ...pageData.tableData[currentEditIndex.value],
-            gkMjXm: validData.gkMjXm,
-            ryXb: validData.ryXb,
-            rySfzh: validData.rySfzh,
-            hjdXz: validData.hjdXz,
-            xzdXz: validData.xzdXz,
-            gkMjLxfs: validData.gkMjLxfs,
-            clCph: validData.clCph,
-            clCjh: validData.clCjh,
-            qtTxzh: validData.qtTxzh,
-            bkLx: validData.bkLx,
-            bkLx: validData.bkLx,
-            fjZp: validData.fjZp
-          };
-        } else {
-          console.error("无效的编辑索引:", currentEditIndex.value);
-        }
-      }
-      // 处理新增情况
-      else {
-        pageData.tableData.push(validData);
-      }
-      //赋值子组件数据传递给父组件
-      listQuery.value.bkdxList = pageData.tableData;
-      // 关闭弹窗并重置表单
-      addFormDiloag.value = false;
-    },
-    // 错误回调（可选）
-    (errors) => {
-      console.error("表单验证失败:", errors);
-      ElMessage.error("请检查表单填写是否正确");
-    }
-  );
-};
-// 根据索引删除数据
-const deleteData = (index) => {
-  pageData.tableData.splice(index, 1);
-};
 // 提交
 const submit = () => {
   elform.value.submit((data) => {
-    const { formData } = approvalInfoRef.value?.getFormData?.();
-
-    const params = {
-      ...(formData || {}), // 如果 formData 是 null/undefined，默认空对象
-      ...(data || {}), // 如果 data 是 null/undefined，默认空对象
-      zdryList: pageData.tableData,
-      lqxxList: tableDate.lqxxList
-    };
-    let url =
-      title.value == "新增"
-        ? "/mosty-gsxt/tbGsxtZdqt/save"
-        : "/mosty-gsxt/tbGsxtZdqt/update";
-    qcckPost(params, url)
-      .then((res) => {
-        proxy.$message({ type: "success", message: title.value + "成功" });
-        emit("updateDate");
-        close();
-      })
-      .catch(() => { });
+    let params = { ...data }
+    loading.value = true;
+    let url = title.value == "新增" ? "/mosty-gsxt/tbGsxtZdqt/save" : "/mosty-gsxt/tbGsxtZdqt/update";
+    qcckPost(params, url).then(() => {
+      loading.value = false;
+      proxy.$message({ type: "success", message: title.value + "成功" });
+      emit("updateDate");
+      close();
+    }).catch(() => { loading.value = false;});
   });
 };
 
@@ -485,20 +235,16 @@ defineExpose({ init });
 @import "~@/assets/css/layout.scss";
 @import "~@/assets/css/element-plus.scss";
 
-::v-deep .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
-  color: #0072ff;
-  background: rgba(0, 114, 255, 0.3);
-}
-
 .boxlist {
   width: 99%;
-  height: 225px;
   margin-top: 10px;
   overflow: hidden;
 }
-
-.btns {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
+.marks{
+  width: 100%;
+  min-height: 32px;
+  border: 1px solid #e9e9e9;
+  border-radius: 4px;
 }
+
 </style>
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addFormPeo.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addFormPeo.vue
deleted file mode 100644
index 9bad082..0000000
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addFormPeo.vue
+++ /dev/null
@@ -1,460 +0,0 @@
-<template>
-  <div class="dialog" v-if="dialogForm">
-    <div class="head_box">
-      <span class="title">{{ title }}重点人管理</span>
-      <div>
-        <el-button
-          type="primary"
-          size="small"
-          :loading="loading"
-          @click="submit"
-          >保存</el-button
-        >
-        <el-button size="small" @click="close">关闭</el-button>
-      </div>
-    </div>
-    <div class="form_cnt">
-      <FormMessage
-        v-model="listQuery"
-        :formList="formData"
-        ref="elform"
-        :rules="rules"
-      >
-        <template #basic>
-          <el-divider content-position="left">基础管理</el-divider>
-        </template>
-        <template #address>
-          <el-divider content-position="left">地址信息</el-divider>
-        </template>
-        <template #jurisdiction>
-          <el-divider content-position="left">管辖信息</el-divider>
-        </template>
-        <template #status>
-          <el-divider content-position="left">状态信息</el-divider>
-        </template>
-        <template #bqInfo>
-          <el-divider content-position="left">标签信息</el-divider>
-        </template>
-        <!-- 人员标签模型-->
-        <template #bqList>
-          <el-button @click="openDialog('01')">选择</el-button>
-          <div class="boxlist">
-            <MyTable
-              :tableData="tableDate.bqList"
-              :tableColumn="tableDate.tableColumn"
-              :tableHeight="tableDate.tableHeight"
-              :key="tableDate.keyCount"
-              :tableConfiger="tableDate.tableConfiger"
-              :controlsWidth="tableDate.controlsWidth"
-            >
-              <template #bqLb="{ row }">
-                <DictTag :value="row.bqLb" :tag="false" :options="D_GS_BQ_LB" />
-              </template>
-              <template #bqLx="{ row }">
-                <DictTag :value="row.bqLx" :tag="false" :options="D_GS_BQ_LX" />
-              </template>
-              <template #bqZl="{ row }">
-                <DictTag :value="row.bqZl" :tag="false" :options="D_GS_BQ_ZL" />
-              </template>
-              <!-- 操作 -->
-              <template #controls="{ row }">
-                <el-link type="danger" @click="delDictItem(row.bqId)"
-                  >删除</el-link
-                >
-              </template>
-            </MyTable>
-          </div>
-        </template>
-
-        <!-- 管辖单位 -->
-        <template #gxSsbmdm>
-          <el-select
-            v-model="listQuery.gxSsbmdm"
-            placeholder="请选择管辖单位"
-            style="width: 240px"
-            @change="handleDeptChange('gxSsbmmc', $event)"
-          >
-            <el-option
-              v-for="item in deptList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value.toString()"
-            />
-          </el-select>
-        </template>
-        <!-- 户籍派出所 -->
-        <template #hjdPcsdm>
-          <el-select
-            v-model="listQuery.hjdPcsdm"
-            placeholder="请选择户籍派出所"
-            style="width: 240px"
-            @change="handleDeptChange('hjdPcsmc', $event)"
-          >
-            <el-option
-              v-for="item in deptList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value.toString()"
-            />
-          </el-select>
-        </template>
-        <!-- 诉求单位 -->
-        <template #sqSsbmdm>
-          <el-select
-            v-model="listQuery.sqSsbmdm"
-            placeholder="请选择户籍派出所"
-            style="width: 240px"
-            @change="handleDeptChange('sqSsbmmc', $event)"
-          >
-            <el-option
-              v-for="item in deptList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value.toString()"
-            />
-          </el-select>
-        </template>
-        <!-- 现住地派出所 -->
-        <template #xzdPcsdm>
-          <el-select
-            v-model="listQuery.xzdPcsdm"
-            placeholder="请选择现住地派出所"
-            style="width: 240px"
-            @change="handleDeptChange('xzdPcsmc', $event)"
-          >
-            <el-option
-              v-for="item in deptList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value.toString()"
-            />
-          </el-select>
-        </template>
-        <!-- 责任单位 -->
-        <template #zrSsbmdm>
-          <el-select
-            v-model="listQuery.zrSsbmdm"
-            placeholder="请选择责任单位"
-            style="width: 240px"
-            @change="handleDeptChange('zrSsbmmc', $event)"
-          >
-            <el-option
-              v-for="item in deptList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value.toString()"
-            />
-          </el-select>
-        </template>
-      </FormMessage>
-      <!-- 列表弹窗 -->
-      <TagSelectorDialog
-        v-model="chooseShow"
-        ref="tagDialog"
-        @chooseDate="handleTagSelect"
-        :dic="{ D_GS_BQ_ZL, D_GS_BQ_LB, D_GS_BQ_LX }"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup>
-import MyTable from "@/components/aboutTable/MyTable.vue";
-import FormMessage from "@/components/aboutTable/FormMessage.vue";
-import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-import TagSelectorDialog from "./TagSelectorDialogPeo.vue";
-import * as rule from "@/utils/rules.js";
-import {
-  ref,
-  defineExpose,
-  reactive,
-  onMounted,
-  defineEmits,
-  getCurrentInstance,
-  nextTick
-} from "vue";
-import { selectUserDeptPage } from "@/api/user-manage";
-
-const props = defineProps({
-  dic: Object
-});
-const { proxy } = getCurrentInstance();
-
-const {
-  D_GS_BK_SSJZ,
-  D_GS_ZDR_RYJB,
-  D_GS_SSYJ,
-  D_GS_BQ_DJ,
-  D_BZ_XZQHDM,
-  D_BZ_MZ,
-  D_BZ_XB,
-  D_GS_ZDR_CZZT,
-  D_GS_BQ_ZL,
-  D_GS_BQ_LB,
-  D_GS_BQ_LX,
-  D_GS_ZDR_YJDJ
-} = proxy.$dict(
-  "D_GS_BK_SSJZ",
-  "D_GS_ZDR_RYJB",
-  "D_GS_SSYJ",
-  "D_GS_BQ_DJ",
-  "D_BZ_XZQHDM",
-  "D_BZ_MZ",
-  "D_BZ_XB",
-  "D_GS_ZDR_CZZT",
-  "D_GS_BQ_ZL",
-  "D_GS_BQ_LB",
-  "D_GS_BQ_LX",
-  "D_GS_ZDR_YJDJ"
-); //获取字典数据
-const emits = defineEmits([
-  "update:modelValue",
-  "chooseDate",
-  "handleEditDate"
-]);
-
-const tagDialog = ref();
-const dialogForm = ref(false); //弹窗
-const formData = ref([
-  { label: "", prop: "basic", type: "slot", width: "100%" },
-  { label: "姓名", prop: "ryXm", type: "input" },
-  { label: "性别", prop: "ryXb", type: "select", options: D_BZ_XB },
-  { label: "民族", prop: "ryMz", type: "select", options: D_BZ_MZ },
-  { label: "身份证号", prop: "rySfzh", type: "input" },
-  { label: "联系电话", prop: "ryLxdh", type: "input" },
-  { label: "出生日期", prop: "ryCsrq", type: "date" },
-  { label: "籍贯", prop: "ryJg", type: "select", options: D_BZ_XZQHDM },
-  {
-    label: "级别",
-    prop: "zdrRyjb",
-    type: "select",
-    options: D_GS_ZDR_RYJB
-  },
-  {
-    label: "预警等级",
-    prop: "zdrYjdj",
-    type: "select",
-    options: D_GS_ZDR_YJDJ
-  },
-  { label: "", prop: "address", type: "slot", width: "100%" },
-  { label: "户籍地区划", prop: "hjdQh", type: "select", options: D_BZ_XZQHDM },
-  { label: "户籍地详址", prop: "hjdXz", type: "input" },
-  {
-    label: "户籍地派出所",
-    prop: "hjdPcsdm",
-    type: "slot"
-  },
-  { label: "现住地区划", prop: "xzdQh", type: "select", options: D_BZ_XZQHDM },
-  { label: "现住地详址", prop: "xzdXz", type: "input" },
-  {
-    label: "现住地派出所",
-    prop: "xzdPcsdm",
-    type: "slot"
-  },
-  { label: "", prop: "jurisdiction", type: "slot", width: "100%" },
-  {
-    label: "管辖单位",
-    prop: "gxSsbmdm",
-    type: "slot"
-  },
-  {
-    label: "诉求单位",
-    prop: "sqSsbmdm",
-    type: "slot"
-  },
-  {
-    label: "责任单位",
-    prop: "zrSsbmdm",
-    type: "slot"
-  },
-  { label: "所属警种", prop: "zdrSsjz", type: "select", options: D_GS_BK_SSJZ },
-  {
-    label: "涉及警种",
-    prop: "zdrSjjz",
-    type: "select",
-    options: D_GS_BK_SSJZ,
-    multiple: true
-  },
-  { label: "管控民警姓名", prop: "gkMjXm", type: "input" },
-  { label: "管控民警警号", prop: "gkMjJh", type: "input" },
-  { label: "管控原因", prop: "zdrLkyy", type: "textarea", width: "100%" },
-  { label: "", prop: "status", type: "slot", width: "100%" },
-  {
-    label: "处置状态",
-    prop: "zdrCzzt",
-    type: "select",
-    options: D_GS_ZDR_CZZT
-  },
-
-  { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
-  { label: "入库结束时间", prop: "zdrRkjssj", type: "datetime" },
-
-  // { label: "人员标签大类", prop: "bqdl", type: "select", options: [] },
-  // { label: "人员标签细类", prop: "bqxl", type: "select", options: [] },
-  { label: "", prop: "bqInfo", type: "slot", width: "100%" },
-  { label: "标签列表", prop: "bqList", type: "slot", width: "80%" }
-]);
-const listQuery = ref({}); //表单
-const deptList = ref([]); //部门列表
-const chooseShow = ref(false); //选择弹窗
-const tableDate = reactive({
-  bqList: [], //表格数据
-  keyCount: 0,
-  rykeyCount: 0,
-  tableConfiger: {
-    rowHieght: 61,
-    showSelectType: "null",
-    loading: false
-  },
-  total: 0,
-  tableHeight: 225,
-  pageConfiger: {
-    pageSize: 20,
-    pageCurrent: 1
-  }, //分页
-  controlsWidth: 90, //操作栏宽度
-  tableColumn: [
-    { label: "标签名称", prop: "bqMc" },
-    { label: "标签代码", prop: "bqDm" },
-    { label: "标签种类", prop: "bqZl", showSolt: true },
-    { label: "标签类型", prop: "bqLx", showSolt: true },
-    { label: "标签类别", prop: "bqLb", showSolt: true }
-  ]
-});
-const chooseType = ref("01"); //选择弹窗类型
-const chooseTitle = ref(""); //选择弹窗
-const loading = ref(false);
-const elform = ref();
-const title = ref("");
-const rules = reactive({
-  xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }]
-});
-const editpeo = ref();
-onMounted(() => {
-  getdepartmentList();
-});
-// 初始化数据
-const init = (type, row) => {
-  dialogForm.value = true;
-  title.value = type == "add" ? "新增" : type == "info" ? "详情" : "编辑";
-};
-
-// 获取部门列表
-const getdepartmentList = () => {
-  selectUserDeptPage().then((res) => {
-    deptList.value = res?.records.map((item) => ({
-      label: item.deptName,
-      value: item.deptId
-    }));
-  });
-};
-
-const submit = () => {
-  elform.value.submit((data) => {
-    // 处理 zdrSjjz 字段（如果是数组就转成字符串）
-    if (Array.isArray(data.zdrSjjz)) {
-      data.zdrSjjz = data.zdrSjjz.join(",");
-    }
-    console.log("提交数据:", data, title.value);
-    // 根据 title 判断是新增还是编辑
-    if (title.value === "新增") {
-      console.log("新增数据:", data);
-      emits("chooseDate", data); // 新增
-    } else if (title.value === "编辑") {
-      emits("handleEditDate", data); // 编辑
-    }
-  });
-};
-// // 提交
-// const submit = () => {
-//   elform.value.submit((data) => {
-//     data.zdrSjjz = data.zdrSjjz.join(",");
-//     emits("chooseDate", data);
-//       let url =
-//         title.value == "新增"
-//           ? "/mosty-gsxt/tbGsxtZdry/save"
-//           : "/mosty-gsxt/tbGsxtZdry/update";
-//       let params = { ...data };
-
-//       qcckPost(params, url)
-//         .then((res) => {
-//           proxy.$message({ type: "success", message: title.value + "成功" });
-//           emit("onSearch");
-//           close();
-//         })
-//         .catch(() => {});
-//   });
-// };
-// 打开弹窗
-const openDialog = (type) => {
-  chooseShow.value = true;
-  chooseType.value = type;
-  chooseTitle.value = "请选择标签";
-  nextTick(() => {
-    tagDialog.value.setValues(listQuery.value.bqList);
-  });
-};
-const handleDeptChange = (nameField, selectedValue) => {
-  // 找到选中的部门
-  const selectedDept = deptList.value.find(
-    (item) => item.value.toString() === selectedValue
-  );
-  // 更新名称
-  listQuery.value[nameField] = selectedDept ? selectedDept.label : "";
-};
-const handleTagSelect = (selectedTags) => {
-  tableDate.bqList = selectedTags.map((item) => ({
-    bqDm: item.bqDm || "",
-    bqId: item.bqId || "",
-    bqLb: item.bqLb || "",
-    bqLx: item.bqLx || "",
-    bqMc: item.bqMc || "",
-    bqZl: item.bqZl || ""
-  }));
-  listQuery.value.bqList = tableDate.bqList;
-  // 每个标签包含: bqDm, bqId, bqLb, bqLx, bqMc, bqZl 属性
-};
-
-// 接收父组件传入的数据并回显
-const setFormData = (data) => {
-  tableDate.bqList = data.bqList ?? [];
-  listQuery.value = {
-    ...data // 假设 data 包含所有需要的字段
-  };
-};
-
-// 关闭
-const close = () => {
-  listQuery.value = {};
-  dialogForm.value = false;
-  loading.value = false;
-};
-// 删除
-const delDictItem = (bqId) => {
-  tableDate.bqList = tableDate.bqList.filter((item) => item.bqId !== bqId);
-  listQuery.value.bqList = tableDate.bqList;
-};
-// 2. 暴露获取数据的方法
-const getFormData = () => {
-  // 可以在这里添加验证逻辑
-  return {
-    formData: listQuery.value
-  };
-};
-defineExpose({ init, setFormData, close });
-</script>
-
-<style lang="scss" scoped>
-@import "~@/assets/css/layout.scss";
-@import "~@/assets/css/element-plus.scss";
-::v-deep .el-tabs--card > .el-tabs__header .el-tabs__item.is-active {
-  color: #0072ff;
-  background: rgba(0, 114, 255, 0.3);
-}
-.boxlist {
-  width: 99%;
-  height: 225px;
-  margin-top: 10px;
-  overflow: hidden;
-}
-</style>
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addcjlr.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addcjlr.vue
new file mode 100644
index 0000000..4741bc5
--- /dev/null
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addcjlr.vue
@@ -0,0 +1,67 @@
+<template>
+  <el-dialog v-model="showDialog" :destroy-on-close="true" title="采集录入" @close="close" :close-on-click-modal="false">
+    <FormMessage v-model="listQuery" :formList="formData" labelWidth="120px" ref="elform" :rules="rules">
+    </FormMessage>
+    <template #footer>
+        <div class="flex just-center">
+            <el-button @click="close">取消</el-button>
+            <el-button type="primary" @click="submitForm">确认</el-button>
+        </div>
+    </template>
+  </el-dialog>
+  
+</template>
+
+<script setup>
+
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { reactive, ref,getCurrentInstance } from 'vue';
+const { proxy } = getCurrentInstance();
+const { D_BZ_XB } = proxy.$dict("D_BZ_XB"); // 获取字典数据
+const elform = ref()
+const showDialog = ref(false)
+const emit = defineEmits(['change'])
+const listQuery = ref({})
+const formData = ref([
+    { label: "微信群", prop: "wxqId", type: "input" ,width:'45%'},
+    { label: "QQ群", prop: "qqqId", type: "input" ,width:'45%'},
+    { label: "群主昵称", prop: "qzNc", type: "input",width:'45%' },
+    { label: "群主姓名", prop: "qzXm", type: "input",width:'45%' },
+    { label: "群主联系电话", prop: "qzLxdh", type: "input",width:'45%' },
+    { label: "群重要内容", prop: "qZynr", type: "textarea",width:'100%' },
+])
+const rules = reactive({
+    wxqId: [{ required: true, message: "请输入微信群", trigger: "blur" }],
+    qqqId: [{ required: true, message: "请输入QQ群", trigger: "blur" }],
+    qzNc: [{ required: true, message: "请输入群主昵称", trigger: "blur" }],
+    qzXm: [{ required: true, message: "请输入群主姓名", trigger: "blur" }],
+    qzLxdh: [{ required: true, message: "请输入群主联系电话", trigger: "blur" }],
+    qZynr: [{ required: true, message: "请输入群重要内容", trigger: "blur" }],
+})
+const type = ref('')
+const init = (lx,row) =>{
+    type.value = lx;
+    if(row) listQuery.value = JSON.parse(JSON.stringify(row))
+    showDialog.value = true;
+}
+
+const submitForm = () =>{
+    elform.value.submit((val)=>{
+        let obj = { type:type.value, data:val }
+        emit('change',obj)
+        showDialog.value = false;
+    })
+}
+
+const close = () =>{
+    elform.value.reset();
+    listQuery.value.bqList = []
+    showDialog.value = false;
+}
+
+defineExpose({init})
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/approvalInfo.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/approvalInfo.vue
deleted file mode 100644
index 3ea19a8..0000000
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/approvalInfo.vue
+++ /dev/null
@@ -1,300 +0,0 @@
-<template>
-  <el-form :model="formData" label-width="auto" label-position="left">
-    <FormMessage
-      v-model="listQuery"
-      :formList="formData"
-      ref="elform"
-      :rules="rules"
-    >
-      <!-- 自定义插槽（人员标签） -->
-      <template #jsdwdm>
-        <el-select
-          v-model="listQuery.jsdwdm"
-          placeholder="请选择处置接收单位"
-          style="width: 240px"
-        >
-          <el-option
-            v-for="item in deptList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value.toString()"
-          />
-        </el-select>
-      </template>
-    </FormMessage>
-
-    <!-- 审批流程 -->
-    <div class="approval-flow">
-      <div class="approval-flow">
-        <div class="step" v-for="(item, index) in step" :key="`${index}step`">
-          <div class="icon">
-            <div class="circle"></div>
-            <div class="line"></div>
-          </div>
-          <div>
-            <div>{{ item.title }}</div>
-            <div class="desc">
-              <div class="description flexcc">
-                <!-- 使用方案1 + 方案2 -->
-                <div
-                  class="description-item"
-                  :class="{ 'disabled-item': item.default }"
-                  @click="!item.default && handleSelectStep(index)"
-                >
-                  {{ item.sqrXm }}
-                </div>
-                <div class="description-item">{{ item.sqrSsbmmc }}</div>
-                <div class="step-description" v-if="item.description">
-                  {{ item.description }}
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <ChooseUser
-      v-model="chooseUserVisible"
-      @choosedUsers="handleUserSelected"
-      :roleIds="roleIds"
-    />
-  </el-form>
-</template>
-
-<script setup>
-import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
-import FormMessage from "@/components/aboutTable/FormMessage.vue";
-import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue";
-import { qcckPost, qcckPut } from "@/api/qcckApi.js";
-import { selectUserDeptPage } from "@/api/user-manage";
-
-const { proxy } = getCurrentInstance();
-const { D_GS_BK_CZJSDWLX, D_GS_BK_TJFS, D_BZ_SF } = proxy.$dict(
-  "D_GS_BK_CZJSDWLX",
-  "D_GS_BK_TJFS",
-  "D_BZ_SF"
-); //获取字典数据
-const listQuery = ref({}); //表单
-const chooseUserVisible = ref(false); //审批流程
-const roleIds = ref([]); //角色id
-let currentSelectedIndex = null;
-const deptList = ref([]); //部门列表
-const formData = ref([
-  {
-    label: "接收单位",
-    prop: "jsdwdm",
-    type: "slot"
-  },
-  {
-    label: "处置接收单位类型",
-    prop: "jsdwlx",
-    type: "select",
-    options: D_GS_BK_CZJSDWLX
-  },
-  { label: "是否反馈", prop: "fkSf", type: "select", options: D_BZ_SF }
-]);
-const rules = reactive({
-  bkBt: [{ required: true, message: "请选择处置接收单位", trigger: "blur" }],
-  // bkObj: [{ required: true, message: "请选择提交方式", trigger: "blur" }],
-  bkSjQs: [{ required: true, message: "请选择签收时间", trigger: "change" }]
-});
-const step = ref([
-  { sqrXm: "发起人", sqrSsbmmc: "发起部门", title: "发起申请", default: true },
-  {
-    sqrXm: "发起人",
-    sqrSsbmmc: "发起部门",
-    title: "审核确认",
-    default: false,
-    status: "", // 动态设置状态
-    description: "" // 动态设置描述（如不通过原因）
-  },
-  {
-    sqrXm: "发起人",
-    sqrSsbmmc: "发起部门",
-    title: "审批确认",
-    default: false,
-    status: "", // 动态设置状态
-    description: "" // 动态设置描述（如不通过原因）
-  }
-]);
-
-onMounted(() => {
-  getdepartmentList();
-});
-// 获取部门列表
-const getdepartmentList = () => {
-  selectUserDeptPage().then((res) => {
-    deptList.value = res?.records.map((item) => ({
-      label: item.deptName,
-      value: item.deptId
-    }));
-    // tableData.value = res?.records;
-  });
-};
-// 处理选择的人员数据
-const handleUserSelected = (userData) => {
-  if (currentSelectedIndex !== null) {
-    step.value[currentSelectedIndex] = {
-      ...step.value[currentSelectedIndex],
-      sqrXm: userData[0].userName,
-      sqrSsbmmc: userData[0].deptName,
-      userId: userData[0].id,
-      rawData: userData[0] // 保留原始数据（可选）
-    };
-    if (currentSelectedIndex == 1) {
-      // 同时更新listQuery（如果需要）
-      listQuery.value = {
-        ...listQuery.value,
-        shrSfzh: userData[0].idEntityCard,
-        shrSsbmdm: userData[0].deptId,
-        shrSsbmmc: userData[0].deptName,
-        shrXm: userData[0].userName
-      };
-    } else if (currentSelectedIndex == 2) {
-      // 同时更新listQuery（如果需要）
-      listQuery.value = {
-        ...listQuery.value,
-        sprSfzh: userData[0].idEntityCard,
-        sprSsbmdm: userData[0].deptId,
-        sprSsbmmc: userData[0].deptName,
-        sprXm: userData[0].userName
-      };
-    }
-  }
-  console.log(step.value, "选择的数据");
-  chooseUserVisible.value = false;
-};
-
-// 点击步骤触发
-const handleSelectStep = (index) => {
-  currentSelectedIndex = index;
-  chooseUserVisible.value = true;
-};
-
-// 2. 暴露获取数据的方法
-const getFormData = () => {
-  // 可以在这里添加验证逻辑
-  return {
-    formData: listQuery.value
-  };
-};
-// 接收父组件传入的数据并回显
-const setFormData = (data) => {
-  listQuery.value = {
-    ...data // 假设 data 包含所有需要的字段
-  };
-  console.log(data, "部门");
-  step.value = [
-    {
-      sqrXm: "发起人",
-      sqrSsbmmc: "发起部门",
-      title: "发起申请",
-      default: true
-    },
-    {
-      sqrXm: data.shrXm || "系统管理", // 审核人姓名
-      sqrSsbmmc: data.shrSsbmmc || "西藏", // 审核部门
-      title: "审核确认",
-      status: "", // 动态设置状态
-      description: "" // 动态设置描述（如不通过原因）
-    },
-    {
-      sqrXm: data.sprXm || "测试", // 审批人姓名
-      sqrSsbmmc: data.sprSsbmmc || "西藏", // 审批部门
-      title: "审批确认",
-      status: "", // 动态设置状态
-      description: "" // 动态设置描述（如不通过原因）
-    }
-  ];
-  // 根据 bkZt 的值设置不同的状态
-  switch (data.bkZt) {
-    case "02": // 审核中
-      step.value[1].status = "process";
-      step.value[1].description = "审核中";
-      break;
-    case "03": // 审核不通过
-      step.value[1].status = "error";
-      step.value[1].description = `审核不通过（原因：${data.bkshBtgyy}）`;
-      break;
-    case "04": // 审批中
-      step.value[1].status = "finish"; // 审核已完成
-      step.value[2].status = "process"; // 审批中
-      step.value[2].description = "审批中";
-      break;
-    case "05": // 审批通过
-      step.value[1].status = "finish"; // 审核已完成
-      step.value[2].status = "finish"; // 审批已完成
-      step.value[2].description = "审批通过";
-      break;
-    case "06": // 审批不通过
-      step.value[1].status = "finish"; // 审核已完成
-      step.value[2].status = "error"; // 审批不通过
-      step.value[2].description = `审批不通过（原因：${data.bkshBtgyy}）`;
-      break;
-    default:
-      break;
-  }
-};
-
-// 3. 暴露方法给父组件
-defineExpose({
-  getFormData,
-  setFormData
-});
-</script>
-
-<style lang="scss" scoped>
-.step {
-  //   position: relative;
-  display: flex;
-  gap: 5px;
-  box-sizing: border-box;
-  .desc {
-    margin: 5px;
-    color: #929090;
-    // width: 350px;
-  }
-  .icon {
-    // position: absolute;
-    // top: 0;
-    // left: 0;
-    text-align: center;
-    .circle {
-      height: 14px;
-      width: 14px;
-      border-radius: 50%;
-      background-color: rgb(196, 219, 240);
-    }
-    .line {
-      margin: 0 auto;
-      width: 0;
-      height: calc(100% - 14px);
-      border: 1px dashed rgb(196, 219, 240);
-    }
-  }
-}
-
-.unit-selection {
-  display: flex;
-  align-items: center;
-  gap: 20px;
-}
-.description {
-  gap: 10px;
-}
-.description-item {
-  width: 300px;
-  height: 30px;
-  padding: 0 20px;
-  line-height: 30px;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  color: rgb(131, 132, 135);
-  box-sizing: border-box;
-}
-.disabled-item {
-  cursor: not-allowed;
-  opacity: 0.6;
-  pointer-events: none;
-}
-</style>
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/dialogList.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/dialogList.vue
deleted file mode 100644
index 76fe052..0000000
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/dialogList.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <el-dialog
-    :title="titleValue"
-    width="900px"
-    :model-value="modelValue"
-    append-to-body
-    @close="closed"
-  >
-    <FormMessage
-      v-model="formForData"
-      :formList="formDataModel"
-      ref="formRef"
-      label-width="120px"
-    >
-    </FormMessage>
-
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="closed">取消</el-button>
-        <el-button type="primary" @click="onComfirm">确认</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup>
-import FormMessage from "@/components/aboutTable/FormMessage.vue";
-import { defineProps, ref, onMounted } from "vue";
-import { qcckGet } from "@/api/qcckApi.js";
-const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    required: true
-  },
-  dic: {
-    type: Object,
-    default: () => {}
-  },
-  bqDl: {
-    type: String,
-    default: "01"
-  },
-  bqLx: {
-    type: String,
-    default: "01"
-  },
-  titleValue: {
-    type: String,
-    default: "选择大类"
-  },
-  LeaderType: {
-    type: String,
-    default: ""
-  },
-  //是否单选
-  Single: {
-    type: Boolean,
-    default: true
-  },
-  roleIds: {
-    type: Array,
-    default: []
-  }
-});
-const total = ref(0);
-const listQuery = ref({});
-// 表单数据
-const formForData = ref({
-  wxqId: "", // 微信群
-  qqqId: "", // QQ群
-  qzNc: "", // 群主昵称
-  qzXm: "", // 群主姓名
-  qzLxdh: "", // 联系人电话
-  qZynr: "" // 群重要内容
-});
-const loading = ref(false);
-const tableData = ref([]);
-const emits = defineEmits(["update:modelValue", "chooseDate"]);
-// 表单字段配置
-const formDataModel = ref([
-  { label: "微信群", prop: "wxqId", type: "input" },
-  {
-    label: "QQ群",
-    prop: "qqqId",
-    type: "input"
-  },
-  { label: "群主昵称", prop: "qzNc", type: "input" },
-  { label: "群主姓名", prop: "qzXm", type: "input" },
-  { label: "联系人电话", prop: "qzLxdh", type: "input" },
-  { label: "群重要内容", prop: "qZynr", type: "input" }
-]);
-const closed = () => {
-  emits("update:modelValue", false);
-};
-
-const keyid = (row) => {
-  return row.id;
-};
-// 子表单提交方法
-const onComfirm = () => {
-  emits("chooseDate", formForData.value);
-  closed();
-};
-
-defineExpose({});
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/css/layout.scss";
-@import "@/assets/css/element-plus.scss";
-</style>
-<style>
-.tabBoxRadio .el-checkbox__inner {
-  border-radius: 50% !important;
-}
-.tabBoxRadio .el-table__header-wrapper .el-checkbox {
-  display: none;
-}
-</style>
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/infoForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/infoForm.vue
deleted file mode 100644
index c04e603..0000000
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/infoForm.vue
+++ /dev/null
@@ -1,518 +0,0 @@
-<template>
-  <div class="dialog" v-if="dialogForm">
-    <div class="head_box">
-      <span class="title">重点群体管理 </span>
-      <div>
-        <el-button size="small" type="primary" @click="autoClick" v-if="typetext == 'auto'">审核</el-button>
-        <el-button size="small" @click="autoClick" type="primary" v-if="typetext == 'approval'">审批</el-button>
-        <el-button size="small" @click="close">关闭</el-button>
-      </div>
-    </div>
-
-    <div class="form_cnt">
-      <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleClick">
-        <el-tab-pane :label="title + '群体'" name="first"></el-tab-pane>
-        <el-tab-pane label="轨迹信息" name="second"></el-tab-pane>
-        <el-tab-pane label="标签信息" name="third"></el-tab-pane>
-      </el-tabs>
-      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
-        <template #qtXx>
-          <el-divider content-position="left">群体信息</el-divider>
-        </template>
-        <template #qtGlXx>
-          <el-divider content-position="left">群体管理信息</el-divider>
-        </template>
-        <template #spXx>
-          <el-divider content-position="left">审批信息</el-divider>
-          <ApprovalInfo ref="approvalInfoRef" />
-        </template>
-        <template #xzRy>
-          <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :key="pageData.keyCount"
-            :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth" @chooseData="chooseData">
-            <template #ryxx="{ row }">
-              <div>
-                <img src="" alt="" />
-                <ul>
-                  <li>姓名：{{ row.rySfzh }}</li>
-                  <li class="rowClass">
-                    性别：
-                    <DictTag :tag="false" :value="row.ryXb" :options="D_BZ_XB" />
-                  </li>
-                  <li class="rowClass">
-                    籍贯：
-                    <DictTag :tag="false" :value="row.ryJg" :options="D_BZ_XZQHDM" />
-                  </li>
-                  <li>身份证：{{ row.rySfzh }}</li>
-                  <li>出生日期：{{ row.ryCsrq }}</li>
-                  <li class="rowClass">
-                    民族：
-                    <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
-                  </li>
-                </ul>
-              </div>
-              <div class="flex">
-                <el-button type="primary" size="small"> 涉恐人员</el-button>
-                <el-button type="primary" size="small"> 涉稳人员</el-button>
-                <el-button type="primary" size="small"> 在逃人员</el-button>
-              </div>
-            </template>
-            <template #jzxx="{ row }">
-              <div class="rowClass">
-                户籍地区划：
-                <DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" />
-              </div>
-              <div>户籍派出所：{{ row.hjdPcsmc }}</div>
-              <div>户籍地详址：{{ row.hjdXz }}</div>
-            </template>
-            <template #gxdw="{ row }">
-              <div>管辖单位：{{ row.gxSsbmmc }}</div>
-              <div class="rowClass">
-                人员级别：
-                <DictTag :tag="false" :value="row.zdrRyjb" :options="D_GS_ZDR_RYJB" />
-              </div>
-              <div>管控原因：{{ zdrLkyy }}</div>
-              <div class="rowClass">
-                管控状态：
-                <DictTag :tag="false" :value="row.zdrBkZt" :options="D_GS_ZDR_BK_ZT" />
-              </div>
-            </template>
-            <template #zdrCzzt="{ row }">
-              <DictTag :tag="false" :value="row.zdrCzzt" :options="D_GS_ZDR_CZZT" />
-            </template>
-            <template #xtSjzt="{ row }">
-              <div>
-                {{
-                  row.xtSjzt == 0 ? "注销" : row.xtSjzt == 1 ? "正常" : "封存"
-                }}
-              </div>
-            </template>
-          </MyTable>
-        </template>
-        <!-- 两群采集录入-->
-        <template #lqxxList>
-          <div class="boxlist">
-            <MyTable :tableData="tableDate.lqxxList" :tableColumn="tableDate.tableLqColumn"
-              :tableHeight="tableDate.tableHeight" :key="tableDate.keyCount" :tableConfiger="tableDate.tableConfiger"
-              :controlsWidth="tableDate.controlsWidth">
-            </MyTable>
-          </div>
-        </template>
-      </FormMessage>
-    </div>
-    <!-- 列表弹窗 -->
-    <DialogList :Single="false" :roleIds="roleIds" v-if="chooseShow" @chooseDate="chooseDate" :titleValue="chooseTitle"
-      v-model="chooseShow" :bqLx="chooseType" bqDl="02"></DialogList>
-    <addFormPeo ref="addFormDiloag" @chooseDate="addFormPeoDate" @handleEditDate="handleEditDate" />
-
-    <selectionList :Single="false" :roleIds="selectroleId" v-if="selectionValue" @chooseDate="chooseSelectDate"
-      :titleValue="chooseTitle" v-model="selectionValue">
-    </selectionList>
-    <el-dialog v-model="dialogVisible" title="审核" width="500px">
-      <FormMessage v-model="listQueryAuto" :formList="formAutoData" ref="elform">
-        <!-- 自定义原因字段渲染 -->
-        <template #shBtgyy>
-          <el-form-item label="原因" prop="shBtgyy" v-if="listQueryAuto.sftg == '0'" style="width: 100%">
-            <el-input type="textarea" v-model="listQueryAuto.shBtgyy" placeholder="请输入不通过原因" />
-          </el-form-item>
-        </template>
-      </FormMessage>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="dialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="handleClose"> 确定 </el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import FormMessage from "@/components/aboutTable/FormMessage.vue";
-import MyTable from "@/components/aboutTable/MyTable.vue";
-import DialogList from "./dialogList.vue";
-import selectionList from "./selectionList.vue";
-import addFormPeo from "./addFormPeo.vue";
-import ApprovalInfo from "./approvalInfo.vue";
-import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
-import { ElMessage } from "element-plus";
-import { useRouter } from "vue-router";
-
-import {
-  ref,
-  defineExpose,
-  reactive,
-  onMounted,
-  defineEmits,
-  getCurrentInstance,
-  nextTick
-} from "vue";
-const emit = defineEmits(["updateDate"]);
-const props = defineProps({
-  dic: Object
-});
-const { proxy } = getCurrentInstance();
-const {
-  D_BZ_SF,
-  D_GS_ZDQT_FXDJ,
-  D_GS_ZDQT_LB,
-  D_BZ_XB,
-  D_GS_ZDR_RYJB,
-  D_BZ_MZ,
-  D_BZ_XZQHDM,
-  D_GS_ZDR_BK_ZT,
-  D_GS_ZDR_CZZT
-} = proxy.$dict(
-  "D_BZ_SF",
-  "D_GS_ZDQT_FXDJ",
-  "D_GS_ZDQT_LB",
-  "D_BZ_XB",
-  "D_GS_ZDR_RYJB",
-  "D_BZ_MZ",
-  "D_BZ_XZQHDM",
-  "D_GS_ZDR_BK_ZT",
-  "D_GS_ZDR_CZZT"
-); //获取字典数据
-const dialogTitle = ref("新增信息"); //弹窗标题
-const dialogVisible = ref(false);
-const router = useRouter();
-
-const roleIds = ref([]); //选择角色
-const selectroleId = ref([]); //选择角色
-const approvalInfoRef = ref(null);
-
-const dialogForm = ref(false); //弹窗
-const formRef = ref();
-const activeName = ref("first");
-const formData = ref([
-  { label: "", prop: "qtXx", type: "slot", width: "100%", disabled: true },
-  { label: "群体名称", prop: "qtMc", type: "input", disabled: true },
-  { label: "群体别名", prop: "qtBm", type: "input", disabled: true },
-  { label: "群体简称", prop: "qtJc", type: "input", disabled: true },
-  {
-    label: "群体类别",
-    prop: "qtLb",
-    type: "select",
-    options: D_GS_ZDQT_LB,
-    disabled: true
-  },
-  { label: "成立时间", prop: "qtClsj", type: "datetime", disabled: true },
-  {
-    label: "风险等级",
-    prop: "qtFxdj",
-    type: "select",
-    options: D_GS_ZDQT_FXDJ,
-    disabled: true
-  },
-  { label: "背景资料", prop: "qtBjzl", type: "input", disabled: true },
-  { label: "两群采集录入", prop: "lqxxList", type: "slot", width: "100%" },
-  { label: "", prop: "qtGlXx", type: "slot", width: "100%" },
-  { label: "管辖单位", prop: "gxSsdwmc", type: "input", disabled: true },
-  { label: "联系人", prop: "gkMjXm", type: "input", disabled: true },
-  { label: "联系方式", prop: "gkMjLxfs", type: "input", disabled: true },
-  { label: "", prop: "xzRy", type: "slot", width: "100%" },
-  { label: "", prop: "spXx", type: "slot", width: "100%" }
-]);
-//人员信息
-const pageData = reactive({
-  tableData: [], //表格数据
-  rykeyCount: 0,
-  tableConfiger: {
-    rowHieght: 61,
-    showSelectType: "checkBox",
-    loading: false,
-    size: "small",
-    border: false
-  },
-  total: 0,
-  pageConfiger: {
-    pageSize: 20,
-    pageCurrent: 1
-  }, //分页
-  controlsWidth: 220, //操作栏宽度
-  tableColumn: [
-    { label: "重点人员信息", prop: "ryxx", showSolt: true },
-    { label: "户籍居住信息", prop: "jzxx", showSolt: true },
-    { label: "管辖单位", prop: "gxdw", showSolt: true },
-    { label: "处置状态", prop: "zdrCzzt", showSolt: true },
-    { label: "状态", prop: "xtSjzt", showSolt: true }
-  ]
-});
-
-const addFormDiloag = ref();
-//两群信息表格，重点人标签表格
-const tableDate = reactive({
-  lqxxList: [], //两群信息表格数据
-  tableConfiger: {
-    rowHieght: 30,
-    showSelectType: "null",
-    loading: false,
-    haveControls: false,
-    showIndex: false
-  },
-  tableHeight: 200,
-  tableLqColumn: [
-    { label: "微信群", prop: "wxqId" },
-    {
-      label: "QQ群",
-      prop: "qqqId"
-    },
-    { label: "群主昵称", prop: "qzNc" },
-    { label: "群主姓名", prop: "qzXm" },
-    { label: "联系人电话", prop: "qzLxdh" },
-    { label: "群重要内容", prop: "qZynr" },
-    { label: "操作", prop: "controls", showSolt: true }
-  ]
-});
-const formAutoData = ref([
-  {
-    label: "是否通过",
-    prop: "sftg",
-    type: "radio",
-    options: D_BZ_SF,
-    width: "100%"
-  },
-  {
-    label: "",
-    prop: "shBtgyy",
-    type: "slot",
-    width: "100%"
-  }
-]);
-const chooseShow = ref(false); //选择弹窗
-const typetext = ref("");
-
-const chooseType = ref(""); //选择类型
-const chooseTitle = ref(""); //选择弹窗标题
-const dialogList = ref(null); //选择弹窗实例
-const currentEditIndex = ref(null);
-const listQuery = ref({}); //表单
-const listQueryAuto = ref({}); //自动审核表单
-const currentEditRow = ref({}); //当前编辑行
-const loading = ref(false);
-const selectionValue = ref(false);
-const elform = ref();
-const title = ref("");
-const rules = reactive({
-  xsbt: [{ required: true, message: "请输入线索标题", trigger: "blur" }]
-});
-const editpeo = ref();
-onMounted(() => { });
-// 初始化数据
-const init = async (type, row) => {
-  console.log(row, "编辑数据", type);
-  listQuery.value = {
-    ...listQuery.value, // 保留原有值
-    ...row
-  };
-  listQueryAuto.value = {
-    ...listQueryAuto.value, // 保留原有值
-    sftg: "0" // 设置新值
-  };
-  dialogForm.value = true;
-  typetext.value = type;
-  await nextTick(); // 等待子组件挂载
-  if (row) getDataById(row.id);
-  addFormDiloag.value?.setFormData?.(row); // 回显布控信息
-  approvalInfoRef.value?.setFormData?.(row); // 回显审批信息
-};
-// 根据id查询详情
-const getDataById = (id) => {
-  qcckGet({}, "/mosty-gsxt/tbGsxtZdqt/selectVoById/" + id).then((res) => {
-    listQuery.value = res;
-    pageData.tableData = res.zdryList;
-    tableDate.lqxxList = res.lqxxList;
-  });
-};
-const autoClick = () => {
-  dialogVisible.value = true;
-};
-const handleAddEdit = (type, row) => {
-  addFormDiloag.value.init(type, row);
-  dialogTitle.value = "新增信息";
-};
-const selectionAdd = () => {
-  selectionValue.value = true;
-};
-// 打开弹窗
-const openDialog = (type) => {
-  chooseShow.value = true;
-  chooseType.value = type;
-  chooseTitle.value = "请录入两群信息";
-};
-// 选择数据
-const chooseDate = (data) => {
-  tableDate.lqxxList.push(data);
-  chooseShow.value = false;
-};
-
-//重点人员新增
-const addFormPeoDate = (data) => {
-  console.log(data, "选择的数据");
-  pageData.tableData.push(data);
-  addFormDiloag.value.close();
-};
-
-//编辑数据
-const handleEditDate = (editedData) => {
-  const index = pageData.tableData.findIndex(
-    (item) => item.rySfzh === editedData.rySfzh // 用身份证号匹配
-  );
-  console.log(index, "编辑索引");
-  if (index !== -1) {
-    pageData.tableData[index] = { ...editedData };
-  }
-  addFormDiloag.value.close();
-};
-// 选择数据
-const chooseSelectDate = (data) => {
-  pageData.tableData.push(...data);
-  selectionValue.value = false;
-};
-
-//删除两群信息
-const delDictItem = (index) => {
-  tableDate.lqxxList.splice(index, 1);
-};
-
-const submitForm = () => {
-  // 正确调用子组件的submit方法
-  formRef.value.submit(
-    // 成功回调
-    (validData) => {
-      // 处理编辑情况
-      if (dialogTitle.value === "编辑信息") {
-        // 确保 currentEditIndex 有效
-        if (
-          currentEditIndex.value >= 0 &&
-          currentEditIndex.value < pageData.tableData.length
-        ) {
-          pageData.tableData[currentEditIndex.value] = {
-            ...pageData.tableData[currentEditIndex.value],
-            gkMjXm: validData.gkMjXm,
-            ryXb: validData.ryXb,
-            rySfzh: validData.rySfzh,
-            hjdXz: validData.hjdXz,
-            xzdXz: validData.xzdXz,
-            gkMjLxfs: validData.gkMjLxfs,
-            clCph: validData.clCph,
-            clCjh: validData.clCjh,
-            qtTxzh: validData.qtTxzh,
-            bkLx: validData.bkLx,
-            bkLx: validData.bkLx,
-            fjZp: validData.fjZp
-          };
-        } else {
-          console.error("无效的编辑索引:", currentEditIndex.value);
-        }
-      }
-      // 处理新增情况
-      else {
-        pageData.tableData.push(validData);
-      }
-      //赋值子组件数据传递给父组件
-      listQuery.value.bkdxList = pageData.tableData;
-      // 关闭弹窗并重置表单
-      addFormDiloag.value = false;
-    },
-    // 错误回调（可选）
-    (errors) => {
-      console.error("表单验证失败:", errors);
-      ElMessage.error("请检查表单填写是否正确");
-    }
-  );
-};
-// 提交审核/审批
-const handleClose = async () => {
-  try {
-    const data = {
-      id: listQuery.value.id, // 主键id (required)
-      sftg: listQueryAuto.value.sftg // 是否通过 (required)
-    };
-
-    // 如果不通过，添加原因
-    if (data.sftg !== "1") {
-      data.shBtgyy = listQueryAuto.value.shBtgyy; // 不通过原因
-    }
-
-    // 根据 typetext.value 决定调用哪个接口
-    const apiUrl =
-      typetext.value === "auto"
-        ? "/mosty-gsxt/tbGsxtZdqt/toExamine" // 审核接口
-        : "/mosty-gsxt/tbGsxtZdqt/audits"; // 审批接口
-
-    // 调用接口
-    const res = await qcckPost(data, apiUrl);
-    if (res) {
-      ElMessage.success(typetext.value === "auto" ? "审核成功" : "审批成功");
-      dialogVisible.value = false;
-      router.push({ name: "autompvGroup" });
-    } else {
-      ElMessage.error(
-        res.message || (typetext.value === "auto" ? "审核失败" : "审批失败")
-      );
-    }
-  } catch (error) {
-    console.error(typetext.value === "auto" ? "审核出错:" : "审批出错:", error);
-    ElMessage.error("请求过程中发生错误");
-  }
-};
-
-// 根据索引删除数据
-const deleteData = (index) => {
-  pageData.tableData.splice(index, 1);
-};
-// 提交
-const submit = () => {
-  elform.value.submit((data) => {
-    const { formData } = approvalInfoRef.value?.getFormData?.();
-
-    const params = {
-      ...(formData || {}), // 如果 formData 是 null/undefined，默认空对象
-      ...(data || {}), // 如果 data 是 null/undefined，默认空对象
-      zdryList: pageData.tableData,
-      lqxxList: tableDate.lqxxList
-    };
-    let url =
-      title.value == "新增"
-        ? "/mosty-gsxt/tbGsxtZdqt/save"
-        : "/mosty-gsxt/tbGsxtZdqt/update";
-    qcckPost(params, url)
-      .then((res) => {
-        proxy.$message({ type: "success", message: title.value + "成功" });
-        emit("updateDate");
-        close();
-      })
-      .catch(() => { });
-  });
-};
-
-// 关闭
-const close = () => {
-  listQuery.value = {};
-  dialogForm.value = false;
-  loading.value = false;
-};
-defineExpose({ init });
-</script>
-
-<style lang="scss" scoped>
-@import "~@/assets/css/layout.scss";
-@import "~@/assets/css/element-plus.scss";
-
-::v-deep .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
-  color: #0072ff;
-  background: rgba(0, 114, 255, 0.3);
-}
-
-.boxlist {
-  width: 99%;
-  height: 225px;
-  margin-top: 10px;
-  overflow: hidden;
-}
-
-.btns {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-}
-</style>
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/selectionList.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/selectionList.vue
deleted file mode 100644
index fcc873e..0000000
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/selectionList.vue
+++ /dev/null
@@ -1,277 +0,0 @@
-<template>
-  <el-dialog
-    :title="titleValue"
-    width="1200px"
-    :model-value="modelValue"
-    append-to-body
-    @close="closed"
-  >
-    <div>
-      <el-form :model="listQuery" class="mosty-from-wrap" :inline="true">
-        <el-form-item label="姓名">
-          <el-input
-            placeholder="请输入姓名"
-            v-model="listQuery.ryXm"
-            clearable
-          ></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="success" @click="handleFilter">查询</el-button>
-          <el-button type="info" @click="reset()"> 重置 </el-button>
-        </el-form-item>
-      </el-form>
-      <div
-        class="tabBox"
-        :class="props.Single ? 'tabBoxRadio' : ''"
-        style="margin-top: 0px"
-      >
-        <el-table
-          v-loading="loading"
-          ref="multipleUserRef"
-          @selection-change="handleSelectionChange"
-          :data="tableData"
-          border
-          :row-key="keyid"
-          style="width: 100%"
-          height="450"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            :reserve-selection="true"
-          />
-          <el-table-column prop="fjZp" align="center" label="照片" />
-          <el-table-column prop="ryXm" align="center" label="姓名" />
-          <el-table-column label="性别">
-            <template #default="scope">
-              <span style="margin-left: 10px">{{
-                getLabelByValue(scope.row.ryXb, D_BZ_XB)
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="rySfzh" align="center" label="身份证号" />
-          <el-table-column prop="hjdXz" align="center" label="户籍地详址" />
-          <el-table-column prop="xzdXz" align="center" label="现居住地详址" />
-          <el-table-column prop="ryLxdh" align="center" label="联系电话" />
-          <el-table-column label="人员民族">
-            <template #default="scope">
-              <span style="margin-left: 10px">{{
-                getLabelByValue(scope.row.ryMz, D_BZ_MZ)
-              }}</span>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="重点人处置状态">
-            <template #default="scope">
-              <span style="margin-left: 10px">{{
-                getLabelByValue(scope.row.zdrCzzt, D_GS_ZDR_CZZT)
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="人员级别">
-            <template #default="scope">
-              <span style="margin-left: 10px">{{
-                getLabelByValue(scope.row.zdrRyjb, D_GS_ZDR_RYJB)
-              }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="所属警种">
-            <template #default="scope">
-              <span style="margin-left: 10px">{{
-                getLabelByValue(scope.row.zdrSsjz, D_GS_BK_SSJZ)
-              }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="fenye" :style="{ top: tableHeight + 'px' }">
-        <el-pagination
-          class="pagination"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="listQuery.current"
-          :page-sizes="[10, 20, 50, 100]"
-          :page-size="listQuery.size"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-        ></el-pagination>
-      </div>
-    </div>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button @click="closed">取消</el-button>
-        <el-button type="primary" @click="onComfirm">确认</el-button>
-      </div>
-    </template>
-  </el-dialog>
-</template>
-
-<script setup>
-import { defineProps, ref, onMounted, getCurrentInstance } from "vue";
-import { qcckGet } from "@/api/qcckApi.js";
-const { proxy } = getCurrentInstance();
-const {
-  D_GS_BK_DX,
-  D_GS_BK_SSJZ,
-  D_GS_SSYJ,
-  D_GS_BQ_DJ,
-  D_BZ_XB,
-  D_GS_BK_LX,
-  D_BZ_MZ,
-  D_GS_ZDR_CZZT,
-  D_GS_ZDR_RYJB
-} = proxy.$dict(
-  "D_GS_BK_DX",
-  "D_GS_BK_SSJZ",
-  "D_GS_SSYJ",
-  "D_GS_BQ_DJ",
-  "D_BZ_XB",
-  "D_GS_BK_LX",
-  "D_BZ_MZ",
-  "D_GS_ZDR_CZZT",
-  "D_GS_ZDR_RYJB"
-); //获取字典数据
-const props = defineProps({
-  modelValue: {
-    type: Boolean,
-    required: true
-  },
-  dic: {
-    type: Object,
-    default: () => {}
-  },
-  bqDl: {
-    type: String,
-    default: "01"
-  },
-  bqLx: {
-    type: String,
-    default: "01"
-  },
-  titleValue: {
-    type: String,
-    default: "选择大类"
-  },
-  LeaderType: {
-    type: String,
-    default: ""
-  },
-  //是否单选
-  Single: {
-    type: Boolean,
-    default: true
-  },
-  roleIds: {
-    type: Array,
-    default: []
-  }
-});
-const total = ref(0);
-const listQuery = ref({
-  current: 1,
-  size: 20
-});
-const loading = ref(false);
-const tableData = ref([]);
-const emits = defineEmits(["update:modelValue", "chooseDate"]);
-onMounted(() => {
-  handleFilter();
-});
-const closed = () => {
-  emits("update:modelValue", false);
-};
-const reset = () => {
-  listQuery.value = { current: 1, size: 20 };
-  getDataList();
-};
-
-const keyid = (row) => {
-  return row.id;
-};
-// 为用户分配角色
-const onComfirm = () => {
-  const userList = multipleSelectionUser.value;
-  let list = [];
-  let listId = [];
-  userList.forEach((val) => {
-    if (listId.indexOf(val.id) == -1) {
-      list.push(val);
-      listId.push(val.id);
-    }
-  });
-  emits("chooseDate", list);
-  closed();
-};
-/**
- * pageSize 改变触发
- */
-const handleSizeChange = (currentSize) => {
-  listQuery.value.size = currentSize;
-  getDataList();
-};
-const getLabelByValue = (value, Array) => {
-  console.log(Array, "D_BZ_XB");
-  const item = Array.find((item) => item.value === value);
-  return item ? item.label : "未知";
-};
-/**
- * 页码改变触发
- */
-const handleCurrentChange = (currentPage) => {
-  listQuery.value.current = currentPage;
-  getDataList();
-};
-
-// 查询标签组合列表
-const getDataList = () => {
-  const data = listQuery.value;
-  loading.value = true;
-  qcckGet(data, "/mosty-gsxt/tbGsxtZdry/selectPage").then((res) => {
-    tableData.value = res?.records;
-    total.value = Number(res.total);
-    loading.value = false;
-    multipleUser();
-  });
-};
-
-//列表回显
-function multipleUser() {
-  tableData.value.forEach((item) => {
-    if (props.roleIds.some((id) => id == item.id)) {
-      multipleUserRef.value.toggleRowSelection(item, true);
-    }
-  });
-}
-
-const handleFilter = () => {
-  listQuery.value.current = 1;
-  getDataList();
-};
-
-const multipleUserRef = ref(null);
-const multipleSelectionUser = ref([]);
-const handleSelectionChange = (val) => {
-  if (props.Single) {
-    if (val.length > 1) {
-      let del_row = val.shift();
-      multipleUserRef.value.toggleRowSelection(del_row, false);
-    }
-    multipleSelectionUser.value = val;
-  } else {
-    multipleSelectionUser.value = val;
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/css/layout.scss";
-@import "@/assets/css/element-plus.scss";
-</style>
-<style>
-.tabBoxRadio .el-checkbox__inner {
-  border-radius: 50% !important;
-}
-.tabBoxRadio .el-table__header-wrapper .el-checkbox {
-  display: none;
-}
-</style>
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
index b0133f5..d446764 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
@@ -8,9 +8,7 @@
             </el-button>
           </template>
           <div class="flex just-center">
-            <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm"
-              @click="handleApplication(it)">{{
-              it.zdmc }}</el-button>
+            <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm" @click="handleApplication(it)">{{it.zdmc }}</el-button>
           </div>
         </el-popover>
         <el-popover placement="bottom" :visible="visiblefp" :width="400" trigger="click">
@@ -28,7 +26,7 @@
 
         <el-button size="small" type="primary" @click="handleZxs">转线索</el-button>
         <el-button size="small" type="primary" @click="handleMove">移交管控</el-button>
-        <el-button type="primary" size="small" @click="addEdit('add', '')">
+        <el-button type="primary" size="small" @click="addEdit('add', null)">
           <el-icon style="vertical-align: middle">
             <CirclePlus />
           </el-icon>
@@ -42,49 +40,52 @@
     </div>
     <!-- 表格 -->
     <div class="tabBox">
-      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData">
+      <MyTable 
+        :tableData="pageData.tableData" 
+        :tableColumn="pageData.tableColumn" 
+        :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" 
+        :tableConfiger="pageData.tableConfiger" 
+        :controlsWidth="pageData.controlsWidth"
+        @chooseData="chooseData"
+      >
         <template #jbxx="{ row }">
-          <div>
-            <img src="" alt="" />
-            <ul>
-              <li>群体名称：{{ row.qtMc }}</li>
-              <li class="rowClass">
-                风险等级：
+          <div class="flex">
+            <img src="" alt="" style="width: 80px;height: 90px;" />
+             <ul class="tl ml10" style="flex:1 0 0">
+              <li class="one_text_detail">群体名称：{{ row.qtMc }}</li>
+              <li class="one_text_detail">群体级别：{{ row.qtjb }}</li>
+              <li class="flex one_text_detail">风险等级：
                 <DictTag :tag="false" :value="row.qtFxdj" :options="D_GS_ZDQT_FXDJ" />
               </li>
-              <li>创建时间：{{ row.xtCjsj }}</li>
+              <li class="one_text_detail">创建时间：{{ row.xtCjsj }}</li>
             </ul>
           </div>
-          <div class="flex">
-            <el-button type="primary" size="small" v-for="(item, index) in row.bqList" :key="index">
-              {{ item.bqMc }}</el-button>
+           <div class="ww100 one_text_detail">
+            <el-button type="primary" size="small" v-for="(item, index) in row.bqList" :key="index">{{ item.bqMc }}</el-button>
           </div>
         </template>
         <template #bgxx="{ row }">
-          <div>背景资料：{{ row.qtBjzl }}</div>
-          <div>创建单位：{{ row.xtCjbmmc }}</div>
+          <div class="flex one_text_detail">背景资料：{{ row.qtBjzl }}</div>
+          <div class="flex one_text_detail">创建单位：{{ row.xtCjbmmc }}</div>
         </template>
         <template #gkxx="{ row }">
-          <div>管辖单位：{{ row.gxSsdwmc }}</div>
-          <div>列控原因：{{ row.zdrLkyy }}</div>
-          <div>开始时间：{{ row.startTime }}</div>
-          <div>截至时间：{{ row.endTime }}</div>
+          <div class="flex one_text_detail">管辖单位：{{ row.gxSsbmmc }}</div>
+          <div class="flex one_text_detail">列控原因：{{ row.zdrLkyy }}</div>
+          <div class="flex one_text_detail">开始时间：{{ row.zdrRkkssj }}</div>
+          <div class="flex one_text_detail">截至时间：{{ row.zdrRkjssj }}</div>
         </template>
-        <template #wkrs="{ row }">
-          <span style="color: #0072ff">{{ row.wkrs }}</span>
+        <template #zdryList="{ row }">
+          <span style="color: #0072ff">{{ row.zdryList ? row.zdryList.length : 0 }}</span>
         </template>
         <template #qtZt="{ row }">
           <DictTag :tag="false" :value="row.qtZt" :options="D_GS_ZDQT_ZT" />
         </template>
-
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link size="small" v-if="row.qtZt == '01' || row.qtZt == '03' || row.qtZt == '06'" @click="openDetail(row)">送审</el-link>
-          <el-link size="small" type="success" @click="addEdit('edit', row)" v-if="row.qtZt !== '05'">编辑</el-link>
-          <el-link size="small" type="primary" @click="infoList('info', row)">查看</el-link>
-          <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
+          <el-link size="small" type="primary" @click="handleSend(row.id)">送审</el-link>
+          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -92,33 +93,17 @@
         total: pageData.total
       }"></Pages>
     </div>
-    <el-dialog v-model="dialogVisible" title="发起送审" width="500px" :before-close="handleClose">
-      <span>是否要发起送审</span>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button @click="dialogVisible = false">取消</el-button>
-          <el-button type="primary" @click="autoEdit"> 确定 </el-button>
-        </div>
-      </template>
-    </el-dialog>
     <!-- 编辑 - 新增-->
-    <EditForm v-if="show" @updateDate="getList" ref="editFormDiloag" />
-
-    <!-- 详情 -->
-    <DetailForm ref="detailDiloag" />
-
-    
-<!-- 选择用户 -->
+    <EditForm v-if="show" @updateDate="getList" ref="editFormDiloag" :dic="{D_BZ_XB,D_GS_ZDQT_LB,D_GS_ZDQT_FXDJ,D_GS_ZDR_CZZT}" />
+    <!-- 选择用户 -->
     <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" />    <!-- 转线索 -->
-    <ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList" :dic="{ D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX }">
-    </ZxsForm>
+    <ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList" :dic="{ D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX }"></ZxsForm>
   </div>
 </template>
 
 <script setup>
 import ZxsForm from "./components/zxsForm.vue";
 import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue";
-import DetailForm from "./components/infoForm.vue";
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@@ -128,50 +113,21 @@ import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
 import { ElMessage } from "element-plus";
 import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
 const { proxy } = getCurrentInstance();
+const { D_GS_ZDR_CZZT,D_GS_BK_SQLX, D_GS_ZDQT_FXDJ, D_GS_ZDR_RYJB, D_GS_ZDQT_LB, D_GS_ZDR_BK_ZT, D_GS_BQ_LX, D_GS_ZDQT_ZT, D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDR_CZZT","D_GS_BK_SQLX", "D_GS_ZDQT_FXDJ", "D_GS_ZDR_RYJB", "D_GS_ZDQT_LB", "D_GS_ZDR_BK_ZT", "D_GS_BQ_LX", "D_GS_ZDQT_ZT", "D_BZ_SF", "D_BZ_XB", "D_GS_XS_LY", "D_BZ_SSZT", "D_GS_XS_LX", "D_GS_XS_QTLX"); //获取字典数据
 const showzxs = ref(false);
-const {
-  D_GS_BK_SQLX,
-  D_GS_ZDQT_FXDJ,
-  D_GS_ZDR_RYJB,
-  D_GS_ZDQT_LB,
-  D_GS_ZDR_BK_ZT,
-  D_GS_BQ_LX,
-  D_GS_ZDQT_ZT,
-  D_BZ_SF,
-  D_BZ_XB,
-  D_GS_XS_LY,
-  D_BZ_SSZT,
-  D_GS_XS_LX,
-  D_GS_XS_QTLX
-} = proxy.$dict(
-  "D_GS_BK_SQLX",
-  "D_GS_ZDQT_FXDJ",
-  "D_GS_ZDR_RYJB",
-  "D_GS_ZDQT_LB",
-  "D_GS_ZDR_BK_ZT",
-  "D_GS_BQ_LX",
-  "D_GS_ZDQT_ZT",
-  "D_BZ_SF",
-  "D_BZ_XB",
-  "D_GS_XS_LY",
-  "D_BZ_SSZT",
-  "D_GS_XS_LX",
-  "D_GS_XS_QTLX"
-); //获取字典数据
+const queryFrom = ref({});
+const ids = ref([]);
+const choosList = ref([]);
 const show = ref(false);
 const chooseUserVisible = ref(false); //审批流程
 const roleIds = ref([]); //角色id
 const editFormDiloag = ref();
-const detailDiloag = ref();
 const searchBox = ref(); //搜索框
 const autoId = ref();
-const dialogVisible = ref(false);
 const visible = ref(false);
 const visiblefp = ref(false);
 const zxsDilof = ref();
-const obj = ref({
-  fpmc: ""
-});
+const obj = ref({});
 const searchConfiger = ref([
   {
     label: "群体名称",
@@ -231,49 +187,38 @@ const pageData = reactive({
   },
   controlsWidth: 220,
   tableColumn: [
-    { label: "群体基本信息", prop: "jbxx", showSolt: true },
-    { label: "背景信息", prop: "bgxx", showSolt: true },
-    { label: "管控信息", prop: "gkxx", showSolt: true },
-    { label: "稳控人数", prop: "wkrs", showSolt: true },
+    { label: "群体基本信息", prop: "jbxx", showSolt: true,width:300 },
+    { label: "背景信息", prop: "bgxx", showSolt: true,width:300 },
+    { label: "管控信息", prop: "gkxx", showSolt: true,width:300 },
+    { label: "稳控人数", prop: "zdryList", showSolt: true },
     { label: "状态", prop: "qtZt", showSolt: true }
   ]
 });
 
-const queryFrom = ref({});
-
 onMounted(() => {
-  getList();
   tabHeightFn();
+  getList();
 });
 
-const openDetail = (row) => {
-  autoId.value = row.id;
-  dialogVisible.value = true;
-};
 //送审
-const autoEdit = () => {
-  dialogVisible.value = false;
-  let url = `/mosty-gsxt/tbGsxtZdqt/subExamine/${autoId.value}`;
-  qcckPost({}, url)
-    .then((res) => {
-      ElMessage.success("提交成功");
+const handleSend = (id) => {
+  proxy.$confirm("确定要送审？", "警告", { type: "warning" }).then(() => {
+    qcckPost({}, "/mosty-gsxt/tbGsxtZdqt/subExamine/"+id).then(() => {
+      proxy.$message({ type: "success", message: "送审成功" });
       getList();
-    })
-    .catch(() => {
-      ElMessage.error("提交失败");
     });
+  })
 };
 
+
+
 // 搜索
 const onSearch = (val) => {
   queryFrom.value = { ...val };
   pageData.pageConfiger.pageCurrent = 1;
   getList();
 };
-// 详情
-const infoList = (type, row) => {
-  detailDiloag.value.init(type, row);
-};
+
 const changeNo = (val) => {
   pageData.pageConfiger.pageNum = val;
   getList();
@@ -287,16 +232,13 @@ const changeSize = (val) => {
 const getList = () => {
   pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  let url = "/mosty-gsxt/tbGsxtZdqt/selectPage";
-  qcckGet(data, url)
-    .then((res) => {
-      pageData.tableData = res.records || [];
-      pageData.total = res.total;
-      pageData.tableConfiger.loading = false;
-    })
-    .catch(() => {
-      pageData.tableConfiger.loading = false;
-    });
+  qcckGet(data, "/mosty-gsxt/tbGsxtZdqt/selectPage").then((res) => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => {
+    pageData.tableConfiger.loading = false;
+  });
 };
 
 // 详情
@@ -308,65 +250,49 @@ const addEdit = (type, row) => {
   });
 };
 
-const ids = ref([]);
-const choosList = ref([]);
 const chooseData = (data) => {
   ids.value = Array.isArray(data) ? data.map((item) => item.id) : [];
   choosList.value = Array.isArray(data) ? data : [];
 };
 // 选择申请数据数据
 const handleApplication = () => {
-  if (ids.value.length === 0)
-    return ElMessage.error("请先选择需要布控的重点群体");
-  qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdqt/addBksq")
-    .then(() => {
-      ElMessage.success("申请成功");
-      visible.value = false;
-      getList();
-    })
-    .catch(() => {
-      ElMessage.error("布控申请失败");
-    });
+  if (ids.value.length === 0)return ElMessage.error("请先选择需要布控的重点群体");
+  qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdqt/addBksq").then(() => {
+    ElMessage.success("申请成功");
+    visible.value = false;
+    getList();
+  }).catch(() => {
+    ElMessage.error("布控申请失败");
+  });
 };
 
 const handleUserSelected = (val) => {
   obj.value.fpmc = val[0].userName;
   obj.value.fpid = val[0].id;
 };
+
 const handlefp = () => {
-  if (ids.value.length === 0)
-    return ElMessage.error("请先选择需要分配的重点群体");
-  qcckPost(
-    { ids: ids.value, uid: obj.value.fpid },
-    "/mosty-gsxt/tbGsxtZdqt/addGkmj"
-  )
-    .then(() => {
-      ElMessage.success("分配成功");
-      visible.value = false;
-      visiblefp.value = false;
-      getList();
-    })
-    .catch(() => {
-      ElMessage.error("分配失败");
-    });
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要分配的重点群体");
+  qcckPost({ ids: ids.value, uid: obj.value.fpid },"/mosty-gsxt/tbGsxtZdqt/addGkmj").then(() => {
+    ElMessage.success("分配成功");
+    visible.value = false;
+    visiblefp.value = false;
+    getList();
+  }).catch(() => {
+    ElMessage.error("分配失败");
+  });
 };
 // 移交管控
 const handleMove = () => {
-  if (ids.value.length === 0)
-    return ElMessage.error("请先选择需要移交管控的重点群体");
-  proxy
-    .$confirm("是否确定移交？", "警告", { type: "warning" })
-    .then(() => {
-      qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdqt/addSfyj")
-        .then(() => {
-          ElMessage.success("移交管控成功");
-          getList();
-        })
-        .catch(() => {
-          ElMessage.error("移交管控失败");
-        });
-    })
-    .catch(() => { });
+  if (ids.value.length === 0) return ElMessage.error("请先选择需要移交管控的重点群体");
+  proxy.$confirm("是否确定移交？", "警告", { type: "warning" }).then(() => {
+    qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdqt/addSfyj").then(() => {
+      ElMessage.success("移交管控成功");
+      getList();
+    }).catch(() => {
+      ElMessage.error("移交管控失败");
+    });
+  }).catch(() => { });
 };
 
 const handleZxs = () => {
@@ -377,15 +303,24 @@ const handleZxs = () => {
   });
 };
 
+// 删除数据
+const deleteRow = (id) =>{
+  proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => {
+    qcckDelete({}, "/mosty-gsxt/tbGsxtZdqt/" + id).then(() => {
+      proxy.$message({ type: "success", message: "删除成功" });
+      getList();
+    });
+  })
+}
+
 // 表格高度计算
 const tabHeightFn = () => {
-  pageData.tableHeight =
-    window.innerHeight - searchBox.value.offsetHeight - 250;
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
   window.onresize = function () {
     tabHeightFn();
   };
 };
-defineExpose({ infoList });
+defineExpose({});
 </script>
 
 <style>
@@ -393,9 +328,4 @@ defineExpose({ infoList });
   background: rgba(0, 0, 0, 0.5) !important;
 }
 
-.rowClass {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
 </style>
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
index b17ec2b..09662cd 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
@@ -82,7 +82,6 @@
 
         <!-- 操作 -->
         <template #controls="{ row }">
-          <!-- 送审后数据到审批中 -->
            <el-link size="small" type="success" >送审</el-link>
           <el-link size="small" type="primary" @click="addEdit('edit', row)" >编辑</el-link>
           <el-link size="small" type="danger" @click="deleteRow(row)">删除</el-link>
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue
index ab2ec2b..faf1fcb 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue
@@ -10,7 +10,6 @@
             <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm" @click="handleApplication(it)" >{{ it.zdmc }}</el-button>
           </div>
         </el-popover>
-
         <el-popover placement="bottom" :visible="visiblefp" :width="400" trigger="click">
           <template #reference>
             <el-button size="small" type="primary" @click="(visiblefp = !visiblefp), (visible = false)" >指定分配</el-button>