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

src/router/index.js

@@ -434,7 +434,15 @@ export const publicRoutes = [
               icon: "article-create"
             }
           },
-
+          {
+            path: "/InformationReporting",
+            name: "InformationReporting",
+            component: () => import("@/views/backOfficeSystem/InformationReporting/index.vue"),
+            meta: {
+              title: "蜂群信息",
+              icon: "article-create"
+            }
+          },
           // {
           //   path: "/MakeAcomment",
           //   name: "MakeAcomment",
@@ -484,14 +492,6 @@ export const publicRoutes = [
               title: "线索发布",
               icon: "article"
             }
-          }, {
-            path: "/InformationReporting",
-            name: "InformationReporting",
-            component: () => import("@/views/backOfficeSystem/InformationReporting/index.vue"),
-            meta: {
-              title: "蜂群信息",
-              icon: "article-create"
-            }
           },
           // {
           //   path: "/InformationFlows",

src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue

@@ -629,7 +629,7 @@ const submit = () => {
       bklx = "02";
     }
     let params = { ...listQuery.value, bklx: bklx };
-    params.bkfj = params.bkfj ? params.bkfj.join(",") : "";
+    params.bkfj = params.bkfj ? JSON.stringify(params.bkfj) : "";
     params.bkdxList = params.bkdxList ? params.bkdxList : [];
     params.bkdxList.forEach((item) => {
       if (Array.isArray(item.fjZp)) {
@@ -769,7 +769,18 @@ const changeXzqh = (val) => {
 // 根据id获取详情
 const getDataById = (id) => {
   qcckGet({}, "/mosty-gsxt/tbGsxtBk/selectVoById/" + id).then((res) => {
-    res.bkfj = res.ossList || [];
+    // 兼容处理：优先使用 ossList，为空则解析 bkfj JSON 字符串
+    if (res.ossList && res.ossList.length > 0) {
+      res.bkfj = res.ossList;
+    } else if (res.bkfj) {
+      try {
+        res.bkfj = JSON.parse(res.bkfj);
+      } catch (e) {
+        res.bkfj = [];
+      }
+    } else {
+      res.bkfj = [];
+    }
     listQuery.value = res || {};
     dataOrge.value = res;
     if (res.bkqyList) {

src/views/backOfficeSystem/IntelligentControl/ysMyControl/components/addBkdx.vue

@@ -384,7 +384,7 @@ const submit = () => {
       bklx = '02'
     }
     let params = { ...listQuery.value, bklx: bklx };
-    params.bkfj = params.bkfj ? params.bkfj.join(',') : '';
+    params.bkfj = params.bkfj ? JSON.stringify(params.bkfj) : "";
     params.bkdxList = params.bkdxList ? params.bkdxList : [];
     params.bkdxList.forEach(item => {
       if (Array.isArray(item.fjZp)) {
@@ -523,7 +523,18 @@ const changeXzqh = (val) => {
 // 根据id获取详情
 const getDataById = (id) => {
   qcckGet({}, '/mosty-gsxt/tbGsxtBk/selectVoById/' + id).then(res => {
-    res.bkfj = res.ossList || [];
+    // 兼容处理：优先使用 ossList，为空则解析 bkfj JSON 字符串
+    if (res.ossList && res.ossList.length > 0) {
+      res.bkfj = res.ossList;
+    } else if (res.bkfj) {
+      try {
+        res.bkfj = JSON.parse(res.bkfj);
+      } catch (e) {
+        res.bkfj = [];
+      }
+    } else {
+      res.bkfj = [];
+    }
     listQuery.value = res || {}
     dataOrge.value = res
     if (res.bkqyList) {

src/views/backOfficeSystem/ResearchJudgment/InformationFlows/InstructionInformation/components/detailForm.vue

@@ -16,6 +16,12 @@
               <span v-else class="placeholder-text">请选择关联线索</span>
             </div>
           </template>
+          <template #fjzd>
+            <div>
+              <MOSTY.Upload :showBtn="true" :limit="10" :isImg="false" :isAll="true" v-model="listQuery.fjzd" />
+              <div class="upload-tip">支持png、jpg、jpeg文件上传</div>
+            </div>
+          </template>
         </FormMessage>
       </div>
       <div v-if="title == '详情'" class="timeline-container">
@@ -49,6 +55,7 @@
 <script setup>
 import Xslist from '@/components/ChooseList/ChooseXs/index.vue'
 import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import * as MOSTY from '@/components/MyComponents/index'
 import { qcckGet, qcckPost, qcckPut } from "@/api/qcckApi.js";
 import { useRouter } from 'vue-router'
 import { ref, defineExpose, reactive, onMounted, defineEmits, getCurrentInstance, nextTick ,watch} from "vue";
@@ -79,7 +86,7 @@ watch(() => props.dic, (newVal) => {
       { label: "主送单位", prop: "zsdw", type: "department" },
       { label: "抄送单位", prop: "csdw", type: "department" },
       { label: "指令内容", prop: "zlnr", type: "textarea", width: '100%' },
-      { label: "附件", prop: "fjzd", type: "upload", width: '100%' },
+      { label: "附件", prop: "fjzd", type: "slot", width: '100%' },
     ]
   }
 },{deep: true})
@@ -133,6 +140,17 @@ const submit = () => {
     let params = { ...data }
     loading.value = true;
     params.fjzd = params.fjzd ? params.fjzd.join(',') : ''
+    // 将主送单位和抄送单位转换为下发部门列表
+    let xfbmList = [];
+    const zsdwArr = Array.isArray(params.zsdw) ? params.zsdw : (params.zsdw ? [params.zsdw] : []);
+    zsdwArr.forEach(code => {
+      xfbmList.push({ ssbmdm: code });
+    });
+    const csdwArr = Array.isArray(params.csdw) ? params.csdw : (params.csdw ? [params.csdw] : []);
+    csdwArr.forEach(code => {
+      xfbmList.push({ ssbmdm: code });
+    });
+    params.xfbmList = xfbmList;
     qcckPost(params, url).then((res) => {
       loading.value = false;
       proxy.$message({ type: "success", message: title.value + "成功" });
@@ -269,4 +287,10 @@ defineExpose({ init });
     // white-space: pre-wrap;
   }
 }
+
+.upload-tip {
+  font-size: 12px;
+  color: #909399;
+  line-height: 1.5;
+}
 </style>