Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/detailForm.vue

@@ -50,9 +50,9 @@ const formData = ref([
   { label: "会商开始时间", prop: "hskssj", type: "datetime" },
   { label: "会商结束时间", prop: "hsjssj", type: "datetime" },
   { label: "会商内容", prop: "hsnr", type: "textarea", width: "100%" },
-  { label: "关联线索", prop: "glxsmc", type: "slot", },
+  // { label: "关联线索", prop: "glxsmc", type: "slot", },
   { label: "会商标题", prop: "hsbt", type: "input" },
-  { label: "参会人员", prop: "chryList", type: "slot" ,width:'100%'},
+  // { label: "参会人员", prop: "chryList", type: "slot" ,width:'100%'},
 ]);
 const listQuery = ref({}); //表单
 const loading = ref(false);

src/views/backOfficeSystem/JudgmentHome/MeetingRoom/index.vue

@@ -23,7 +23,7 @@
         </div>
         <div class="mid">
           <div class="left">
-            <div class="title ellipsis">参会人员：{{ item.chry }}</div>
+            <!-- <div class="title ellipsis">参会人员：{{ item.chry }}</div> -->
             <div class="desc">
               <div class="info ellipsis" v-for="(el, i) in item.xsplList" :key="i">{{ i + 1 }}、{{ el.plnr }}</div>
             </div>

src/views/home/components/deployControlItem.vue

@@ -51,7 +51,7 @@
       <el-button type="primary" @click="pushWarning(item)">预警指派</el-button>
       <el-button color="#ef7762" @click="showDetail(item)" style="color: #fff;">转合成</el-button>
       <!-- <el-button type="warning">转基管</el-button> -->
-      <el-button type="danger">转会商</el-button>
+      <el-button type="danger" @click="showTransfer(item)">转会商</el-button>
       <el-button type="success" @click="showFeedback(item, '签收')" v-if="item.czzt == '01'">签收</el-button>
       <el-button type="success" @click="showFeedback(item, '反馈')" v-if="item.czzt == '02'">反馈</el-button>
       <el-button type="success" @click="showFeedback(item, '查看反馈')" v-if="item.czzt == '03'">查看反馈</el-button>
@@ -70,9 +70,9 @@ import { qcckGet, qcckPost } from "@/api/qcckApi.js";
 import HolographicArchive from './holographicArchive.vue'
 import WarningAssignment from './warningAssignment.vue'
 import { holographicProfileJump } from "@/utils/tools.js"
-
+import { useRoute, useRouter } from 'vue-router';
 const { proxy } = getCurrentInstance();
-
+const router = useRouter();
 const props = defineProps({
   item: {
     type: Object,
@@ -90,6 +90,11 @@ watch(() => props.item, (newVal, oldVal) => {
 },{deep:true,immediate:true})
 const emit = defineEmits(["plotThetrajectory", "showDetail", 'showFeedback','fkLxOptions']);
 
+const showTransfer = (item) => {
+  router.push({
+    path: '/MeetingRoom',
+  })
+}
 const changeBG = (str) => {
   switch (str) {
     case "01":