From e07beea359000a03aea8563d810609527e20aba9 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Thu, 10 Jul 2025 19:07:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myControl/components/addBkdx.vue          | 31 +++++++++++++------
 .../myControl/components/addPeo.vue           |  3 +-
 .../myControl/components/bkqtDialod.vue       |  7 +++++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue
index 04a7637..56ee63d 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue
@@ -88,9 +88,9 @@
                 </el-form-item>
             </div>
             <div style="width: 100%;" class="mt10">
-                <el-form-item prop="kbfj" label="上传附件" style="width: 100%;">
+                <el-form-item prop="bkfj" label="上传附件" style="width: 100%;">
                     <div>
-                        <MOSTY.Upload  :limit="10" v-model="listQuery.kbfj" :key="1" />
+                        <MOSTY.Upload  :limit="10" v-model="listQuery.bkfj" :key="1" />
                         <div>支持png、jpg、pdf文件上传</div>
                     </div>
                 </el-form-item>
@@ -100,7 +100,7 @@
             <el-form-item prop="czjsdw" label="处置接收单位" style="width: 100%;">
                 <div class="flex align-center ww100">
                     <MOSTY.Department v-model="listQuery.czJsdwdm" style="width:260px;margin-right: 10px;" placeholder="请选择处置要求" clearable />
-                    <el-radio-group v-model="listQuery.dwlx" class="flex align-center">
+                    <el-radio-group v-model="listQuery.czJsdwlx" class="flex align-center">
                         <el-radio :label="it.dm" v-for="(it,idx) in props.dic.D_GS_BK_CZJSDWLX" :key="idx">{{ it.zdmc }}</el-radio>
                     </el-radio-group>
                 </div>
@@ -210,12 +210,13 @@ const tableDate = reactive({
     { label: "车牌号", prop: "clCph" },
     { label: "车架号", prop: "clCjh" },
     { label: "特征描述", prop: "qtTzms" },
-    { label: "人员标签", prop: "bqList" ,showSolt:true }
+    { label: "人员标签", prop: "bqList" ,showSolt:true,showOverflowTooltip:true }
   ]
 });
 const disabled = ref(false)
 // 初始化数据
 const init = (type,row) => {
+    listQuery.value.bkfj = [];
     if(type == 'add'){
         tableDate.tableConfiger.haveControls = true;
         disabled.value = false;
@@ -246,11 +247,13 @@ const get_bkqy_list = (row) =>{
 const getDataById = (id) =>{
     qcckGet({},'/mosty-gsxt/tbGsxtBk/selectVoById/'+id).then(res=>{
        console.log(res,'=========00');
+       res.bkqyList = res.qyList || [];
        listQuery.value = res || {}
     })
 }
 
 const shangeDx = () =>{
+    listQuery.value.bkDxxx = '';
     listQuery.value.bkdxList = [];
     roleIds.value = [];
     addPerson.value = []
@@ -260,7 +263,6 @@ const deleteRow = (row) => {
     roleIds.value = roleIds.value.filter(id => id != row.id);
     addPerson.value = addPerson.value.filter(it => it.id != row.id);
     listQuery.value.bkdxList = listQuery.value.bkdxList.filter(it => it.id != row.id);
-    console.log(row,'====');
 }
 // 单独新增的数据
 const choosedAdd = (item) =>{
@@ -275,14 +277,23 @@ const choosed = (val) => {
     if(listQuery.value.bkDx == '01'){// 人员
         roleIds.value = val.map(it=>it.id);
         let arr = val.map(item=>{
-            return { id:item.id, fjZp:item.fjZp, ryXm:item.ryXm, ryXb:item.ryXb, rySfzh:item.rySfzh, ryHjd:item.hjdXz, ryXjd:item.xzdXz, rySjhm:item.ryLxdh, qtXnsf:item.qtXnsf,clCjh:item.clCjh, clCph:item.clCph, qtTzms:item.qtTzms, bqList:item.bqList }
+            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, ryHjd:item.hjdXz, ryXjd:item.xzdXz, rySjhm:item.ryLxdh, qtXnsf:item.qtXnsf,clCjh:item.clCjh, clCph:item.clCph, qtTzms:item.qtTzms, bqList:bqs }
         })
         listQuery.value.bkdxList = [...addPerson.value,...arr]; 
     }else{// 群体
-        
-
+        listQuery.value.bkDxxx = (val.map(it=>it.id)).join(',');
+        let peolist = []
+        val.forEach(item=>{
+            if(item.zdryList) list = list.concat(item.zdryList)
+        })
+        listQuery.value.bkdxList = peolist;
     }
 };
+
 // 选择人员
 const handleAddPeo = () =>{
     if(!listQuery.value.bkDx) return proxy.$message({ type: "warning", message: '请选择布控对象' });
@@ -293,7 +304,7 @@ const handleAddPeo = () =>{
 const submit = () => {
   elform.value.validate(() => {
     let params = {  ...listQuery.value };
-    params.kbfj = params.kbfj ? params.kbfj.join(','):'';
+    params.bkfj = params.bkfj ? params.bkfj.join(','):'';
     params.bkdxList = params.bkdxList ? params.bkdxList : [];
     params.bkdxList.forEach(item=>{
         item.fjZp = item.fjZp ? item.fjZp.join(',') : ''
@@ -315,6 +326,8 @@ const close = () => {
   listQuery.value = {};
   dialogForm.value = false;
   loading.value = false;
+  addPerson.value = [];
+  roleIds.value = []
 };
 
 defineExpose({ init });
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addPeo.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addPeo.vue
index 8d09f25..82e8242 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/addPeo.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/addPeo.vue
@@ -60,7 +60,7 @@ const init = () =>{
 // 选择标签
 const choosed = (val) => {
     listQuery.value.bqList = val.map(v=>{
-        return { bqDm:v.bqDm, bqId:v.id, bqLb:v.bqLb, bqLx:v.bqLx, bqMc:v.bqMc }
+        return { bqZl:v.bqLb , bqId:v.id, bqLx:v.bqLx, bqLb:v.bqLb, bqMc:v.bqMc, bqDm:v.bqDm }
     });
     roleIds.value = val.map(v=>v.id)
 }
@@ -82,6 +82,7 @@ const submitForm = () =>{
 const close = () =>{
     elform.value.reset();
     listQuery.value.bqList = []
+    roleIds.value = []
     showDialog.value = false;
 }
 
diff --git a/src/views/backOfficeSystem/IntelligentControl/myControl/components/bkqtDialod.vue b/src/views/backOfficeSystem/IntelligentControl/myControl/components/bkqtDialod.vue
index e8616ef..87fbeb3 100644
--- a/src/views/backOfficeSystem/IntelligentControl/myControl/components/bkqtDialod.vue
+++ b/src/views/backOfficeSystem/IntelligentControl/myControl/components/bkqtDialod.vue
@@ -33,6 +33,13 @@
                 </el-table-column>
                 <el-table-column prop="ryLxdh" align="center" label="手机号"/>
                 <el-table-column prop="xzdXz" align="center" label="现居住址"/>
+                <el-table-column prop="bqList" align="center" label="人员标签">
+                  <template #default="{ row }">
+                      <span v-if="row.bqList">
+                        <span v-for="(it,idx) in row.bqList" :key="idx"> {{ it.bqMc }}、</span>
+                      </span>
+                    </template>
+                </el-table-column>
               </el-table>
             </div>
           </template>