From 3870addd51048af668d0f9225620d26b71ee2727 Mon Sep 17 00:00:00 2001
From: Esacpe <1113279529@qq.com>
Date: Tue, 22 Jul 2025 18:00:05 +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

---
 src/components/ypModel/index.vue                    |  2 +-
 src/views/KeyPopulations/index.vue                  |  7 ++++++-
 src/views/KeyPopulations/model/importantPerson.vue  | 11 ++++++++---
 .../JudgmentHome/MeetingRoom/index.vue              |  3 +++
 .../JudgmentHome/ResearchHome/index.vue             |  6 +++---
 .../JudgmentHome/tsypHome/index.vue                 | 13 +++++++++----
 6 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/components/ypModel/index.vue b/src/components/ypModel/index.vue
index 900f96c..b11378d 100644
--- a/src/components/ypModel/index.vue
+++ b/src/components/ypModel/index.vue
@@ -9,7 +9,7 @@
     <template #footer>
         <el-button type="primary">暂存</el-button>
         <el-button type="primary">下载</el-button>
-        <el-button type="primary">取消</el-button>
+        <el-button type="primary" @click="close">取消</el-button>
     </template>
   </el-dialog>
 </template>
diff --git a/src/views/KeyPopulations/index.vue b/src/views/KeyPopulations/index.vue
index f554cfb..b7c561d 100644
--- a/src/views/KeyPopulations/index.vue
+++ b/src/views/KeyPopulations/index.vue
@@ -18,7 +18,7 @@
     </div>
 
     <div class="foot">
-      <div class="footBtn"><span>发布指令</span></div>
+      <div class="footBtn" @click="gozl"><span>发布指令</span></div>
     </div>
   </div>
 </template>
@@ -29,6 +29,11 @@ import Head from "@/views/home/layout/head.vue";
 import ImportantPerson from "./model/importantPerson.vue";
 import Zdrqhd from "./model/zdrqhd.vue";
 import Yjclqktj from "./model/yjclqktj.vue";
+import { useRoute, useRouter } from 'vue-router';
+const router = useRouter()
+const gozl = () =>{
+  router.push('/InstructionInformation')
+}
 </script>
 <style lang="scss" scoped>
 @import "@/assets/css/homeScreen.scss";
diff --git a/src/views/KeyPopulations/model/importantPerson.vue b/src/views/KeyPopulations/model/importantPerson.vue
index 00e0b53..c6788e5 100644
--- a/src/views/KeyPopulations/model/importantPerson.vue
+++ b/src/views/KeyPopulations/model/importantPerson.vue
@@ -16,8 +16,13 @@
                <DictTag :tag="false" :value="row.qtFxdj" :options="D_GS_ZDQT_FXDJ"/>
             </template>
             <template #bqList="{row}">
-               <span v-if="row.bqList">
-                  <el-tag type="success" v-for="(it, idx) in row.bqList" :key="idx">{{it.bqMc  }}</el-tag>
+              <span v-if="row.bqList">
+                <span v-for="(it, idx) in row.bqList" :key="idx">{{it.bqMc  }}、</span>
+              </span>
+            </template>
+            <template #qbcjList="{row}">
+               <span v-if="row.qbcjList">
+                  <span v-for="(it, idx) in row.qbcjList" :key="idx">{{it.xsMc  }}、</span>
                </span>
             </template>
             <template #qtZt="{row}">
@@ -57,7 +62,7 @@ const pageData = reactive({
     { label: "姓名", prop: "ryXm", showOverflowTooltip: true },
     { label: "身份证号码", prop: "rySfzh",showOverflowTooltip: true },
     { label: "标签", prop: "bqList",showOverflowTooltip: true,showSolt:true },
-    { label: "所属线索", prop: "xsmc",showOverflowTooltip: true },
+    { label: "所属线索", prop: "qbcjList",showOverflowTooltip: true,showSolt:true },
   ]
 });
 
diff --git a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue
index de4ccc5..04df782 100644
--- a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue
@@ -75,8 +75,10 @@ import * as MOSTY from "@/components/MyComponents/index";
   import Pages from "@/components/aboutTable/Pages.vue";
   import Search from "@/components/aboutTable/Search.vue";
   import DetailForm from "./components/detailForm.vue";
+  import { useRoute, useRouter } from 'vue-router';
   import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
   import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+  const route = useRoute();
   const { proxy } = getCurrentInstance();
   const detailDiloag = ref();
   const searchBox = ref(); //搜索框
@@ -139,6 +141,7 @@ import * as MOSTY from "@/components/MyComponents/index";
     pageData.loading = true;
     let data = { ...pageData.pageConfiger, ...queryFrom.value };
     delete data.daterange; // 删除daterange字段
+    if(route.query.tsypid) data.tsypid = route.query.tsypid;
     qcckGet(data,'/mosty-gsxt/wshs/selectPage').then(res=>{
       let arr = res.records || [];
       arr.forEach(item => {
diff --git a/src/views/backOfficeSystem/JudgmentHome/ResearchHome/index.vue b/src/views/backOfficeSystem/JudgmentHome/ResearchHome/index.vue
index 96e49a4..a786c8b 100644
--- a/src/views/backOfficeSystem/JudgmentHome/ResearchHome/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/ResearchHome/index.vue
@@ -62,7 +62,7 @@
       </div>
     </div>
   </div>
-  
+
   <YpModel v-model="showModel" :textContent="textContent" ></YpModel>
 </template>
 
@@ -202,10 +202,10 @@ const handleYP = () =>{
   qcckPost(params,'/mosty-gsxt/wshs/getDcypbg').then(res=>{
     let data = res || {};
     let html = `<p class="html_bt">${data.bt}</p>`
-    html+=`<div> <span>${data.zz}</span> <span>${data.bh}</span> <span>${data.sj}</span> </div>`
+    html+=`<p>${data.head}</p>`
     html+=`<p>${data.nr}</p>`
     html+=`<p>${data.bc}</p>`
-    html+=`<div><span>${data.cbr}</span> <span>${data.hgr}</span> <span>${data.qfr}</span> </div>`
+    html+=`<p>${data.end}</p>`
     textContent.value = html;
     showModel.value = true;
   })
diff --git a/src/views/backOfficeSystem/JudgmentHome/tsypHome/index.vue b/src/views/backOfficeSystem/JudgmentHome/tsypHome/index.vue
index 29fc992..e66895b 100644
--- a/src/views/backOfficeSystem/JudgmentHome/tsypHome/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/tsypHome/index.vue
@@ -22,7 +22,7 @@
           <div class="f14 lh24 pl4 pr4 one_text_detail">数量：{{ it.num }}</div>
           <div class="foot">
             <span class="ml10 pointer" @click.stop="handleYp(it)" style="color:#027ff0 ;"><el-icon style="top: 2px;"><Document /></el-icon>报告</span>
-            <span class="ml10 pointer" style="color:#f4ac47 ;"><el-icon  style="top: 2px;"><Files /></el-icon>会商</span>
+            <span class="ml10 pointer" @click="handleHs(it)" style="color:#f4ac47 ;"><el-icon  style="top: 2px;"><Files /></el-icon>会商</span>
           </div>
         </li>
         <div class="ww100 flex just-center">
@@ -44,7 +44,9 @@ import * as MOSTY from "@/components/MyComponents/index";
 import CheckBox from "@/components/checkBox/index.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import { qcckPost } from "@/api/qcckApi.js";
+import { useRoute, useRouter } from 'vue-router';
 import { reactive, ref, onMounted, getCurrentInstance,watch, nextTick } from "vue";
+const router = useRouter();
 const { proxy } = getCurrentInstance();
 const {  D_SG_SJLY,D_SG_TSYPGZ} = proxy.$dict("D_SG_SJLY","D_SG_TSYPGZ"); //获取字典数据
 const searchBox = ref(); //搜索框
@@ -143,14 +145,17 @@ const handleYp = (val) =>{
   qcckPost(params,'/mosty-gsxt/wshs/getDcypbg').then(res=>{
     let data = res || {};
     let html = `<p class="html_bt">${data.bt}</p>`
-    html+=`<div> <span>${data.zz}</span> <span>${data.bh}</span> <span>${data.sj}</span> </div>`
+    html+=`<p>${data.head}</p>`
     html+=`<p>${data.nr}</p>`
     html+=`<p>${data.bc}</p>`
-    html+=`<div><span>${data.cbr}</span> <span>${data.hgr}</span> <span>${data.qfr}</span> </div>`
+    html+=`<p>${data.end}</p>`
     textContent.value = html;
     showModel.value = true;
   })
-  
+}
+
+const handleHs = (val) =>{
+  router.push({path:'/MeetingRoom',query:{tsypid:val.id}})
 }
 
 // 查看详情