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

、·# especially if it merges an updated upstream into a topic branch.

src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue

@@ -53,10 +53,8 @@
           <DictTag :tag="false" :value="row.qtFxdj" :options="D_GS_ZDQT_FXDJ" />
         </template>
         <template #bqList="{ row }">
-          <ul>
+            <span class="one_text_detail marks mr2" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{
-            <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{
+              item.bqFz || 0 }} 分) 、</span>
-              item.bqFz || 0 }} 分) </li>
-          </ul>
         </template>
         <template #zdryList="{ row }">
           <span style="color: #0072ff">{{ row.zdryList ? row.zdryList.length : 0 }}</span>
@@ -326,7 +324,7 @@ defineExpose({});
 
 <style lang="scss" scoped>
 .marks {
-  padding: 0 4px;
+  padding: 0 2px;
   white-space: nowrap;
   background: #73acf1;
   border-radius: 4px;

src/views/backOfficeSystem/HumanIntelligence/infoCollection/infomation.vue

@@ -65,11 +65,22 @@
         <!-- "市情指挥人员": ["采纳", "回退", "分组", "转线索", "转合成", "转会商", "打标签", "修改", "详情", "关注部门", "送审"], -->
         <!-- "县情指人员": ["上报", "回退", "修改", "详情", "送审"], -->
         <template #controls="{ row }">
-          <el-link v-if="isShowBtn('送审', row) && qxkz.deptLevel == '01'" :disabled="!(row.lczt == '04')||row.sldshzt != '00'" size="small" type="primary"
+          <el-link 
-            @click="postXxcjXxcjTjsh(row)">送审</el-link>
+            v-if="isShowBtn('送审', row) && qxkz.deptLevel == '01'" 
-          <el-link v-if="isShowBtn('送审', row) && qxkz.deptLevel == '02'"
+            :disabled="!(row.lczt == '04')||row.sldshzt != '00'" 
-            :disabled="row.xldshzt != '00' " size="small" type="primary"
+            size="small" type="primary"
-            @click="postXxcjXxcjTjsh(row)">送审</el-link>
+            @click="postXxcjXxcjTjsh(row)">
+            送审
+          </el-link>
+
+          <!-- <el-link 
+            v-if="isShowBtn('送审', row) && qxkz.deptLevel == '02'"
+            :disabled="row.xldshzt != '00' " 
+            size="small" type="primary"
+            @click="postXxcjXxcjTjsh(row)">
+            送审
+          </el-link> -->
+          
           <!-- （01 提交 02 上报县局  03 上班市局 04 采纳 05 退回 06 打标签  07 转合成  08 转线索  09 转会商）v-if="qxkz.deptLevel == '01'" -->
 
           <el-link v-if="isShowBtn('上报') && qxkz.deptLevel == '03'" size="small" type="primary" @click="appearNewspapers(row)"  :disabled="row.lczt != '01'">上报</el-link>
@@ -93,7 +104,7 @@
           <!-- 所有状态都能进行转会商 -->
           <!-- <el-link v-if="isShowBtn('转会商')" size="small" type="primary" @click="handleTransferMerchant(row)" :disabled="butcontroll('01', row.lczt)">转会商</el-link> -->
 
-          <el-link v-if="isShowBtn('关注部门')" :disabled="row.sldshzt != '02'" size="small" type="primary" @click="FollowUpOnDept(row)">关注</el-link>
+          <el-link v-if="isShowBtn('关注部门') && row.qbjb=='01'" :disabled="row.sldshzt != '02'" size="small" type="primary" @click="FollowUpOnDept(row)">关注</el-link>
           <!-- 市局能给所有数据创建标签 -->
           <el-link v-if="isShowBtn('打标签')" size="small" type="primary" @click="openCustomTag(row)" :disabled="row.sldshzt != '02'">打标签</el-link>
         </template>
@@ -552,6 +563,9 @@ onMounted(() => {
   } else {
     qxkz.depBool = false
   }
+
+  console.log(qxkz,'=======qxkz');
+  
   titleData.value = route.meta.title
   tabHeightFn()
   if (route.query.id) {

src/views/backOfficeSystem/policeReport/index.vue

@@ -63,11 +63,11 @@
 </template>
 
 <script setup>
+import { qcckGet } from '@/api/qcckApi.js'
 import { getMultiDictVal } from "@/utils/dict.js"
 import { exportExlByObj } from "@/utils/exportExcel.js"
 import YpDialog from "./components/ypDialog.vue";
 import DeepYpDialog from "./components/deepypDialog.vue";
-
 import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
@@ -134,7 +134,7 @@ const pageData = reactive({
     { label: "警情类型", prop: "jqlbdm",showSolt:true },
     { label: "警情地址", prop: "jqdz" },
     { label: "补充接警内容", prop: "bcjjnr", showOverflowTooltip: true },
-    { label: "研判状态", prop: "ypzt",showSolt:true },
+    { label: "会商状态", prop: "ypzt",showSolt:true },
 
   ]
 });
@@ -207,7 +207,7 @@ const exportExl = () => {
     jqlbdm_name: "警情类型",
     jqdz: "警情地址",
     bcjjnr: "补充接警内容",
-    ypzt_name: "研判状态",
+    ypzt_name: "会商状态",
   }
   /** 导出【选中】的数据 （没有就全部）*/
   const needArr = selectRows.value?.length > 0 ? selectRows.value : pageData.tableData