From a6b918f7627ced34ae8c6218bb8241bc01c56955 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Sun, 20 Jul 2025 16:02:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mpvGroup/components/addForm.vue           | 14 ++++++++---
 .../mpvGroup/components/addcjlr.vue           |  1 +
 .../DeploymentDisposal/mpvGroup/index.vue     | 20 ++++++++++++---
 .../DeploymentDisposal/mpvGroupSh/index.vue   | 25 ++++++++++++++++---
 .../DeploymentDisposal/mpvPeo/index.vue       | 21 +++++++++++++---
 .../DeploymentDisposal/mpvPeoSh/index.vue     | 22 +++++++++++++---
 6 files changed, 85 insertions(+), 18 deletions(-)

diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue
index 028a0ae..bf87b93 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addForm.vue
@@ -3,8 +3,8 @@
     <div class="head_box">
       <span class="title">{{ title }} 重点群体管理 </span>
       <div>
-        <el-button size="small" @click="close">关闭</el-button>
         <el-button type="primary" v-if="!disabled" size="small" :loading="loading" @click="submit">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
     <div class="form_cnt">
@@ -28,7 +28,7 @@
                 :tableConfiger="pageData.qcjConfiger"
                 :controlsWidth="pageData.controlsWidth">
                 <template #controls="{ row }">
-                  <el-link type="danger" @click="delDictItem(row.bqId)">删除</el-link>
+                  <el-link type="danger" @click="delDictItem(row)">删除</el-link>
                 </template>
               </MyTable>
             </div>
@@ -128,7 +128,7 @@ const formData = ref([
   { label: "群体成立时间", prop: "qtClsj", type: "date" },
   { label: "群体标签", prop: "bqList", type: "slot", width: "100%" },
   { label: "两群采集录入", prop: "lqxxList", type: "slot", width: "100%" },
-  { label: "管辖单位", prop: "gxSsbmdm", type: "department" },
+  { label: "管辖单位", prop: "gxSsbmdm",depMc:'gxSsbmmc', type: "department" },
   { label: "入库开始时间", prop: "zdrRkkssj", type: "datetime" },
   { label: "入库截至时间", prop: "zdrRkjssj", type: "datetime" },
   { label: "列控原因", prop: "zdrLkyy", type: "textarea",width: "100%" },
@@ -146,7 +146,7 @@ const pageData = reactive({
     showSelectType: "null",
     loading: false,
   },
-  controlsWidth: 220, //操作栏宽度
+  controlsWidth: 120, //操作栏宽度
   zdryColumn: [
     { label: "姓名", prop: "ryXm"},
     { label: "性别", prop: "ryXb", showSolt: true },
@@ -275,6 +275,12 @@ const getSPdep = (val) =>{
   listQuery.value.sprSsbmmc = val ? val.orgName : ''
 }
 
+const delDictItem = (row) =>{
+  listQuery.value.lqxxList = listQuery.value.lqxxList.filter(v=>{
+    return row.id != v.id
+  })
+}
+
 // 关闭
 const close = () => {
   listQuery.value = {};
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addcjlr.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addcjlr.vue
index 4741bc5..685c8b6 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addcjlr.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/components/addcjlr.vue
@@ -47,6 +47,7 @@ const init = (lx,row) =>{
 
 const submitForm = () =>{
     elform.value.submit((val)=>{
+        val.id = new Date().getTime();
         let obj = { type:type.value, data:val }
         emit('change',obj)
         showDialog.value = false;
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
index e69e4bd..4032934 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
@@ -59,10 +59,13 @@
               <li class="one_text_detail">创建时间：{{ row.xtCjsj }}</li>
             </ul>
           </div>
-           <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 #bqList="{ row }">
+          <ul >
+            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{ item.bqFz || 0  }} 分) </li> 
+          </ul>
+        </template>
+
         <template #bgxx="{ row }">
           <div class="flex one_text_detail">背景资料：{{ row.qtBjzl }}</div>
           <div class="flex one_text_detail">创建单位：{{ row.xtCjbmmc }}</div>
@@ -188,6 +191,7 @@ const pageData = reactive({
   tableColumn: [
     { label: "群体基本信息", prop: "jbxx", showSolt: true,width:300 },
     { label: "背景信息", prop: "bgxx", showSolt: true,width:300 },
+    { label: "标签", prop: "bqList", showSolt: true ,width:200,showOverflowTooltip:true},
     { label: "管控信息", prop: "gkxx", showSolt: true,width:300 },
     { label: "稳控人数", prop: "zdryList", showSolt: true },
     { label: "状态", prop: "qtZt", showSolt: true }
@@ -321,6 +325,16 @@ const tabHeightFn = () => {
 defineExpose({});
 </script>
 
+<style lang="scss" scoped>
+.marks{
+  padding: 0 4px;
+  white-space: nowrap;
+  background: #73acf1;
+  border-radius: 4px;
+  color: #fff;
+}
+</style>
+
 <style>
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue
index e6902bb..4d28773 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvGroupSh/index.vue
@@ -60,10 +60,17 @@
               <li class="one_text_detail">创建时间：{{ row.xtCjsj }}</li>
             </ul>
           </div>
-           <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 #bqList="{ row }">
+          <ul >
+             <ul >
+            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{ item.bqFz || 0  }} 分) </li> 
+          </ul>
+          </ul>
+        </template>
+
         <template #bgxx="{ row }">
           <div class="flex one_text_detail">背景资料：{{ row.qtBjzl }}</div>
           <div class="flex one_text_detail">创建单位：{{ row.xtCjbmmc }}</div>
@@ -231,6 +238,7 @@ const pageData = reactive({
   tableColumn: [
     { label: "群体基本信息", prop: "jbxx", showSolt: true,width:300 },
     { label: "背景信息", prop: "bgxx", showSolt: true,width:300 },
+    { label: "标签", prop: "bqList", showSolt: true ,width:200,showOverflowTooltip:true},
     { label: "管控信息", prop: "gkxx", showSolt: true,width:300 },
     { label: "稳控人数", prop: "zdryList", showSolt: true },
     { label: "状态", prop: "qtZt", showSolt: true }
@@ -395,6 +403,17 @@ const tabHeightFn = () => {
 defineExpose({});
 </script>
 
+<style lang="scss" scoped>
+.marks{
+  padding: 0 4px;
+  white-space: nowrap;
+  background: #73acf1;
+  border-radius: 4px;
+  color: #fff;
+}
+</style>
+
+
 <style>
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
index d678de8..51db10c 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeo/index.vue
@@ -58,15 +58,18 @@
               <li class="flex one_text_detail">民族：<DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" /></li>
             </ul>
           </div>
-          <div class="ww100 one_text_detail">
-            <el-button :key="index" type="primary" size="small" v-for="(item, index) in row.bqList">{{ item.bqMc }}</el-button>
-          </div>
         </template>
         <template #jzxx="{ row }">
           <div class="flex one_text_detail">户籍地区划：<DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" /></div>
           <div class="flex one_text_detail">户籍派出所：{{ row.hjdPcsmc }}</div>
           <div class="flex one_text_detail">户籍地详址：{{ row.hjdXz }}</div>
         </template>
+
+        <template #bqList="{ row }">
+          <ul >
+            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{ item.bqFz || 0  }} 分) </li> 
+          </ul>
+        </template>
         <template #gxdw="{ row }">
           <div class="flex one_text_detail">管辖单位：{{ row.gxSsbmmc }}</div>
           <div class="flex">人员级别：<DictTag :tag="false" :value="row.zdrRyjb" :options="D_GS_ZDR_RYJB"/> </div>
@@ -85,7 +88,7 @@
 
         <!-- 操作 -->
         <template #controls="{ row }">
-           <el-link size="small" type="success" v-if="row.zdrZt == '01'" @click="handleSend(row.id)">送审</el-link>
+          <el-link size="small" type="success" v-if="row.zdrZt == '01'" @click="handleSend(row.id)">送审</el-link>
           <el-link size="small" type="primary" v-if="row.zdrZt == '01'" @click="addEdit('edit', row)" >编辑</el-link>
           <el-link size="small" type="primary" @click="addEdit('detail', row)" >详情</el-link>
           <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
@@ -179,6 +182,7 @@ const pageData = reactive({
   tableColumn: [
     { label: "重点人员信息", prop: "ryxx", showSolt: true,width:300,showOverflowTooltip:true },
     { label: "户籍居住信息", prop: "jzxx", showSolt: true,width:300, },
+    { label: "标签", prop: "bqList", showSolt: true ,width:200,showOverflowTooltip:true},
     { label: "管辖单位", prop: "gxdw", showSolt: true,width:300, },
     { label: "处置状态", prop: "zdrCzzt", showSolt: true },
     { label: "状态", prop: "xtSjzt", showSolt: true },
@@ -315,6 +319,15 @@ const tabHeightFn = () => {
 };
 </script>
 
+<style lang="scss" scoped>
+.marks{
+  padding: 0 4px;
+  white-space: nowrap;
+  background: #73acf1;
+  border-radius: 4px;
+  color: #fff;
+}
+</style>
 <style>
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
diff --git a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue
index 3636dce..b81c6e4 100644
--- a/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue
+++ b/src/views/backOfficeSystem/DeploymentDisposal/mpvPeoSh/index.vue
@@ -53,10 +53,13 @@
               <li class="flex one_text_detail">民族：<DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" /></li>
             </ul>
           </div>
-          <div class="ww100 one_text_detail">
-            <el-button :key="index" type="primary" size="small" v-for="(item, index) in row.bqList">{{ item.bqMc }}</el-button>
-          </div>
         </template>
+        <template #bqList="{ row }">
+         <ul >
+            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{ item.bqFz || 0  }} 分) </li> 
+          </ul>
+        </template>
+
         <template #jzxx="{ row }">
           <div class="flex one_text_detail">户籍地区划：<DictTag :tag="false" :value="row.hjdQh" :options="D_BZ_XZQHDM" /></div>
           <div class="flex one_text_detail">户籍派出所：{{ row.hjdPcsmc }}</div>
@@ -221,10 +224,11 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 200,
+  controlsWidth: 120,
   tableColumn: [
     { label: "重点人员信息", prop: "ryxx", showSolt: true,width:300,showOverflowTooltip:true },
     { label: "户籍居住信息", prop: "jzxx", showSolt: true,width:300, },
+    { label: "标签", prop: "bqList", showSolt: true ,width:200,showOverflowTooltip:true},
     { label: "管辖单位", prop: "gxdw", showSolt: true,width:300, },
     { label: "处置状态", prop: "zdrCzzt", showSolt: true },
     { label: "状态", prop: "xtSjzt", showSolt: true },
@@ -386,6 +390,16 @@ const tabHeightFn = () => {
 };
 </script>
 
+<style lang="scss" scoped>
+.marks{
+  padding: 0 4px;
+  white-space: nowrap;
+  background: #73acf1;
+  border-radius: 4px;
+  color: #fff;
+}
+</style>
+
 <style>
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;