From 024cb1e56bf3e54337bd07d9beccfa6550b26368 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 11:04:40 +0800
Subject: [PATCH 01/13] =?UTF-8?q?feat:=20=E6=88=98=E6=9C=AF=E7=A0=94?=
 =?UTF-8?q?=E5=88=A4,=E6=88=98=E7=95=A5=E7=A0=94=E5=88=A4=20=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=8C=AA=E5=8A=A8=E5=88=B0=E5=85=B6=E4=BB=96=E9=87=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 87ecc0f..fed905d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -667,25 +667,7 @@ export const publicRoutes = [
               icon: "article"
             }
           },
-          {
-            path: "/ResearchHome",
-            name: "ResearchHome",
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/ResearchHome/index"),
-            meta: {
-              title: "战术研判",
-              icon: "article"
-            }
-          },
 
-          {
-            path: "/situationHome",
-            name: "situationHome",
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/situationHome/index"),
-            meta: {
-              title: "战略研判",
-              icon: "article"
-            }
-          },
           // {
           //   path: "/analysisReport",
           //   name: "AnalysisReport",
@@ -843,6 +825,25 @@ export const publicRoutes = [
             component: () => import("@/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index"),
             meta: { title: "信息采集", icon: "article" },
           },
+          {
+            path: "/ResearchHome",
+            name: "ResearchHome",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/ResearchHome/index"),
+            meta: {
+              title: "战术研判",
+              icon: "article"
+            }
+          },
+
+          {
+            path: "/situationHome",
+            name: "situationHome",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/situationHome/index"),
+            meta: {
+              title: "战略研判",
+              icon: "article"
+            }
+          },
         ]
       },
     ]

From 911cc73db824fbfd369419332d8f7eaa32e948ba Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 16:17:17 +0800
Subject: [PATCH 02/13] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MyComponents/Upload/index.vue | 23 +++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/components/MyComponents/Upload/index.vue b/src/components/MyComponents/Upload/index.vue
index 28e3d61..8ced42e 100644
--- a/src/components/MyComponents/Upload/index.vue
+++ b/src/components/MyComponents/Upload/index.vue
@@ -200,9 +200,30 @@ const handlePictureCardPreview = (file) => {
   dialogImageUrl.value = file.url || '';
   dialogVisible.value = true;
 };
+function downloadFile(url, filename) {
+  fetch(url)
+    .then((response) => response.blob())
+    .then((blob) => {
+      const link = document.createElement("a");
+      link.href = URL.createObjectURL(blob);
+      link.download = filename;
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      URL.revokeObjectURL(link.href);
+    })
+    .catch((error) => console.error("下载失败:", error));
+}
 const handleDownload = (file) => {
-  window.open(file.response.data);
+  if (file?.response?.data) {
+    window.open(file.response.data);
+  } else if (file?.url) {
+    downloadFile(file.url, file.name);
+  }
 };
+// const handleDownload = (file) => {
+//   window.open(file.response.data);
+// };
 
 // 删除文件 触发父组件更新
 const beforeRemove = (file) => {

From e8520e5c51f827ba3fd0edd635ee9a232159c30b Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 16:41:30 +0800
Subject: [PATCH 03/13] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AAtable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JudgmentHome/dataReduction/addForm.vue    | 162 ++++++++++++++++--
 1 file changed, 148 insertions(+), 14 deletions(-)

diff --git a/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
index 401fa3a..ab9e818 100644
--- a/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
@@ -8,7 +8,41 @@
       </div>
     </div>
     <div class="form_cnt">
-      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules" />
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+        <template #bmList>
+          <div class="table-box">
+            <el-table :data="tableList" border style="width: 100%">
+              <el-table-column prop="ypbmmc" label="部门" width="150" align="center" />
+              <el-table-column label="研判素材" width="280" align="center">
+                <template #default="{ row }">
+                  <el-input v-model="row.scyq" :disabled="!isShiQingBaoZhongXin" placeholder="请输入研判素材" />
+                </template>
+              </el-table-column>
+              <el-table-column label="附件" width="200" align="center">
+                <template #default="{ row }">
+                  <UploadFile v-model="row.fj" :disabled="!isShiQingBaoZhongXin" :limit="1" :isImg="false"
+                    :isAll="true" />
+                </template>
+              </el-table-column>
+              <el-table-column prop="wcqk" label="完成状态" width="120" align="center">
+                <template #default="{ row }">
+                  <el-tag :type="row.wcqk === '02' ? 'success' : 'warning'">
+                    {{ row.wcqk == '01' ? '准备中' : '已完成' }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="120" align="center">
+                <template #default="{ row }">
+                  <el-button type="text" size="small" @click="updateStatus(row)"
+                    :disabled="isShiQingBaoZhongXin || (row.cjrsfzh && row.cjrsfzh != deptCode)">
+                    修改状态
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
+      </FormMessage>
     </div>
   </div>
   <!-- <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" :Single="false" /> -->
@@ -18,8 +52,10 @@
 import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import UploadFile from "@/components/MyComponents/Upload/index.vue";
 // import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue"
-import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, watch } from "vue";
-import { sjzlAddEntity, sjzlEditEntity, sjzlGetInfo } from '@//api/yj.js'
+import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, watch, computed } from "vue";
+import { sjzlAddEntity, sjzlEditEntity, sjzlGetInfo, sjzlPerfectlnfo } from '@//api/yj.js'
+import { getItem } from '@//utils/storage.js'
+
 const emit = defineEmits(["updateDate", "getList"]);
 const props = defineProps({
   dict: Object
@@ -30,11 +66,23 @@ const dialogForm = ref(false); //弹窗
 const formData = ref([
 
 ]);
+const { deptBizType, deptLevel, deptCode } = getItem('deptId')[0]
+/** 登录人 */
+const sfzh = getItem('idEntityCard')
+/** 是否市情报指挥中心 */
+const isShiQingBaoZhongXin = computed(() => {
+
+  const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
+  return deptBizType == '23' && Jb == '01'
+})
 const listQuery = ref({}); //表单
 const loading = ref(false);
 const elform = ref();
 const title = ref("");
+const tableList = ref([])
+// const detailObj = ref({})
 const rules = reactive({
+  // 可以在这里添加表单验证规则
 });
 watch(() => props.dict, (val) => {
   if (val) {
@@ -45,9 +93,45 @@ watch(() => props.dict, (val) => {
       { label: "研判方式", prop: "ypfs", type: "radio", options: props.dict.D_BZ_YPFS, width: '48%' },
       { label: "参与研判部门", prop: "jsdxBmDm", type: "department", multiple: true, depMc: 'jsdxBmMc', width: '48%' },
       { label: "研判要求", prop: "ypyq", type: "textarea", width: '100%' },
+      { label: "列表", prop: "bmList", type: "slot", width: '100%' },
     ]
   }
 })
+function getFjArr(fj) {
+  if (typeof fj !== 'string' || !fj) return []
+  let fjArr = []
+  try {
+    fjArr = JSON.parse(fj)
+  } catch (error) {
+    console.log('error: ', error);
+  }
+  return fjArr
+}
+watch(() => listQuery.value.jsdxBmDm, (val) => {
+  /** @type {Array<{ypbmdm: string, ypbmmc: string, scyq: string, fj: Array, wcqk: string}>} 参与研判部门数据数组 */
+  const arr = Array.isArray(val) ? val : []
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+
+  tableList.value = arr.map((item, i) => {
+    /** 找原来的对象 */
+    const curr = cyypList.find(item2 => item2.ypbmdm == item) || {}
+    /** 是否是新增 */
+    const isAddForm = !listQuery.value.id
+    return {
+      // id: null,
+      // sjzlid: null, // 研判数据整理ID
+      /** 部门代码 */
+      ypbmdm: item,
+      ypbmmc: listQuery.value.jsdxBmMc[i],
+      /** 素材要求 */
+      scyq: isAddForm ? '' : curr.scyq,
+      fj: isAddForm ? [] : getFjArr(curr.fj),
+      /** 完成情况（01 准备中、02 已完成）*/
+      wcqk: isAddForm ? '01' : curr.wcqk || '01'
+    }
+  })
+})
+
 // 初始化数据
 const init = (type, row, wjlb) => {
   dialogForm.value = true;
@@ -57,28 +141,56 @@ const init = (type, row, wjlb) => {
 // 根据id查询详情
 const getDataById = (id) => {
   sjzlGetInfo(id).then((res) => {
-    listQuery.value = res;
-    listQuery.value.jsdxBmDm = res.cyypList.map(item => {
+    listQuery.value = res || {};
+    const cyypList = Array.isArray(res.cyypList) ? res.cyypList : []
+    listQuery.value.jsdxBmDm = cyypList.map(item => {
       return item.ypbmdm
     })
-    listQuery.value.jsdxBmMc = res.cyypList.map(item => {
+    listQuery.value.jsdxBmMc = cyypList.map(item => {
       return item.ypbmmc
     })
   });
 };
+function getFjString(arr) {
+  arr = Array.isArray(arr) ? arr : []
+  return JSON.stringify(arr)
+}
+/**获取下发部门数据 */
+const getXfbmList = () => {
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
 
+  return tableList.value.map((item, i) => {
+
+    /** 找原来的对象 */
+    const curr = cyypList.find(item => item.ypbmdm == item.ypbmdm) || {}
+    return {
+      id: curr.id || null,
+      sjzlid: curr.sjzlid || null, // 研判数据整理ID
+      ypbmdm: item.ypbmdm,
+      ypbmmc: listQuery.value.jsdxBmMc[i],
+      /** 素材要求 */
+      scyq: item.scyq,
+      fj: getFjString(item.fj),
+      /** 完成情况（01 准备中、02 已完成）*/
+      wcqk: item.wcqk
+    }
+
+  })
+}
 // 提交
 const submit = () => {
   elform.value.submit(async (data) => {
+    const xfbmList = getXfbmList()
     let params = {
       ...listQuery.value,
-      cyypList: listQuery.value.jsdxBmDm.map((item, index) => {
-        return {
-          ypbmdm: item,
-          ypbmmc: listQuery.value.jsdxBmMc[index],
-          ypcylx: '01'
-        }
-      })
+      cyypList: xfbmList,
+      // cyypList: listQuery.value.jsdxBmDm.map((item, index) => {
+      //   return {
+      //     ypbmdm: item,
+      //     ypbmmc: listQuery.value.jsdxBmMc[index],
+      //     ypcylx: '01'
+      //   }
+      // })
     };
     try {
       loading.value = true;
@@ -97,7 +209,7 @@ const submit = () => {
       loading.value = false;
 
     } catch (error) {
-      console.log(error);
+
       loading.value = false;
     }
   });
@@ -110,6 +222,28 @@ const submit = () => {
 //   userList.value = val
 //   listQuery.value.jsrxm = val.map(item => item.userName).join(',')
 // }
+// 修改状态
+const updateStatus = (row) => {
+  proxy.$confirm('确认修改状态？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    // 调用xx接口，这里需要根据实际接口调整
+    // 例如：updateStatusApi(row.id).then(...)
+    if (row.wcqk == '01') {
+      row.wcqk = '02'
+    } else {
+      row.wcqk = '01'
+    }
+    proxy.$message({
+      type: 'success',
+      message: '修改成功'
+    });
+    // 更新本地状态
+  })
+};
+
 // 关闭
 const close = () => {
   listQuery.value = {};

From 6bfc6d4e94d6a5d8624cea21123ab3a94e7c14b8 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 17:07:13 +0800
Subject: [PATCH 04/13] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JudgmentHome/dataReduction/addForm.vue    | 101 +++++++++++++-----
 .../JudgmentHome/dataReduction/index.vue      |   8 +-
 2 files changed, 83 insertions(+), 26 deletions(-)

diff --git a/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
index ab9e818..1c21ac5 100644
--- a/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
@@ -33,8 +33,7 @@
               </el-table-column>
               <el-table-column label="操作" width="120" align="center">
                 <template #default="{ row }">
-                  <el-button type="text" size="small" @click="updateStatus(row)"
-                    :disabled="isShiQingBaoZhongXin || (row.cjrsfzh && row.cjrsfzh != deptCode)">
+                  <el-button type="text" size="small" @click="updateStatus(row)" :disabled="updateDis(row)">
                     修改状态
                   </el-button>
                 </template>
@@ -45,7 +44,24 @@
       </FormMessage>
     </div>
   </div>
-  <!-- <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" :Single="false" /> -->
+
+  <!-- 修改状态弹框 -->
+  <div class="dialog" v-if="statusDialog">
+    <div class="head_box">
+      <span class="title">修改状态</span>
+      <div>
+        <el-button type="primary" size="small" :loading="statusLoading" @click="submitStatus">保存</el-button>
+        <el-button size="small" @click="closeStatusDialog">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <el-form :model="statusForm" label-width="80px">
+        <el-form-item label="附件">
+          <UploadFile v-model="statusForm.fj" :limit="2" :isImg="false" :isAll="true" />
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
 </template>
 
 <script setup>
@@ -71,7 +87,6 @@ const { deptBizType, deptLevel, deptCode } = getItem('deptId')[0]
 const sfzh = getItem('idEntityCard')
 /** 是否市情报指挥中心 */
 const isShiQingBaoZhongXin = computed(() => {
-
   const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
   return deptBizType == '23' && Jb == '01'
 })
@@ -81,6 +96,13 @@ const elform = ref();
 const title = ref("");
 const tableList = ref([])
 // const detailObj = ref({})
+const statusDialog = ref(false) // 修改状态弹框
+const statusLoading = ref(false)
+const statusForm = ref({ fj: [] }) // 修改状态表单
+const currentRow = ref({}) // 当前操作的行
+/** 外面行数据 */
+const outRow = ref({})
+
 const rules = reactive({
   // 可以在这里添加表单验证规则
 });
@@ -97,13 +119,23 @@ watch(() => props.dict, (val) => {
     ]
   }
 })
+/** 是否修改禁用 */
+function updateDis(row) {
+  /** 无id 禁用 */
+  if (!listQuery.value.id) return true
+  /** 是否创建人 */
+  const iscjr = !row.cjrsfzh || row?.cjrsfzh == deptCode
+  /** 是否完成 */
+  const isFinish = row.wcqk === '02'
+  return isShiQingBaoZhongXin.value || !iscjr || isFinish
+}
 function getFjArr(fj) {
   if (typeof fj !== 'string' || !fj) return []
   let fjArr = []
   try {
     fjArr = JSON.parse(fj)
   } catch (error) {
-    console.log('error: ', error);
+
   }
   return fjArr
 }
@@ -131,11 +163,11 @@ watch(() => listQuery.value.jsdxBmDm, (val) => {
     }
   })
 })
-
 // 初始化数据
 const init = (type, row, wjlb) => {
   dialogForm.value = true;
   title.value = type == "add" ? "新增" : type == "edit" ? "编辑" : "详情";
+  outRow.value = row || {}
   if (row) { getDataById(row.id) }
 };
 // 根据id查询详情
@@ -224,26 +256,47 @@ const submit = () => {
 // }
 // 修改状态
 const updateStatus = (row) => {
-  proxy.$confirm('确认修改状态？', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    // 调用xx接口，这里需要根据实际接口调整
-    // 例如：updateStatusApi(row.id).then(...)
-    if (row.wcqk == '01') {
-      row.wcqk = '02'
-    } else {
-      row.wcqk = '01'
-    }
-    proxy.$message({
-      type: 'success',
-      message: '修改成功'
-    });
-    // 更新本地状态
-  })
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+  /** 找原来的对象 */
+  const curr = cyypList.find(item2 => item2.ypbmdm == row.ypbmdm) || {}
+  currentRow.value = { ...curr, row }
+  statusForm.value = { fj: [] }
+  statusDialog.value = true
 };
 
+// 提交修改状态
+const submitStatus = async () => {
+  try {
+    statusLoading.value = true
+    const params = {
+      id: currentRow.value.id,
+      fj: statusForm.value.fj?.length > 0 ? getFjString(statusForm.value.fj) : '',
+      wcqk: '02'
+    }
+
+    const res = await sjzlPerfectlnfo(params)
+    if (res && res > 0) {
+      proxy.$message({ type: "success", message: "修改成功" })
+      // 更新本地状态
+      currentRow.value.wcqk = '02'
+
+      closeStatusDialog()
+      if (outRow.value.id) { getDataById(outRow.value.id) }
+    }
+  } catch (error) {
+
+  } finally {
+    statusLoading.value = false
+  }
+}
+
+// 关闭修改状态弹框
+const closeStatusDialog = () => {
+  statusDialog.value = false
+  statusForm.value = { fj: [] }
+  statusLoading.value = false
+}
+
 // 关闭
 const close = () => {
   listQuery.value = {};
diff --git a/src/views/backOfficeSystem/JudgmentHome/dataReduction/index.vue b/src/views/backOfficeSystem/JudgmentHome/dataReduction/index.vue
index 60ea6da..95c2d0a 100644
--- a/src/views/backOfficeSystem/JudgmentHome/dataReduction/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/dataReduction/index.vue
@@ -48,7 +48,7 @@ import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import { useRoute } from 'vue-router'
 import { sjzlGetPageList, sjzldeleteEntity } from "@/api/yj.js";
-import { reactive, ref, onMounted, getCurrentInstance, watch } from "vue";
+import { reactive, ref, onMounted, getCurrentInstance, watch,computed } from "vue";
 import AddForm from "./addForm.vue";
 const { proxy } = getCurrentInstance();
 const { D_BZ_YPFS, D_BZ_YPLX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX")
@@ -64,7 +64,11 @@ onMounted(() => {
   }
   getList()
 });
-
+/** 是否市情报指挥中心 */
+const isShiQingBaoZhongXin = computed(() => {
+  const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
+  return deptBizType == '23' && Jb == '01'
+})
 
 const searchConfiger = ref([
   { label: "研判议题", prop: 'ypyt', placeholder: "请输入研判议题", showType: "input" },

From d8518faf6bafc8095b1a5acbd11b3934c159aa12 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 17:36:35 +0800
Subject: [PATCH 05/13] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E6=95=B4?=
 =?UTF-8?q?=E7=90=86-=E5=A2=9E=E5=8A=A0=E4=B8=8B=E5=8F=91=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=EF=BC=8C=E5=92=8C=E7=A1=AE=E8=AE=A4=E7=A0=94=E5=88=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yj.js                                 | 35 ++++++++++
 .../JudgmentHome/dataReduction/addForm.vue    | 70 ++++++++++++++++++-
 2 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/src/api/yj.js b/src/api/yj.js
index 3e816bd..c7ecd40 100644
--- a/src/api/yj.js
+++ b/src/api/yj.js
@@ -160,4 +160,39 @@ export const sjzlGetInfo = (id) => {
     method: "get",
   })
 }
+/**
+ * 非市情报指挥中心修改状态为完成 - 完成资料准备
+ * @param {Object} data 请求数据对象
+ * @param {Array} [data.fj] 附件数组，可选
+ * @param {string} data.id 数据整理记录ID，必填
+ * @param {string} data.wcqk 完成情况，必填（01:准备中, 02:已完成）
+ * @returns {Promise} 请求Promise对象
+ */
+export const sjzlPerfectlnfo = (data) => {
+  return request({
+    url: api + `/ypbg/sjzl/perfectInfo`,
+    method: "post",
+    data
+  })
+}
+/**
+ * 数据整理-发送消息通知
+ * @param {String} id id
+ */
+export const sjzlFstz = (id) => {
+  return request({
+    url: api + `/ypbg/sjzl/fstz/${id}`,
+    method: "get",
+  })
+}
+/**
+ * 数据整理-确认研判
+ * @param {String} id id
+ */
+export const sjzlQryp = (id) => {
+  return request({
+    url: api + `/ypbg/sjzl/qryp/${id}`,
+    method: "get",
+  })
+}
 
diff --git a/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
index 1c21ac5..a8b850c 100644
--- a/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
@@ -7,7 +7,7 @@
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div class="form_cnt">
+    <div style="padding-bottom: 40px;" class="form_cnt">
       <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
         <template #bmList>
           <div class="table-box">
@@ -43,6 +43,11 @@
         </template>
       </FormMessage>
     </div>
+    <!-- 底部按钮 -->
+    <div class="bottom-actions" v-if="title !== '新增' && listQuery.id">
+      <el-button type="primary" size="small" @click="sendNotice" :loading="noticeLoading">下发通知</el-button>
+      <el-button type="success" size="small" @click="confirmJudgment" :loading="confirmLoading">确认研判</el-button>
+    </div>
   </div>
 
   <!-- 修改状态弹框 -->
@@ -69,7 +74,7 @@ import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import UploadFile from "@/components/MyComponents/Upload/index.vue";
 // import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue"
 import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, watch, computed } from "vue";
-import { sjzlAddEntity, sjzlEditEntity, sjzlGetInfo, sjzlPerfectlnfo } from '@//api/yj.js'
+import { sjzlAddEntity, sjzlEditEntity, sjzlGetInfo, sjzlPerfectlnfo, sjzlFstz, sjzlQryp } from '@//api/yj.js'
 import { getItem } from '@//utils/storage.js'
 
 const emit = defineEmits(["updateDate", "getList"]);
@@ -102,6 +107,8 @@ const statusForm = ref({ fj: [] }) // 修改状态表单
 const currentRow = ref({}) // 当前操作的行
 /** 外面行数据 */
 const outRow = ref({})
+const noticeLoading = ref(false) // 下发通知加载状态
+const confirmLoading = ref(false) // 确认研判加载状态
 
 const rules = reactive({
   // 可以在这里添加表单验证规则
@@ -297,6 +304,47 @@ const closeStatusDialog = () => {
   statusLoading.value = false
 }
 
+// 下发通知
+const sendNotice = () => {
+  proxy.$confirm('确认下发通知？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(async () => {
+    try {
+      noticeLoading.value = true;
+      const res = await sjzlFstz(listQuery.value.id);
+      proxy.$message({ type: "success", message: "下发通知成功" });
+      close();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      noticeLoading.value = false;
+    }
+  });
+};
+
+// 确认研判
+const confirmJudgment = () => {
+
+  proxy.$confirm('确认研判完成？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(async () => {
+    try {
+      confirmLoading.value = true;
+      const res = await sjzlQryp(listQuery.value.id);
+      proxy.$message({ type: "success", message: "确认研判成功" });
+      close();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      confirmLoading.value = false;
+    }
+  });
+};
+
 // 关闭
 const close = () => {
   listQuery.value = {};
@@ -314,4 +362,22 @@ defineExpose({ init });
 ::v-deep .form-item-box {
   width: 100% !important;
 }
+
+.bottom-actions {
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+
+  display: flex;
+  justify-content: center;
+  gap: 10px;
+  width: 100%;
+  transform: translateX(-50%);
+  padding: 10px 20px;
+
+  border-radius: 4px;
+  background: white;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+  // z-index: 1000;
+}
 </style>

From 40ebba1ec6567f6fd0b9af00ec69652e18ce5298 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 18:49:48 +0800
Subject: [PATCH 06/13] =?UTF-8?q?feat:=20=E5=85=88=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/yj.js | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/api/yj.js b/src/api/yj.js
index c7ecd40..e6a1192 100644
--- a/src/api/yj.js
+++ b/src/api/yj.js
@@ -161,7 +161,7 @@ export const sjzlGetInfo = (id) => {
   })
 }
 /**
- * 非市情报指挥中心修改状态为完成 - 完成资料准备
+ * 非市情报指挥中心修改状态为完成 - 完成资料准备 （对应下发部门去完成）
  * @param {Object} data 请求数据对象
  * @param {Array} [data.fj] 附件数组，可选
  * @param {string} data.id 数据整理记录ID，必填
@@ -175,6 +175,21 @@ export const sjzlPerfectlnfo = (data) => {
     data
   })
 }
+/**
+ * 数据整理-完善素材上传 （对应下发部门去完成）
+ * @param {Object} data 请求数据对象
+ * @param {Array} [data.fj] 附件数组，可选
+ * @param {string} data.id 数据整理记录ID，必填
+ * @param {string} data.wcqk 完成情况，必填（01:准备中, 02:已完成）
+ * @returns {Promise} 请求Promise对象
+ */
+export const sjzlPerfectSorce = (data) => {
+  return request({
+    url: api + `/ypbg/sjzl/perfectSorce`,
+    method: "post",
+    data
+  })
+}
 /**
  * 数据整理-发送消息通知
  * @param {String} id id

From 1166ce8320f4c7e63af393a955fcea05f7d3419f Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 19:08:59 +0800
Subject: [PATCH 07/13] =?UTF-8?q?feat=20:=20=E6=88=98=E6=9C=AF=E7=A0=94?=
 =?UTF-8?q?=E5=88=A4,=E6=88=98=E7=95=A5=E7=A0=94=E5=88=A4=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=A4=87=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/strategicApi.js                       |  46 ++++
 src/api/tacticalApi.js                        |  62 ++++++
 src/router/index.js                           |  18 ++
 .../strategicResearch/components/addForm.vue  | 208 ++++++++++++++++++
 .../JudgmentHome/strategicResearch/index.vue  | 170 ++++++++++++++
 .../tacticalResearch/components/addForm.vue   | 208 ++++++++++++++++++
 .../JudgmentHome/tacticalResearch/index.vue   | 170 ++++++++++++++
 7 files changed, 882 insertions(+)
 create mode 100644 src/api/strategicApi.js
 create mode 100644 src/api/tacticalApi.js
 create mode 100644 src/views/backOfficeSystem/JudgmentHome/strategicResearch/components/addForm.vue
 create mode 100644 src/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue
 create mode 100644 src/views/backOfficeSystem/JudgmentHome/tacticalResearch/components/addForm.vue
 create mode 100644 src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue

diff --git a/src/api/strategicApi.js b/src/api/strategicApi.js
new file mode 100644
index 0000000..4605ce5
--- /dev/null
+++ b/src/api/strategicApi.js
@@ -0,0 +1,46 @@
+import request from "@/utils/request";
+const api = "/mosty-api/mosty-gsxt";
+
+// 战略研判-分页查询
+export const strategicGet = (data, url) => {
+  return request({
+    url: url + `/ypbg/sjzl/getPageYpList`,
+    method: "post",
+    data
+  })
+}
+
+// 战略研判-新增
+export const strategicPost = (data, url) => {
+  return request({
+    url: url,
+    method: "post",
+    data
+  })
+}
+
+// 战略研判-删除
+export const strategicDelete = (data, url) => {
+  return request({
+    url: url,
+    method: "delete",
+    data
+  })
+}
+
+// 战略研判-根据ID查询详情
+export const strategicGetInfo = (id) => {
+  return request({
+    url: api + `/strategic/${id}`,
+    method: "get"
+  })
+}
+
+// 战略研判-编辑
+export const strategicPut = (data, url) => {
+  return request({
+    url: url,
+    method: "put",
+    data
+  })
+}
diff --git a/src/api/tacticalApi.js b/src/api/tacticalApi.js
new file mode 100644
index 0000000..0378a11
--- /dev/null
+++ b/src/api/tacticalApi.js
@@ -0,0 +1,62 @@
+import request from "@/utils/request";
+const api = "/mosty-api/mosty-gsxt";
+
+/**
+ * 战术研判-分页查询
+ * @param {Object} params 查询参数
+ * @param {number} [params.pageSize] 每页显示数量
+ * @param {number} [params.pageCurrent] 页码
+ * @param {string} [params.startTime] 开始时间
+ * @param {string} [params.endTime] 结束时间
+ * @param {string} [params.timeField] 时间范围查询字段
+ * @param {string} [params.sort] 排序字段
+ * @param {string} [params.order] 排序方式
+ * @param {string} [params.ypyt] 研判议题
+ * @param {string} [params.yppyq] 研判要求
+ * @param {string} [params.ypfs] 研判方式（01 线上、02 线下、03 自建）
+ * @param {string} [params.bglx] 报告类型（01 战术研判 02 战略研判）查询研判列表必传
+ * @param {string} [params.ssbmdm] 所属部门代码
+ * @returns {Promise} 请求Promise对象
+ */
+export const tacticalGet = (params) => {
+  return request({
+    url: api + `/ypbg/sjzl/getPageYpList`,
+    method: "get",
+    params
+  })
+}
+
+// 战术研判-新增
+export const tacticalPost = (data, url) => {
+  return request({
+    url: api,
+    method: "post",
+    data
+  })
+}
+
+// 战术研判-删除
+export const tacticalDelete = (data, url) => {
+  return request({
+    url: api,
+    method: "delete",
+    data
+  })
+}
+
+// 战术研判-根据ID查询详情
+export const tacticalGetInfo = (id) => {
+  return request({
+    url: api + `/tactical/${id}`,
+    method: "get"
+  })
+}
+
+// 战术研判-编辑
+export const tacticalPut = (data, url) => {
+  return request({
+    url: api,
+    method: "put",
+    data
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index fed905d..b50b4c9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -667,6 +667,24 @@ export const publicRoutes = [
               icon: "article"
             }
           },
+          {
+            path: "/tacticalResearch",
+            name: "tacticalResearch",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/tacticalResearch/index"),
+            meta: {
+              title: "战术研判",
+              icon: "article"
+            }
+          },
+          {
+            path: "/strategicResearch",
+            name: "strategicResearch",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/strategicResearch/index"),
+            meta: {
+              title: "战略研判",
+              icon: "article"
+            }
+          },
 
           // {
           //   path: "/analysisReport",
diff --git a/src/views/backOfficeSystem/JudgmentHome/strategicResearch/components/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/components/addForm.vue
new file mode 100644
index 0000000..5ff9076
--- /dev/null
+++ b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/components/addForm.vue
@@ -0,0 +1,208 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">战略研判管理{{ title }} </span>
+      <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules"></FormMessage>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { IdCard } from "@/utils/validate.js";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { strategicGet, strategicPost, strategicPut } from "@/api/strategicApi.js";
+import * as rule from "@/utils/rules.js";
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick
+} from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const validateIdentity = () => {
+  return (rule, value, callback) => {
+    if (!value) {
+      return callback(new Error("身份证号不能为空"));
+    } else if (!/(^\d{15}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
+      callback(new Error("输入的身份证长度或格式错误"));
+    }
+    //身份证城市
+    var aCity = {
+      11: "北京",
+      12: "天津",
+      13: "河北",
+      14: "山西",
+      15: "内蒙古",
+      21: "辽宁",
+      22: "吉林",
+      23: "黑龙江",
+      31: "上海",
+      32: "江苏",
+      33: "浙江",
+      34: "安徽",
+      35: "福建",
+      36: "江西",
+      37: "山东",
+      41: "河南",
+      42: "湖北",
+      43: "湖南",
+      44: "广东",
+      45: "广西",
+      46: "海南",
+      50: "重庆",
+      51: "四川",
+      52: "贵州",
+      53: "云南",
+      54: "西藏",
+      61: "陕西",
+      62: "甘肃",
+      63: "青海",
+      64: "宁夏",
+      65: "新疆",
+      71: "台湾",
+      81: "香港",
+      82: "澳门",
+      91: "国外"
+    };
+    if (!aCity[parseInt(value?.substr(0, 2))])
+      callback(new Error("身份证地区非法"));
+    // 出生日期验证
+    var sBirthday = (
+      value.substr(6, 4) +
+      "-" +
+      Number(value.substr(10, 2)) +
+      "-" +
+      Number(value.substr(12, 2))
+    ).replace(/-/g, "-"),
+      d = new Date(sBirthday);
+    let yyyy = d.getFullYear();
+    let mm = d.getMonth() + 1;
+    let dd = d.getDate();
+    if (sBirthday !== yyyy + "-" + mm + "-" + dd) {
+      listQuery.value.ryCsrq = "";
+      callback(new Error("身份证上的出生日期非法"));
+    } else {
+      let month = mm < 10 ? "0" + mm : mm;
+      listQuery.value.ryCsrq = yyyy + "-" + month + "-" + dd;
+    }
+    // 身份证号码校验
+    var sum = 0,
+      weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2],
+      codes = "10X98765432";
+    for (var i = 0; i < value.length - 1; i++) {
+      sum += value[i] * weights[i];
+    }
+    var last = codes[sum % 11]; //计算出来的最后一位身份证号码
+    if (value[value.length - 1] !== last) {
+      listQuery.value.ryXb = "";
+      callback(new Error("输入的身份证号非法"));
+    } else {
+      if (value.length === 18) {
+        listQuery.value.ryCsrq = IdCard(value, 1);
+        listQuery.value.ryXb =
+          parseInt(value.substr(16, 1)) % 2 === 1 ? "1" : "2";
+      }
+    }
+    callback();
+  };
+};
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+// { label: "力量编号", prop: "bh", type: "input", width: "30%" },
+  { label: "管辖部门", prop: "gxbmDm", type: "department", width: "30%" },
+  { label: "姓名", prop: "ryXm", type: "input", width: "30%" },
+  { label: "联系电话", prop: "ryLxdh", type: "input", width: "30%" },
+  { label: "身份证号", prop: "rySfzh", type: "input", width: "30%" },
+  { label: "出生日期", prop: "ryCsrq", type: "date", width: "30%" },
+  { label: "性别", prop: "ryXb", type: "select", options: props.dic.D_BZ_XB, width: "30%" },
+  { label: "民族", prop: "ryMz", type: "select", options: props.dic.D_BZ_MZ, width: "30%" },
+  { label: "学历", prop: "ryXl", type: "select", options: props.dic.D_BZ_WHCD, width: "30%" },
+  {
+    label: "政治面貌",
+    prop: "ryZzmm",
+    type: "select",
+    options: props.dic.D_BZ_ZZMM,
+    width: "30%"
+  },
+  { label: "所在单位", prop: "rySzdw", type: "input", width: "30%" },
+  { label: "工作阵地", prop: "gzzd", type: "input", width: "45%" },
+  { label: "作用发挥", prop: "zyfh", type: "input", width: "45%" },
+
+  { label: "居住地地址", prop: "jzdDz", type: "textarea", width: "100%" }
+]);
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  gxbmDm: [{ required: true, message: "请选择管辖部门", trigger: "change" }],
+  // ryXm: [{ required: true, message: "请输入人员姓名", trigger: "blur" }],
+  // rySfzh: [
+  //   {
+  //     required: true,
+  //     message: "请输入人员身份证号",
+  //     trigger: ["blur", "change"]
+  //   },
+  //   { trigger: ["blur", "change"], validator: validateIdentity() }
+  // ],
+  ...rule.phoneRule({ require: true, validator: true }, "ryLxdh") // 是否必填 是否进行校验 可以传第二个参数
+});
+onMounted(() => { });
+
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  strategicGet({}, "/mosty-api/mosty-gsxt/strategic/" + id).then((res) => {
+    listQuery.value = res;
+  });
+};
+
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    let url =
+      title.value == "新增"
+        ? "/mosty-api/mosty-gsxt/strategic/save"
+        : "/mosty-api/mosty-gsxt/strategic/update";
+    let params = { ...data, ryLx: "03" }; // 战略研判类型标识
+    strategicPost(params, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("updateDate");
+        close();
+      })
+      .catch(() => { });
+  });
+};
+
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+</style>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue
new file mode 100644
index 0000000..c6dd75f
--- /dev/null
+++ b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue
@@ -0,0 +1,170 @@
+<template>
+  <div>
+    <div class="titleBox">
+      <PageTitle title="战略研判">
+        <el-button type="primary" @click="addEdit('add', '')">
+          <el-icon style="vertical-align: middle">
+            <CirclePlus />
+          </el-icon>
+          <span style="vertical-align: middle">新增</span>
+        </el-button>
+      </PageTitle>
+    </div>
+    <!-- 搜索 -->
+    <div ref="searchBox">
+      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" />
+    </div>
+    <!-- 表格 -->
+    <div class="tabBox">
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
+        @chooseData="chooseData">
+        <template #ryMz="{ row }">
+          <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
+        </template>
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+    <!-- 详情 -->
+    <DetailForm v-if="show" @updateDate="getList" ref="detailDiloag"
+      :dic="{ D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM }" />
+  </div>
+</template>
+
+<script setup>
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import DetailForm from "./components/addForm.vue";
+import { strategicGet, strategicPost, strategicDelete } from "@/api/strategicApi.js";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import { ElMessage } from "element-plus";
+const { proxy } = getCurrentInstance();
+const { D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM } = proxy.$dict(
+  "D_BZ_WHCD",
+  "D_BZ_MZ",
+  "D_BZ_XB",
+  "D_BZ_ZZMM"
+); //获取字典数据
+const detailDiloag = ref();
+const searchBox = ref(); //搜索框
+const show = ref(false);
+const searchConfiger = ref([
+  { label: "姓名", prop: "ryXm", placeholder: "请输入姓名", showType: "input" },
+  {
+    label: "身份证号",
+    prop: "rySfzh",
+    placeholder: "请输入身份证号",
+    showType: "input"
+  }
+]);
+
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 120,
+  tableColumn: [
+    { label: "编号", prop: "bh" },
+    { label: "姓名", prop: "ryXm" },
+    { label: "联系电话", prop: "ryLxdh" },
+    { label: "身份证号", prop: "rySfzh" },
+    { label: "工作阵地", prop: "gzzd",showOverflowTooltip: true },
+    { label: "发挥作用", prop: "zyfh" ,showOverflowTooltip: true},
+    { label: "民族", prop: "ryMz", showSolt: true },
+    { label: "居住地址", prop: "jzdDz",showOverflowTooltip: true }
+  ]
+});
+
+const queryFrom = ref({});
+
+onMounted(() => {
+  getList();
+  tabHeightFn();
+});
+
+// 搜索
+const onSearch = (val) => {
+  queryFrom.value = { ...val };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+};
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  getList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList();
+};
+
+// 获取列表
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  strategicGet(data, "/mosty-api/mosty-gsxt/strategic/selectPage")
+    .then((res) => {
+      pageData.tableData = res.records || [];
+      pageData.total = res.total;
+      pageData.tableConfiger.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
+};
+
+// 删除
+const deleteRow = (id) => {
+  proxy
+    .$confirm("确定要删除", "警告", { type: "warning" })
+    .then(() => {
+      strategicDelete({}, "/mosty-api/mosty-gsxt/strategic/" + id).then(() => {
+        proxy.$message({ type: "success", message: "删除成功" });
+        getList();
+      });
+    })
+    .catch(() => { });
+};
+
+// 详情
+const addEdit = (type, row) => {
+  show.value = true;
+  nextTick(() => {
+    detailDiloag.value.init(type, row);
+  });
+};
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.tableHeight =
+    window.innerHeight - searchBox.value.offsetHeight - 250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+</script>
+
+<style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/components/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/components/addForm.vue
new file mode 100644
index 0000000..db87acc
--- /dev/null
+++ b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/components/addForm.vue
@@ -0,0 +1,208 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">战术研判管理{{ title }} </span>
+      <div>
+        <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules"></FormMessage>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { IdCard } from "@/utils/validate.js";
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import { tacticalGet, tacticalPost, tacticalPut } from "@/api/tacticalApi.js";
+import * as rule from "@/utils/rules.js";
+import {
+  ref,
+  defineExpose,
+  reactive,
+  onMounted,
+  defineEmits,
+  getCurrentInstance,
+  nextTick
+} from "vue";
+const emit = defineEmits(["updateDate"]);
+const props = defineProps({
+  dic: Object
+});
+const validateIdentity = () => {
+  return (rule, value, callback) => {
+    if (!value) {
+      return callback(new Error("身份证号不能为空"));
+    } else if (!/(^\d{15}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
+      callback(new Error("输入的身份证长度或格式错误"));
+    }
+    //身份证城市
+    var aCity = {
+      11: "北京",
+      12: "天津",
+      13: "河北",
+      14: "山西",
+      15: "内蒙古",
+      21: "辽宁",
+      22: "吉林",
+      23: "黑龙江",
+      31: "上海",
+      32: "江苏",
+      33: "浙江",
+      34: "安徽",
+      35: "福建",
+      36: "江西",
+      37: "山东",
+      41: "河南",
+      42: "湖北",
+      43: "湖南",
+      44: "广东",
+      45: "广西",
+      46: "海南",
+      50: "重庆",
+      51: "四川",
+      52: "贵州",
+      53: "云南",
+      54: "西藏",
+      61: "陕西",
+      62: "甘肃",
+      63: "青海",
+      64: "宁夏",
+      65: "新疆",
+      71: "台湾",
+      81: "香港",
+      82: "澳门",
+      91: "国外"
+    };
+    if (!aCity[parseInt(value?.substr(0, 2))])
+      callback(new Error("身份证地区非法"));
+    // 出生日期验证
+    var sBirthday = (
+      value.substr(6, 4) +
+      "-" +
+      Number(value.substr(10, 2)) +
+      "-" +
+      Number(value.substr(12, 2))
+    ).replace(/-/g, "-"),
+      d = new Date(sBirthday);
+    let yyyy = d.getFullYear();
+    let mm = d.getMonth() + 1;
+    let dd = d.getDate();
+    if (sBirthday !== yyyy + "-" + mm + "-" + dd) {
+      listQuery.value.ryCsrq = "";
+      callback(new Error("身份证上的出生日期非法"));
+    } else {
+      let month = mm < 10 ? "0" + mm : mm;
+      listQuery.value.ryCsrq = yyyy + "-" + month + "-" + dd;
+    }
+    // 身份证号码校验
+    var sum = 0,
+      weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2],
+      codes = "10X98765432";
+    for (var i = 0; i < value.length - 1; i++) {
+      sum += value[i] * weights[i];
+    }
+    var last = codes[sum % 11]; //计算出来的最后一位身份证号码
+    if (value[value.length - 1] !== last) {
+      listQuery.value.ryXb = "";
+      callback(new Error("输入的身份证号非法"));
+    } else {
+      if (value.length === 18) {
+        listQuery.value.ryCsrq = IdCard(value, 1);
+        listQuery.value.ryXb =
+          parseInt(value.substr(16, 1)) % 2 === 1 ? "1" : "2";
+      }
+    }
+    callback();
+  };
+};
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+// { label: "力量编号", prop: "bh", type: "input", width: "30%" },
+  { label: "管辖部门", prop: "gxbmDm", type: "department", width: "30%" },
+  { label: "姓名", prop: "ryXm", type: "input", width: "30%" },
+  { label: "联系电话", prop: "ryLxdh", type: "input", width: "30%" },
+  { label: "身份证号", prop: "rySfzh", type: "input", width: "30%" },
+  { label: "出生日期", prop: "ryCsrq", type: "date", width: "30%" },
+  { label: "性别", prop: "ryXb", type: "select", options: props.dic.D_BZ_XB, width: "30%" },
+  { label: "民族", prop: "ryMz", type: "select", options: props.dic.D_BZ_MZ, width: "30%" },
+  { label: "学历", prop: "ryXl", type: "select", options: props.dic.D_BZ_WHCD, width: "30%" },
+  {
+    label: "政治面貌",
+    prop: "ryZzmm",
+    type: "select",
+    options: props.dic.D_BZ_ZZMM,
+    width: "30%"
+  },
+  { label: "所在单位", prop: "rySzdw", type: "input", width: "30%" },
+  { label: "工作阵地", prop: "gzzd", type: "input", width: "45%" },
+  { label: "作用发挥", prop: "zyfh", type: "input", width: "45%" },
+
+  { label: "居住地地址", prop: "jzdDz", type: "textarea", width: "100%" }
+]);
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const rules = reactive({
+  gxbmDm: [{ required: true, message: "请选择管辖部门", trigger: "change" }],
+  // ryXm: [{ required: true, message: "请输入人员姓名", trigger: "blur" }],
+  // rySfzh: [
+  //   {
+  //     required: true,
+  //     message: "请输入人员身份证号",
+  //     trigger: ["blur", "change"]
+  //   },
+  //   { trigger: ["blur", "change"], validator: validateIdentity() }
+  // ],
+  ...rule.phoneRule({ require: true, validator: true }, "ryLxdh") // 是否必填 是否进行校验 可以传第二个参数
+});
+onMounted(() => { });
+
+// 初始化数据
+const init = (type, row) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : "编辑";
+  if (row) getDataById(row.id);
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  tacticalGet({}, "/mosty-api/mosty-gsxt/tactical/" + id).then((res) => {
+    listQuery.value = res;
+  });
+};
+
+// 提交
+const submit = () => {
+  elform.value.submit((data) => {
+    let url =
+      title.value == "新增"
+        ? "/mosty-api/mosty-gsxt/tactical/save"
+        : "/mosty-api/mosty-gsxt/tactical/update";
+    let params = { ...data, ryLx: "02" }; // 战术研判类型标识
+    tacticalPost(params, url)
+      .then((res) => {
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("updateDate");
+        close();
+      })
+      .catch(() => { });
+  });
+};
+
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+</style>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue
new file mode 100644
index 0000000..26fce51
--- /dev/null
+++ b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue
@@ -0,0 +1,170 @@
+<template>
+  <div>
+    <div class="titleBox">
+      <PageTitle title="战术研判">
+        <el-button type="primary" @click="addEdit('add', '')">
+          <el-icon style="vertical-align: middle">
+            <CirclePlus />
+          </el-icon>
+          <span style="vertical-align: middle">新增</span>
+        </el-button>
+      </PageTitle>
+    </div>
+    <!-- 搜索 -->
+    <div ref="searchBox">
+      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" />
+    </div>
+    <!-- 表格 -->
+    <div class="tabBox">
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
+        @chooseData="chooseData">
+        <template #ryMz="{ row }">
+          <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
+        </template>
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
+          <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+    <!-- 详情 -->
+    <DetailForm v-if="show" @updateDate="getList" ref="detailDiloag"
+      :dic="{ D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM }" />
+  </div>
+</template>
+
+<script setup>
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import DetailForm from "./components/addForm.vue";
+import { tacticalGet, tacticalPost, tacticalDelete } from "@/api/tacticalApi.js";
+import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
+import { ElMessage } from "element-plus";
+const { proxy } = getCurrentInstance();
+const { D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM } = proxy.$dict(
+  "D_BZ_WHCD",
+  "D_BZ_MZ",
+  "D_BZ_XB",
+  "D_BZ_ZZMM"
+); //获取字典数据
+const detailDiloag = ref();
+const searchBox = ref(); //搜索框
+const show = ref(false);
+const searchConfiger = ref([
+  { label: "姓名", prop: "ryXm", placeholder: "请输入姓名", showType: "input" },
+  {
+    label: "身份证号",
+    prop: "rySfzh",
+    placeholder: "请输入身份证号",
+    showType: "input"
+  }
+]);
+
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "null",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 120,
+  tableColumn: [
+    { label: "编号", prop: "bh" },
+    { label: "姓名", prop: "ryXm" },
+    { label: "联系电话", prop: "ryLxdh" },
+    { label: "身份证号", prop: "rySfzh" },
+    { label: "工作阵地", prop: "gzzd",showOverflowTooltip: true },
+    { label: "发挥作用", prop: "zyfh" ,showOverflowTooltip: true},
+    { label: "民族", prop: "ryMz", showSolt: true },
+    { label: "居住地址", prop: "jzdDz",showOverflowTooltip: true }
+  ]
+});
+
+const queryFrom = ref({});
+
+onMounted(() => {
+  getList();
+  tabHeightFn();
+});
+
+// 搜索
+const onSearch = (val) => {
+  queryFrom.value = { ...val };
+  pageData.pageConfiger.pageCurrent = 1;
+  getList();
+};
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  getList();
+};
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList();
+};
+
+// 获取列表
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  let data = { ...pageData.pageConfiger, ...queryFrom.value };
+  tacticalGet(data, "/mosty-api/mosty-gsxt/tactical/selectPage")
+    .then((res) => {
+      pageData.tableData = res.records || [];
+      pageData.total = res.total;
+      pageData.tableConfiger.loading = false;
+    })
+    .catch(() => {
+      pageData.tableConfiger.loading = false;
+    });
+};
+
+// 删除
+const deleteRow = (id) => {
+  proxy
+    .$confirm("确定要删除", "警告", { type: "warning" })
+    .then(() => {
+      tacticalDelete({}, "/mosty-api/mosty-gsxt/tactical/" + id).then(() => {
+        proxy.$message({ type: "success", message: "删除成功" });
+        getList();
+      });
+    })
+    .catch(() => { });
+};
+
+// 详情
+const addEdit = (type, row) => {
+  show.value = true;
+  nextTick(() => {
+    detailDiloag.value.init(type, row);
+  });
+};
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.tableHeight =
+    window.innerHeight - searchBox.value.offsetHeight - 250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+</script>
+
+<style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
+}
+</style>
\ No newline at end of file

From 391c30ac5be8b8c6e822a72e238b995afb7e1df4 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 19:09:23 +0800
Subject: [PATCH 08/13] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=B4=A0=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JudgmentHome/dataReduction/addForm.vue    | 70 ++++++++++++++++++-
 1 file changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
index a8b850c..38571e0 100644
--- a/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/dataReduction/addForm.vue
@@ -31,11 +31,14 @@
                   </el-tag>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="120" align="center">
+              <el-table-column label="操作" width="200" align="center">
                 <template #default="{ row }">
                   <el-button type="text" size="small" @click="updateStatus(row)" :disabled="updateDis(row)">
                     修改状态
                   </el-button>
+                  <el-button type="text" size="small" @click="submitMaterial(row)" :disabled="updateDis(row)">
+                    提交素材
+                  </el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -67,6 +70,24 @@
       </el-form>
     </div>
   </div>
+
+  <!-- 提交素材弹框 -->
+  <div class="dialog" v-if="materialDialog">
+    <div class="head_box">
+      <span class="title">提交素材</span>
+      <div>
+        <el-button type="primary" size="small" :loading="materialLoading" @click="submitMaterialAction">保存</el-button>
+        <el-button size="small" @click="closeMaterialDialog">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <el-form :model="materialForm" label-width="80px">
+        <el-form-item label="附件">
+          <UploadFile v-model="materialForm.fj" :limit="2" :isImg="false" :isAll="true" />
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
 </template>
 
 <script setup>
@@ -74,7 +95,7 @@ import FormMessage from "@/components/aboutTable/FormMessage.vue";
 import UploadFile from "@/components/MyComponents/Upload/index.vue";
 // import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue"
 import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, watch, computed } from "vue";
-import { sjzlAddEntity, sjzlEditEntity, sjzlGetInfo, sjzlPerfectlnfo, sjzlFstz, sjzlQryp } from '@//api/yj.js'
+import { sjzlAddEntity, sjzlEditEntity, sjzlGetInfo, sjzlPerfectlnfo, sjzlFstz, sjzlQryp, sjzlPerfectSorce } from '@//api/yj.js'
 import { getItem } from '@//utils/storage.js'
 
 const emit = defineEmits(["updateDate", "getList"]);
@@ -105,6 +126,13 @@ const statusDialog = ref(false) // 修改状态弹框
 const statusLoading = ref(false)
 const statusForm = ref({ fj: [] }) // 修改状态表单
 const currentRow = ref({}) // 当前操作的行
+
+// 提交素材相关
+const materialDialog = ref(false) // 提交素材弹框
+const materialLoading = ref(false)
+const materialForm = ref({ fj: [] }) // 提交素材表单
+const materialRow = ref({}) // 当前操作的行
+
 /** 外面行数据 */
 const outRow = ref({})
 const noticeLoading = ref(false) // 下发通知加载状态
@@ -304,6 +332,44 @@ const closeStatusDialog = () => {
   statusLoading.value = false
 }
 
+// 提交素材
+const submitMaterial = (row) => {
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+  /** 找原来的对象 */
+  const curr = cyypList.find(item2 => item2.ypbmdm == row.ypbmdm) || {}
+  materialRow.value = { ...curr, row }
+  materialForm.value = { fj: [] }
+  materialDialog.value = true
+}
+
+// 提交素材操作
+const submitMaterialAction = async () => {
+  try {
+    materialLoading.value = true
+    const params = {
+      id: materialRow.value.id,
+      fj: materialForm.value.fj?.length > 0 ? getFjString(materialForm.value.fj) : '',
+    }
+
+    const res = await sjzlPerfectSorce(params)
+    proxy.$message({ type: "success", message: "提交素材成功" })
+
+    closeMaterialDialog()
+    if (outRow.value.id) { getDataById(outRow.value.id) }
+  } catch (error) {
+    console.log(error)
+  } finally {
+    materialLoading.value = false
+  }
+}
+
+// 关闭提交素材弹框
+const closeMaterialDialog = () => {
+  materialDialog.value = false
+  materialForm.value = { fj: [] }
+  materialLoading.value = false
+}
+
 // 下发通知
 const sendNotice = () => {
   proxy.$confirm('确认下发通知？', '提示', {

From 88747b863d27dab496c28d68048fe18cfac42343 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 19:21:25 +0800
Subject: [PATCH 09/13] =?UTF-8?q?feat:=20=E6=88=98=E6=9C=AF=E7=A0=94?=
 =?UTF-8?q?=E5=88=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |   2 +-
 .../JudgmentHome/tacticalResearch/addForm.vue | 449 ++++++++++++++++++
 .../tacticalResearch/components/addForm.vue   | 208 --------
 .../JudgmentHome/tacticalResearch/index.vue   | 200 ++++----
 4 files changed, 565 insertions(+), 294 deletions(-)
 create mode 100644 src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue
 delete mode 100644 src/views/backOfficeSystem/JudgmentHome/tacticalResearch/components/addForm.vue

diff --git a/src/router/index.js b/src/router/index.js
index b50b4c9..0acce2d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -670,7 +670,7 @@ export const publicRoutes = [
           {
             path: "/tacticalResearch",
             name: "tacticalResearch",
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/tacticalResearch/index"),
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue"),
             meta: {
               title: "战术研判",
               icon: "article"
diff --git a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue
new file mode 100644
index 0000000..38571e0
--- /dev/null
+++ b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue
@@ -0,0 +1,449 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">数据整理{{ title }} </span>
+      <div>
+        <el-button type="primary" size="small" v-if="title != '详情'" :loading="loading" @click="submit">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div style="padding-bottom: 40px;" class="form_cnt">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+        <template #bmList>
+          <div class="table-box">
+            <el-table :data="tableList" border style="width: 100%">
+              <el-table-column prop="ypbmmc" label="部门" width="150" align="center" />
+              <el-table-column label="研判素材" width="280" align="center">
+                <template #default="{ row }">
+                  <el-input v-model="row.scyq" :disabled="!isShiQingBaoZhongXin" placeholder="请输入研判素材" />
+                </template>
+              </el-table-column>
+              <el-table-column label="附件" width="200" align="center">
+                <template #default="{ row }">
+                  <UploadFile v-model="row.fj" :disabled="!isShiQingBaoZhongXin" :limit="1" :isImg="false"
+                    :isAll="true" />
+                </template>
+              </el-table-column>
+              <el-table-column prop="wcqk" label="完成状态" width="120" align="center">
+                <template #default="{ row }">
+                  <el-tag :type="row.wcqk === '02' ? 'success' : 'warning'">
+                    {{ row.wcqk == '01' ? '准备中' : '已完成' }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="200" align="center">
+                <template #default="{ row }">
+                  <el-button type="text" size="small" @click="updateStatus(row)" :disabled="updateDis(row)">
+                    修改状态
+                  </el-button>
+                  <el-button type="text" size="small" @click="submitMaterial(row)" :disabled="updateDis(row)">
+                    提交素材
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
+      </FormMessage>
+    </div>
+    <!-- 底部按钮 -->
+    <div class="bottom-actions" v-if="title !== '新增' && listQuery.id">
+      <el-button type="primary" size="small" @click="sendNotice" :loading="noticeLoading">下发通知</el-button>
+      <el-button type="success" size="small" @click="confirmJudgment" :loading="confirmLoading">确认研判</el-button>
+    </div>
+  </div>
+
+  <!-- 修改状态弹框 -->
+  <div class="dialog" v-if="statusDialog">
+    <div class="head_box">
+      <span class="title">修改状态</span>
+      <div>
+        <el-button type="primary" size="small" :loading="statusLoading" @click="submitStatus">保存</el-button>
+        <el-button size="small" @click="closeStatusDialog">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <el-form :model="statusForm" label-width="80px">
+        <el-form-item label="附件">
+          <UploadFile v-model="statusForm.fj" :limit="2" :isImg="false" :isAll="true" />
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+
+  <!-- 提交素材弹框 -->
+  <div class="dialog" v-if="materialDialog">
+    <div class="head_box">
+      <span class="title">提交素材</span>
+      <div>
+        <el-button type="primary" size="small" :loading="materialLoading" @click="submitMaterialAction">保存</el-button>
+        <el-button size="small" @click="closeMaterialDialog">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <el-form :model="materialForm" label-width="80px">
+        <el-form-item label="附件">
+          <UploadFile v-model="materialForm.fj" :limit="2" :isImg="false" :isAll="true" />
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import UploadFile from "@/components/MyComponents/Upload/index.vue";
+// import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue"
+import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, watch, computed } from "vue";
+import { sjzlAddEntity, sjzlEditEntity, sjzlGetInfo, sjzlPerfectlnfo, sjzlFstz, sjzlQryp, sjzlPerfectSorce } from '@//api/yj.js'
+import { getItem } from '@//utils/storage.js'
+
+const emit = defineEmits(["updateDate", "getList"]);
+const props = defineProps({
+  dict: Object
+});
+const imgMsg = ref([])
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+
+]);
+const { deptBizType, deptLevel, deptCode } = getItem('deptId')[0]
+/** 登录人 */
+const sfzh = getItem('idEntityCard')
+/** 是否市情报指挥中心 */
+const isShiQingBaoZhongXin = computed(() => {
+  const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
+  return deptBizType == '23' && Jb == '01'
+})
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const tableList = ref([])
+// const detailObj = ref({})
+const statusDialog = ref(false) // 修改状态弹框
+const statusLoading = ref(false)
+const statusForm = ref({ fj: [] }) // 修改状态表单
+const currentRow = ref({}) // 当前操作的行
+
+// 提交素材相关
+const materialDialog = ref(false) // 提交素材弹框
+const materialLoading = ref(false)
+const materialForm = ref({ fj: [] }) // 提交素材表单
+const materialRow = ref({}) // 当前操作的行
+
+/** 外面行数据 */
+const outRow = ref({})
+const noticeLoading = ref(false) // 下发通知加载状态
+const confirmLoading = ref(false) // 确认研判加载状态
+
+const rules = reactive({
+  // 可以在这里添加表单验证规则
+});
+watch(() => props.dict, (val) => {
+  if (val) {
+    formData.value = [
+      { label: "研判议题", prop: "ypyt", type: "input", width: '48%' },
+      { label: "研判时间", prop: "ypsj", type: "datetime", width: '48%' },
+      { label: "报告类型", prop: "bglx", type: "radio", options: props.dict.D_BZ_YPLX, width: '48%' },
+      { label: "研判方式", prop: "ypfs", type: "radio", options: props.dict.D_BZ_YPFS, width: '48%' },
+      { label: "参与研判部门", prop: "jsdxBmDm", type: "department", multiple: true, depMc: 'jsdxBmMc', width: '48%' },
+      { label: "研判要求", prop: "ypyq", type: "textarea", width: '100%' },
+      { label: "列表", prop: "bmList", type: "slot", width: '100%' },
+    ]
+  }
+})
+/** 是否修改禁用 */
+function updateDis(row) {
+  /** 无id 禁用 */
+  if (!listQuery.value.id) return true
+  /** 是否创建人 */
+  const iscjr = !row.cjrsfzh || row?.cjrsfzh == deptCode
+  /** 是否完成 */
+  const isFinish = row.wcqk === '02'
+  return isShiQingBaoZhongXin.value || !iscjr || isFinish
+}
+function getFjArr(fj) {
+  if (typeof fj !== 'string' || !fj) return []
+  let fjArr = []
+  try {
+    fjArr = JSON.parse(fj)
+  } catch (error) {
+
+  }
+  return fjArr
+}
+watch(() => listQuery.value.jsdxBmDm, (val) => {
+  /** @type {Array<{ypbmdm: string, ypbmmc: string, scyq: string, fj: Array, wcqk: string}>} 参与研判部门数据数组 */
+  const arr = Array.isArray(val) ? val : []
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+
+  tableList.value = arr.map((item, i) => {
+    /** 找原来的对象 */
+    const curr = cyypList.find(item2 => item2.ypbmdm == item) || {}
+    /** 是否是新增 */
+    const isAddForm = !listQuery.value.id
+    return {
+      // id: null,
+      // sjzlid: null, // 研判数据整理ID
+      /** 部门代码 */
+      ypbmdm: item,
+      ypbmmc: listQuery.value.jsdxBmMc[i],
+      /** 素材要求 */
+      scyq: isAddForm ? '' : curr.scyq,
+      fj: isAddForm ? [] : getFjArr(curr.fj),
+      /** 完成情况（01 准备中、02 已完成）*/
+      wcqk: isAddForm ? '01' : curr.wcqk || '01'
+    }
+  })
+})
+// 初始化数据
+const init = (type, row, wjlb) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : type == "edit" ? "编辑" : "详情";
+  outRow.value = row || {}
+  if (row) { getDataById(row.id) }
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  sjzlGetInfo(id).then((res) => {
+    listQuery.value = res || {};
+    const cyypList = Array.isArray(res.cyypList) ? res.cyypList : []
+    listQuery.value.jsdxBmDm = cyypList.map(item => {
+      return item.ypbmdm
+    })
+    listQuery.value.jsdxBmMc = cyypList.map(item => {
+      return item.ypbmmc
+    })
+  });
+};
+function getFjString(arr) {
+  arr = Array.isArray(arr) ? arr : []
+  return JSON.stringify(arr)
+}
+/**获取下发部门数据 */
+const getXfbmList = () => {
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+
+  return tableList.value.map((item, i) => {
+
+    /** 找原来的对象 */
+    const curr = cyypList.find(item => item.ypbmdm == item.ypbmdm) || {}
+    return {
+      id: curr.id || null,
+      sjzlid: curr.sjzlid || null, // 研判数据整理ID
+      ypbmdm: item.ypbmdm,
+      ypbmmc: listQuery.value.jsdxBmMc[i],
+      /** 素材要求 */
+      scyq: item.scyq,
+      fj: getFjString(item.fj),
+      /** 完成情况（01 准备中、02 已完成）*/
+      wcqk: item.wcqk
+    }
+
+  })
+}
+// 提交
+const submit = () => {
+  elform.value.submit(async (data) => {
+    const xfbmList = getXfbmList()
+    let params = {
+      ...listQuery.value,
+      cyypList: xfbmList,
+      // cyypList: listQuery.value.jsdxBmDm.map((item, index) => {
+      //   return {
+      //     ypbmdm: item,
+      //     ypbmmc: listQuery.value.jsdxBmMc[index],
+      //     ypcylx: '01'
+      //   }
+      // })
+    };
+    try {
+      loading.value = true;
+      let res
+      if (title.value == "新增") {
+        res = await sjzlAddEntity(params)
+      } else {
+        res = await sjzlEditEntity(params)
+      }
+      if (res && res > 0) {
+        loading.value = false;
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("getList");
+        close();
+      }
+      loading.value = false;
+
+    } catch (error) {
+
+      loading.value = false;
+    }
+  });
+};
+
+// const chooseUserVisible = ref()
+// const roleIds = ref([])
+// const userList = ref([])
+// const handleUserSelected = (val) => {
+//   userList.value = val
+//   listQuery.value.jsrxm = val.map(item => item.userName).join(',')
+// }
+// 修改状态
+const updateStatus = (row) => {
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+  /** 找原来的对象 */
+  const curr = cyypList.find(item2 => item2.ypbmdm == row.ypbmdm) || {}
+  currentRow.value = { ...curr, row }
+  statusForm.value = { fj: [] }
+  statusDialog.value = true
+};
+
+// 提交修改状态
+const submitStatus = async () => {
+  try {
+    statusLoading.value = true
+    const params = {
+      id: currentRow.value.id,
+      fj: statusForm.value.fj?.length > 0 ? getFjString(statusForm.value.fj) : '',
+      wcqk: '02'
+    }
+
+    const res = await sjzlPerfectlnfo(params)
+    if (res && res > 0) {
+      proxy.$message({ type: "success", message: "修改成功" })
+      // 更新本地状态
+      currentRow.value.wcqk = '02'
+
+      closeStatusDialog()
+      if (outRow.value.id) { getDataById(outRow.value.id) }
+    }
+  } catch (error) {
+
+  } finally {
+    statusLoading.value = false
+  }
+}
+
+// 关闭修改状态弹框
+const closeStatusDialog = () => {
+  statusDialog.value = false
+  statusForm.value = { fj: [] }
+  statusLoading.value = false
+}
+
+// 提交素材
+const submitMaterial = (row) => {
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+  /** 找原来的对象 */
+  const curr = cyypList.find(item2 => item2.ypbmdm == row.ypbmdm) || {}
+  materialRow.value = { ...curr, row }
+  materialForm.value = { fj: [] }
+  materialDialog.value = true
+}
+
+// 提交素材操作
+const submitMaterialAction = async () => {
+  try {
+    materialLoading.value = true
+    const params = {
+      id: materialRow.value.id,
+      fj: materialForm.value.fj?.length > 0 ? getFjString(materialForm.value.fj) : '',
+    }
+
+    const res = await sjzlPerfectSorce(params)
+    proxy.$message({ type: "success", message: "提交素材成功" })
+
+    closeMaterialDialog()
+    if (outRow.value.id) { getDataById(outRow.value.id) }
+  } catch (error) {
+    console.log(error)
+  } finally {
+    materialLoading.value = false
+  }
+}
+
+// 关闭提交素材弹框
+const closeMaterialDialog = () => {
+  materialDialog.value = false
+  materialForm.value = { fj: [] }
+  materialLoading.value = false
+}
+
+// 下发通知
+const sendNotice = () => {
+  proxy.$confirm('确认下发通知？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(async () => {
+    try {
+      noticeLoading.value = true;
+      const res = await sjzlFstz(listQuery.value.id);
+      proxy.$message({ type: "success", message: "下发通知成功" });
+      close();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      noticeLoading.value = false;
+    }
+  });
+};
+
+// 确认研判
+const confirmJudgment = () => {
+
+  proxy.$confirm('确认研判完成？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(async () => {
+    try {
+      confirmLoading.value = true;
+      const res = await sjzlQryp(listQuery.value.id);
+      proxy.$message({ type: "success", message: "确认研判成功" });
+      close();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      confirmLoading.value = false;
+    }
+  });
+};
+
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+::v-deep .form-item-box {
+  width: 100% !important;
+}
+
+.bottom-actions {
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+
+  display: flex;
+  justify-content: center;
+  gap: 10px;
+  width: 100%;
+  transform: translateX(-50%);
+  padding: 10px 20px;
+
+  border-radius: 4px;
+  background: white;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+  // z-index: 1000;
+}
+</style>
diff --git a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/components/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/components/addForm.vue
deleted file mode 100644
index db87acc..0000000
--- a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/components/addForm.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <div class="dialog" v-if="dialogForm">
-    <div class="head_box">
-      <span class="title">战术研判管理{{ title }} </span>
-      <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button>
-        <el-button size="small" @click="close">关闭</el-button>
-      </div>
-    </div>
-    <div class="form_cnt">
-      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules"></FormMessage>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { IdCard } from "@/utils/validate.js";
-import FormMessage from "@/components/aboutTable/FormMessage.vue";
-import { tacticalGet, tacticalPost, tacticalPut } from "@/api/tacticalApi.js";
-import * as rule from "@/utils/rules.js";
-import {
-  ref,
-  defineExpose,
-  reactive,
-  onMounted,
-  defineEmits,
-  getCurrentInstance,
-  nextTick
-} from "vue";
-const emit = defineEmits(["updateDate"]);
-const props = defineProps({
-  dic: Object
-});
-const validateIdentity = () => {
-  return (rule, value, callback) => {
-    if (!value) {
-      return callback(new Error("身份证号不能为空"));
-    } else if (!/(^\d{15}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
-      callback(new Error("输入的身份证长度或格式错误"));
-    }
-    //身份证城市
-    var aCity = {
-      11: "北京",
-      12: "天津",
-      13: "河北",
-      14: "山西",
-      15: "内蒙古",
-      21: "辽宁",
-      22: "吉林",
-      23: "黑龙江",
-      31: "上海",
-      32: "江苏",
-      33: "浙江",
-      34: "安徽",
-      35: "福建",
-      36: "江西",
-      37: "山东",
-      41: "河南",
-      42: "湖北",
-      43: "湖南",
-      44: "广东",
-      45: "广西",
-      46: "海南",
-      50: "重庆",
-      51: "四川",
-      52: "贵州",
-      53: "云南",
-      54: "西藏",
-      61: "陕西",
-      62: "甘肃",
-      63: "青海",
-      64: "宁夏",
-      65: "新疆",
-      71: "台湾",
-      81: "香港",
-      82: "澳门",
-      91: "国外"
-    };
-    if (!aCity[parseInt(value?.substr(0, 2))])
-      callback(new Error("身份证地区非法"));
-    // 出生日期验证
-    var sBirthday = (
-      value.substr(6, 4) +
-      "-" +
-      Number(value.substr(10, 2)) +
-      "-" +
-      Number(value.substr(12, 2))
-    ).replace(/-/g, "-"),
-      d = new Date(sBirthday);
-    let yyyy = d.getFullYear();
-    let mm = d.getMonth() + 1;
-    let dd = d.getDate();
-    if (sBirthday !== yyyy + "-" + mm + "-" + dd) {
-      listQuery.value.ryCsrq = "";
-      callback(new Error("身份证上的出生日期非法"));
-    } else {
-      let month = mm < 10 ? "0" + mm : mm;
-      listQuery.value.ryCsrq = yyyy + "-" + month + "-" + dd;
-    }
-    // 身份证号码校验
-    var sum = 0,
-      weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2],
-      codes = "10X98765432";
-    for (var i = 0; i < value.length - 1; i++) {
-      sum += value[i] * weights[i];
-    }
-    var last = codes[sum % 11]; //计算出来的最后一位身份证号码
-    if (value[value.length - 1] !== last) {
-      listQuery.value.ryXb = "";
-      callback(new Error("输入的身份证号非法"));
-    } else {
-      if (value.length === 18) {
-        listQuery.value.ryCsrq = IdCard(value, 1);
-        listQuery.value.ryXb =
-          parseInt(value.substr(16, 1)) % 2 === 1 ? "1" : "2";
-      }
-    }
-    callback();
-  };
-};
-const { proxy } = getCurrentInstance();
-const dialogForm = ref(false); //弹窗
-const formData = ref([
-// { label: "力量编号", prop: "bh", type: "input", width: "30%" },
-  { label: "管辖部门", prop: "gxbmDm", type: "department", width: "30%" },
-  { label: "姓名", prop: "ryXm", type: "input", width: "30%" },
-  { label: "联系电话", prop: "ryLxdh", type: "input", width: "30%" },
-  { label: "身份证号", prop: "rySfzh", type: "input", width: "30%" },
-  { label: "出生日期", prop: "ryCsrq", type: "date", width: "30%" },
-  { label: "性别", prop: "ryXb", type: "select", options: props.dic.D_BZ_XB, width: "30%" },
-  { label: "民族", prop: "ryMz", type: "select", options: props.dic.D_BZ_MZ, width: "30%" },
-  { label: "学历", prop: "ryXl", type: "select", options: props.dic.D_BZ_WHCD, width: "30%" },
-  {
-    label: "政治面貌",
-    prop: "ryZzmm",
-    type: "select",
-    options: props.dic.D_BZ_ZZMM,
-    width: "30%"
-  },
-  { label: "所在单位", prop: "rySzdw", type: "input", width: "30%" },
-  { label: "工作阵地", prop: "gzzd", type: "input", width: "45%" },
-  { label: "作用发挥", prop: "zyfh", type: "input", width: "45%" },
-
-  { label: "居住地地址", prop: "jzdDz", type: "textarea", width: "100%" }
-]);
-const listQuery = ref({}); //表单
-const loading = ref(false);
-const elform = ref();
-const title = ref("");
-const rules = reactive({
-  gxbmDm: [{ required: true, message: "请选择管辖部门", trigger: "change" }],
-  // ryXm: [{ required: true, message: "请输入人员姓名", trigger: "blur" }],
-  // rySfzh: [
-  //   {
-  //     required: true,
-  //     message: "请输入人员身份证号",
-  //     trigger: ["blur", "change"]
-  //   },
-  //   { trigger: ["blur", "change"], validator: validateIdentity() }
-  // ],
-  ...rule.phoneRule({ require: true, validator: true }, "ryLxdh") // 是否必填 是否进行校验 可以传第二个参数
-});
-onMounted(() => { });
-
-// 初始化数据
-const init = (type, row) => {
-  dialogForm.value = true;
-  title.value = type == "add" ? "新增" : "编辑";
-  if (row) getDataById(row.id);
-};
-// 根据id查询详情
-const getDataById = (id) => {
-  tacticalGet({}, "/mosty-api/mosty-gsxt/tactical/" + id).then((res) => {
-    listQuery.value = res;
-  });
-};
-
-// 提交
-const submit = () => {
-  elform.value.submit((data) => {
-    let url =
-      title.value == "新增"
-        ? "/mosty-api/mosty-gsxt/tactical/save"
-        : "/mosty-api/mosty-gsxt/tactical/update";
-    let params = { ...data, ryLx: "02" }; // 战术研判类型标识
-    tacticalPost(params, url)
-      .then((res) => {
-        proxy.$message({ type: "success", message: title.value + "成功" });
-        emit("updateDate");
-        close();
-      })
-      .catch(() => { });
-  });
-};
-
-// 关闭
-const close = () => {
-  listQuery.value = {};
-  dialogForm.value = false;
-  loading.value = false;
-};
-defineExpose({ init });
-</script>
-
-<style lang="scss" scoped>
-@import "~@/assets/css/layout.scss";
-@import "~@/assets/css/element-plus.scss";
-</style>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue
index 26fce51..dac0bb7 100644
--- a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue
@@ -2,12 +2,13 @@
   <div>
     <div class="titleBox">
       <PageTitle title="战术研判">
-        <el-button type="primary" @click="addEdit('add', '')">
+        <el-button type="primary" @click="getDataById('add', '')">
           <el-icon style="vertical-align: middle">
             <CirclePlus />
           </el-icon>
           <span style="vertical-align: middle">新增</span>
         </el-button>
+
       </PageTitle>
     </div>
     <!-- 搜索 -->
@@ -17,15 +18,18 @@
     <!-- 表格 -->
     <div class="tabBox">
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData">
-        <template #ryMz="{ row }">
-          <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        <template #bglx="{ row }">
+          <DictTag :tag="false" :value="row.bglx" :options="D_BZ_YPLX" />
+        </template>
+        <template #ypfs="{ row }">
+          <DictTag :tag="false" :value="row.ypfs" :options="D_BZ_YPFS" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
-          <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
+          <el-link size="small" type="primary" @click="getDataById('edit', row)">修改</el-link>
+          <el-link size="small" type="primary" @click="getDataById('detail', row)">详情</el-link>
+          <el-link size="small" type="danger" @click="deleteFile(row)">删除</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -33,10 +37,8 @@
         total: pageData.total
       }"></Pages>
     </div>
-    <!-- 详情 -->
-    <DetailForm v-if="show" @updateDate="getList" ref="detailDiloag"
-      :dic="{ D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM }" />
   </div>
+  <AddForm ref="addForm" @getList="getList" :dict="{ D_BZ_YPFS, D_BZ_YPLX }" />
 </template>
 
 <script setup>
@@ -44,28 +46,33 @@ import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
-import DetailForm from "./components/addForm.vue";
-import { tacticalGet, tacticalPost, tacticalDelete } from "@/api/tacticalApi.js";
-import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
-import { ElMessage } from "element-plus";
+import { useRoute } from 'vue-router'
+import { sjzlGetPageList, sjzldeleteEntity } from "@/api/yj.js";
+import { reactive, ref, onMounted, getCurrentInstance, watch,computed } from "vue";
+import AddForm from "./addForm.vue";
 const { proxy } = getCurrentInstance();
-const { D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM } = proxy.$dict(
-  "D_BZ_WHCD",
-  "D_BZ_MZ",
-  "D_BZ_XB",
-  "D_BZ_ZZMM"
-); //获取字典数据
+const { D_BZ_YPFS, D_BZ_YPLX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX")
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
-const show = ref(false);
-const searchConfiger = ref([
-  { label: "姓名", prop: "ryXm", placeholder: "请输入姓名", showType: "input" },
-  {
-    label: "身份证号",
-    prop: "rySfzh",
-    placeholder: "请输入身份证号",
-    showType: "input"
+onMounted(() => {
+  tabHeightFn()
+  if (route.query.id) {
+    detailDiloag.value.init('edit', {
+      id: route.query.id
+    });
+    return
   }
+  getList()
+});
+/** 是否市情报指挥中心 */
+const isShiQingBaoZhongXin = computed(() => {
+  const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
+  return deptBizType == '23' && Jb == '01'
+})
+
+const searchConfiger = ref([
+  { label: "研判议题", prop: 'ypyt', placeholder: "请输入研判议题", showType: "input" },
+  // { label: "研判方式", prop: 'ypfs', placeholder: "请输入研判方式", showType: "radio",options:D_BZ_YPFS },
 ]);
 
 const pageData = reactive({
@@ -73,7 +80,7 @@ const pageData = reactive({
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
-    showSelectType: "null",
+    showSelectType: "checkBox",
     loading: false
   },
   total: 0,
@@ -81,90 +88,113 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 120,
+  controlsWidth: 240,
   tableColumn: [
-    { label: "编号", prop: "bh" },
-    { label: "姓名", prop: "ryXm" },
-    { label: "联系电话", prop: "ryLxdh" },
-    { label: "身份证号", prop: "rySfzh" },
-    { label: "工作阵地", prop: "gzzd",showOverflowTooltip: true },
-    { label: "发挥作用", prop: "zyfh" ,showOverflowTooltip: true},
-    { label: "民族", prop: "ryMz", showSolt: true },
-    { label: "居住地址", prop: "jzdDz",showOverflowTooltip: true }
+    { label: "研判议题", prop: "ypyt" },
+    { label: "研判方式", prop: "ypfs", showSolt: true },
+    { label: "报告类型", prop: "bglx", showSolt: true },
+    { label: "研判时间", prop: "ypsj" },
+    { label: "研判要求", prop: "ypyq" },
+    { label: "发起部门", prop: "ssbm" },
   ]
 });
-
 const queryFrom = ref({});
 
-onMounted(() => {
-  getList();
-  tabHeightFn();
-});
-
 // 搜索
 const onSearch = (val) => {
-  queryFrom.value = { ...val };
+  const promes = {
+    ...val,
+    ...pageData.pageConfiger,
+  }
+  queryFrom.value = { ...promes }
   pageData.pageConfiger.pageCurrent = 1;
-  getList();
-};
+  getList()
+}
 
 const changeNo = (val) => {
   pageData.pageConfiger.pageCurrent = val;
-  getList();
-};
+  getList()
+}
 const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
-  getList();
-};
+  getList()
+}
 
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
-  let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  tacticalGet(data, "/mosty-api/mosty-gsxt/tactical/selectPage")
-    .then((res) => {
-      pageData.tableData = res.records || [];
-      pageData.total = res.total;
-      pageData.tableConfiger.loading = false;
-    })
-    .catch(() => {
-      pageData.tableConfiger.loading = false;
-    });
-};
+  let data = { ...pageData.pageConfiger, ...queryFrom.value, wjlb: '01' };
+  sjzlGetPageList(data).then(res => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => { pageData.tableConfiger.loading = false; })
+}
 
-// 删除
-const deleteRow = (id) => {
-  proxy
-    .$confirm("确定要删除", "警告", { type: "warning" })
-    .then(() => {
-      tacticalDelete({}, "/mosty-api/mosty-gsxt/tactical/" + id).then(() => {
-        proxy.$message({ type: "success", message: "删除成功" });
-        getList();
-      });
-    })
-    .catch(() => { });
-};
-
-// 详情
-const addEdit = (type, row) => {
-  show.value = true;
-  nextTick(() => {
-    detailDiloag.value.init(type, row);
-  });
-};
 
 // 表格高度计算
 const tabHeightFn = () => {
-  pageData.tableHeight =
-    window.innerHeight - searchBox.value.offsetHeight - 250;
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
   window.onresize = function () {
     tabHeightFn();
   };
 };
+const route = useRoute()
+
+const addForm = ref(null)
+const getDataById = (type, row) => {
+  addForm.value.init(type, row, '01');
+}
+
+const deleteFile = (row) => {
+  proxy.$confirm('确定删除选中数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    sjzldeleteEntity({ ids: [row.id] }).then(res => {
+      proxy.$message.success('删除成功');
+      getList();
+    }).catch(() => {
+      proxy.$message.error('删除失败');
+    });
+  }).catch(() => {
+    proxy.$message.info('已取消删除');
+  });
+}
 </script>
 
+<style lang="scss" scoped>
+.label-pop {
+  position: relative;
+
+  &::before {
+    position: absolute;
+    content: '*';
+    top: 0;
+    left: -7px;
+    color: red;
+  }
+}
+</style>
+
 <style>
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
-</style>
\ No newline at end of file
+
+:v-deep .el-dialog {
+  width: 90% !important;
+}
+
+.zdy-model-dialogs {
+  /* background-color: rgb(50, 148, 214); */
+  background: url("~@/assets/images/bg46.png") no-repeat center center;
+  background-size: 100% 100%;
+  padding: 8px 10px;
+  box-sizing: border-box;
+  pointer-events: auto !important;
+  height: calc(100% - 50px);
+  overflow: auto;
+}
+</style>

From 95476485bf3dd13bc79faf8114d0c55f785db801 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 19:24:20 +0800
Subject: [PATCH 10/13] =?UTF-8?q?feat:=E6=88=98=E7=95=A5=E7=A0=94=E5=88=A4?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategicResearch/addForm.vue             | 449 ++++++++++++++++++
 .../strategicResearch/components/addForm.vue  | 208 --------
 .../JudgmentHome/strategicResearch/index.vue  | 200 ++++----
 3 files changed, 564 insertions(+), 293 deletions(-)
 create mode 100644 src/views/backOfficeSystem/JudgmentHome/strategicResearch/addForm.vue
 delete mode 100644 src/views/backOfficeSystem/JudgmentHome/strategicResearch/components/addForm.vue

diff --git a/src/views/backOfficeSystem/JudgmentHome/strategicResearch/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/addForm.vue
new file mode 100644
index 0000000..38571e0
--- /dev/null
+++ b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/addForm.vue
@@ -0,0 +1,449 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">数据整理{{ title }} </span>
+      <div>
+        <el-button type="primary" size="small" v-if="title != '详情'" :loading="loading" @click="submit">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div style="padding-bottom: 40px;" class="form_cnt">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+        <template #bmList>
+          <div class="table-box">
+            <el-table :data="tableList" border style="width: 100%">
+              <el-table-column prop="ypbmmc" label="部门" width="150" align="center" />
+              <el-table-column label="研判素材" width="280" align="center">
+                <template #default="{ row }">
+                  <el-input v-model="row.scyq" :disabled="!isShiQingBaoZhongXin" placeholder="请输入研判素材" />
+                </template>
+              </el-table-column>
+              <el-table-column label="附件" width="200" align="center">
+                <template #default="{ row }">
+                  <UploadFile v-model="row.fj" :disabled="!isShiQingBaoZhongXin" :limit="1" :isImg="false"
+                    :isAll="true" />
+                </template>
+              </el-table-column>
+              <el-table-column prop="wcqk" label="完成状态" width="120" align="center">
+                <template #default="{ row }">
+                  <el-tag :type="row.wcqk === '02' ? 'success' : 'warning'">
+                    {{ row.wcqk == '01' ? '准备中' : '已完成' }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="200" align="center">
+                <template #default="{ row }">
+                  <el-button type="text" size="small" @click="updateStatus(row)" :disabled="updateDis(row)">
+                    修改状态
+                  </el-button>
+                  <el-button type="text" size="small" @click="submitMaterial(row)" :disabled="updateDis(row)">
+                    提交素材
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
+      </FormMessage>
+    </div>
+    <!-- 底部按钮 -->
+    <div class="bottom-actions" v-if="title !== '新增' && listQuery.id">
+      <el-button type="primary" size="small" @click="sendNotice" :loading="noticeLoading">下发通知</el-button>
+      <el-button type="success" size="small" @click="confirmJudgment" :loading="confirmLoading">确认研判</el-button>
+    </div>
+  </div>
+
+  <!-- 修改状态弹框 -->
+  <div class="dialog" v-if="statusDialog">
+    <div class="head_box">
+      <span class="title">修改状态</span>
+      <div>
+        <el-button type="primary" size="small" :loading="statusLoading" @click="submitStatus">保存</el-button>
+        <el-button size="small" @click="closeStatusDialog">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <el-form :model="statusForm" label-width="80px">
+        <el-form-item label="附件">
+          <UploadFile v-model="statusForm.fj" :limit="2" :isImg="false" :isAll="true" />
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+
+  <!-- 提交素材弹框 -->
+  <div class="dialog" v-if="materialDialog">
+    <div class="head_box">
+      <span class="title">提交素材</span>
+      <div>
+        <el-button type="primary" size="small" :loading="materialLoading" @click="submitMaterialAction">保存</el-button>
+        <el-button size="small" @click="closeMaterialDialog">关闭</el-button>
+      </div>
+    </div>
+    <div class="form_cnt">
+      <el-form :model="materialForm" label-width="80px">
+        <el-form-item label="附件">
+          <UploadFile v-model="materialForm.fj" :limit="2" :isImg="false" :isAll="true" />
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import FormMessage from "@/components/aboutTable/FormMessage.vue";
+import UploadFile from "@/components/MyComponents/Upload/index.vue";
+// import ChooseUser from "@/components/ChooseList/ChooseUser/index.vue"
+import { ref, defineExpose, reactive, defineEmits, getCurrentInstance, watch, computed } from "vue";
+import { sjzlAddEntity, sjzlEditEntity, sjzlGetInfo, sjzlPerfectlnfo, sjzlFstz, sjzlQryp, sjzlPerfectSorce } from '@//api/yj.js'
+import { getItem } from '@//utils/storage.js'
+
+const emit = defineEmits(["updateDate", "getList"]);
+const props = defineProps({
+  dict: Object
+});
+const imgMsg = ref([])
+const { proxy } = getCurrentInstance();
+const dialogForm = ref(false); //弹窗
+const formData = ref([
+
+]);
+const { deptBizType, deptLevel, deptCode } = getItem('deptId')[0]
+/** 登录人 */
+const sfzh = getItem('idEntityCard')
+/** 是否市情报指挥中心 */
+const isShiQingBaoZhongXin = computed(() => {
+  const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
+  return deptBizType == '23' && Jb == '01'
+})
+const listQuery = ref({}); //表单
+const loading = ref(false);
+const elform = ref();
+const title = ref("");
+const tableList = ref([])
+// const detailObj = ref({})
+const statusDialog = ref(false) // 修改状态弹框
+const statusLoading = ref(false)
+const statusForm = ref({ fj: [] }) // 修改状态表单
+const currentRow = ref({}) // 当前操作的行
+
+// 提交素材相关
+const materialDialog = ref(false) // 提交素材弹框
+const materialLoading = ref(false)
+const materialForm = ref({ fj: [] }) // 提交素材表单
+const materialRow = ref({}) // 当前操作的行
+
+/** 外面行数据 */
+const outRow = ref({})
+const noticeLoading = ref(false) // 下发通知加载状态
+const confirmLoading = ref(false) // 确认研判加载状态
+
+const rules = reactive({
+  // 可以在这里添加表单验证规则
+});
+watch(() => props.dict, (val) => {
+  if (val) {
+    formData.value = [
+      { label: "研判议题", prop: "ypyt", type: "input", width: '48%' },
+      { label: "研判时间", prop: "ypsj", type: "datetime", width: '48%' },
+      { label: "报告类型", prop: "bglx", type: "radio", options: props.dict.D_BZ_YPLX, width: '48%' },
+      { label: "研判方式", prop: "ypfs", type: "radio", options: props.dict.D_BZ_YPFS, width: '48%' },
+      { label: "参与研判部门", prop: "jsdxBmDm", type: "department", multiple: true, depMc: 'jsdxBmMc', width: '48%' },
+      { label: "研判要求", prop: "ypyq", type: "textarea", width: '100%' },
+      { label: "列表", prop: "bmList", type: "slot", width: '100%' },
+    ]
+  }
+})
+/** 是否修改禁用 */
+function updateDis(row) {
+  /** 无id 禁用 */
+  if (!listQuery.value.id) return true
+  /** 是否创建人 */
+  const iscjr = !row.cjrsfzh || row?.cjrsfzh == deptCode
+  /** 是否完成 */
+  const isFinish = row.wcqk === '02'
+  return isShiQingBaoZhongXin.value || !iscjr || isFinish
+}
+function getFjArr(fj) {
+  if (typeof fj !== 'string' || !fj) return []
+  let fjArr = []
+  try {
+    fjArr = JSON.parse(fj)
+  } catch (error) {
+
+  }
+  return fjArr
+}
+watch(() => listQuery.value.jsdxBmDm, (val) => {
+  /** @type {Array<{ypbmdm: string, ypbmmc: string, scyq: string, fj: Array, wcqk: string}>} 参与研判部门数据数组 */
+  const arr = Array.isArray(val) ? val : []
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+
+  tableList.value = arr.map((item, i) => {
+    /** 找原来的对象 */
+    const curr = cyypList.find(item2 => item2.ypbmdm == item) || {}
+    /** 是否是新增 */
+    const isAddForm = !listQuery.value.id
+    return {
+      // id: null,
+      // sjzlid: null, // 研判数据整理ID
+      /** 部门代码 */
+      ypbmdm: item,
+      ypbmmc: listQuery.value.jsdxBmMc[i],
+      /** 素材要求 */
+      scyq: isAddForm ? '' : curr.scyq,
+      fj: isAddForm ? [] : getFjArr(curr.fj),
+      /** 完成情况（01 准备中、02 已完成）*/
+      wcqk: isAddForm ? '01' : curr.wcqk || '01'
+    }
+  })
+})
+// 初始化数据
+const init = (type, row, wjlb) => {
+  dialogForm.value = true;
+  title.value = type == "add" ? "新增" : type == "edit" ? "编辑" : "详情";
+  outRow.value = row || {}
+  if (row) { getDataById(row.id) }
+};
+// 根据id查询详情
+const getDataById = (id) => {
+  sjzlGetInfo(id).then((res) => {
+    listQuery.value = res || {};
+    const cyypList = Array.isArray(res.cyypList) ? res.cyypList : []
+    listQuery.value.jsdxBmDm = cyypList.map(item => {
+      return item.ypbmdm
+    })
+    listQuery.value.jsdxBmMc = cyypList.map(item => {
+      return item.ypbmmc
+    })
+  });
+};
+function getFjString(arr) {
+  arr = Array.isArray(arr) ? arr : []
+  return JSON.stringify(arr)
+}
+/**获取下发部门数据 */
+const getXfbmList = () => {
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+
+  return tableList.value.map((item, i) => {
+
+    /** 找原来的对象 */
+    const curr = cyypList.find(item => item.ypbmdm == item.ypbmdm) || {}
+    return {
+      id: curr.id || null,
+      sjzlid: curr.sjzlid || null, // 研判数据整理ID
+      ypbmdm: item.ypbmdm,
+      ypbmmc: listQuery.value.jsdxBmMc[i],
+      /** 素材要求 */
+      scyq: item.scyq,
+      fj: getFjString(item.fj),
+      /** 完成情况（01 准备中、02 已完成）*/
+      wcqk: item.wcqk
+    }
+
+  })
+}
+// 提交
+const submit = () => {
+  elform.value.submit(async (data) => {
+    const xfbmList = getXfbmList()
+    let params = {
+      ...listQuery.value,
+      cyypList: xfbmList,
+      // cyypList: listQuery.value.jsdxBmDm.map((item, index) => {
+      //   return {
+      //     ypbmdm: item,
+      //     ypbmmc: listQuery.value.jsdxBmMc[index],
+      //     ypcylx: '01'
+      //   }
+      // })
+    };
+    try {
+      loading.value = true;
+      let res
+      if (title.value == "新增") {
+        res = await sjzlAddEntity(params)
+      } else {
+        res = await sjzlEditEntity(params)
+      }
+      if (res && res > 0) {
+        loading.value = false;
+        proxy.$message({ type: "success", message: title.value + "成功" });
+        emit("getList");
+        close();
+      }
+      loading.value = false;
+
+    } catch (error) {
+
+      loading.value = false;
+    }
+  });
+};
+
+// const chooseUserVisible = ref()
+// const roleIds = ref([])
+// const userList = ref([])
+// const handleUserSelected = (val) => {
+//   userList.value = val
+//   listQuery.value.jsrxm = val.map(item => item.userName).join(',')
+// }
+// 修改状态
+const updateStatus = (row) => {
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+  /** 找原来的对象 */
+  const curr = cyypList.find(item2 => item2.ypbmdm == row.ypbmdm) || {}
+  currentRow.value = { ...curr, row }
+  statusForm.value = { fj: [] }
+  statusDialog.value = true
+};
+
+// 提交修改状态
+const submitStatus = async () => {
+  try {
+    statusLoading.value = true
+    const params = {
+      id: currentRow.value.id,
+      fj: statusForm.value.fj?.length > 0 ? getFjString(statusForm.value.fj) : '',
+      wcqk: '02'
+    }
+
+    const res = await sjzlPerfectlnfo(params)
+    if (res && res > 0) {
+      proxy.$message({ type: "success", message: "修改成功" })
+      // 更新本地状态
+      currentRow.value.wcqk = '02'
+
+      closeStatusDialog()
+      if (outRow.value.id) { getDataById(outRow.value.id) }
+    }
+  } catch (error) {
+
+  } finally {
+    statusLoading.value = false
+  }
+}
+
+// 关闭修改状态弹框
+const closeStatusDialog = () => {
+  statusDialog.value = false
+  statusForm.value = { fj: [] }
+  statusLoading.value = false
+}
+
+// 提交素材
+const submitMaterial = (row) => {
+  const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : []
+  /** 找原来的对象 */
+  const curr = cyypList.find(item2 => item2.ypbmdm == row.ypbmdm) || {}
+  materialRow.value = { ...curr, row }
+  materialForm.value = { fj: [] }
+  materialDialog.value = true
+}
+
+// 提交素材操作
+const submitMaterialAction = async () => {
+  try {
+    materialLoading.value = true
+    const params = {
+      id: materialRow.value.id,
+      fj: materialForm.value.fj?.length > 0 ? getFjString(materialForm.value.fj) : '',
+    }
+
+    const res = await sjzlPerfectSorce(params)
+    proxy.$message({ type: "success", message: "提交素材成功" })
+
+    closeMaterialDialog()
+    if (outRow.value.id) { getDataById(outRow.value.id) }
+  } catch (error) {
+    console.log(error)
+  } finally {
+    materialLoading.value = false
+  }
+}
+
+// 关闭提交素材弹框
+const closeMaterialDialog = () => {
+  materialDialog.value = false
+  materialForm.value = { fj: [] }
+  materialLoading.value = false
+}
+
+// 下发通知
+const sendNotice = () => {
+  proxy.$confirm('确认下发通知？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(async () => {
+    try {
+      noticeLoading.value = true;
+      const res = await sjzlFstz(listQuery.value.id);
+      proxy.$message({ type: "success", message: "下发通知成功" });
+      close();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      noticeLoading.value = false;
+    }
+  });
+};
+
+// 确认研判
+const confirmJudgment = () => {
+
+  proxy.$confirm('确认研判完成？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(async () => {
+    try {
+      confirmLoading.value = true;
+      const res = await sjzlQryp(listQuery.value.id);
+      proxy.$message({ type: "success", message: "确认研判成功" });
+      close();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      confirmLoading.value = false;
+    }
+  });
+};
+
+// 关闭
+const close = () => {
+  listQuery.value = {};
+  dialogForm.value = false;
+  loading.value = false;
+};
+
+defineExpose({ init });
+</script>
+
+<style lang="scss" scoped>
+@import "~@/assets/css/layout.scss";
+@import "~@/assets/css/element-plus.scss";
+
+::v-deep .form-item-box {
+  width: 100% !important;
+}
+
+.bottom-actions {
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+
+  display: flex;
+  justify-content: center;
+  gap: 10px;
+  width: 100%;
+  transform: translateX(-50%);
+  padding: 10px 20px;
+
+  border-radius: 4px;
+  background: white;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+  // z-index: 1000;
+}
+</style>
diff --git a/src/views/backOfficeSystem/JudgmentHome/strategicResearch/components/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/components/addForm.vue
deleted file mode 100644
index 5ff9076..0000000
--- a/src/views/backOfficeSystem/JudgmentHome/strategicResearch/components/addForm.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <div class="dialog" v-if="dialogForm">
-    <div class="head_box">
-      <span class="title">战略研判管理{{ title }} </span>
-      <div>
-        <el-button type="primary" size="small" :loading="loading" @click="submit">保存</el-button>
-        <el-button size="small" @click="close">关闭</el-button>
-      </div>
-    </div>
-    <div class="form_cnt">
-      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules"></FormMessage>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { IdCard } from "@/utils/validate.js";
-import FormMessage from "@/components/aboutTable/FormMessage.vue";
-import { strategicGet, strategicPost, strategicPut } from "@/api/strategicApi.js";
-import * as rule from "@/utils/rules.js";
-import {
-  ref,
-  defineExpose,
-  reactive,
-  onMounted,
-  defineEmits,
-  getCurrentInstance,
-  nextTick
-} from "vue";
-const emit = defineEmits(["updateDate"]);
-const props = defineProps({
-  dic: Object
-});
-const validateIdentity = () => {
-  return (rule, value, callback) => {
-    if (!value) {
-      return callback(new Error("身份证号不能为空"));
-    } else if (!/(^\d{15}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
-      callback(new Error("输入的身份证长度或格式错误"));
-    }
-    //身份证城市
-    var aCity = {
-      11: "北京",
-      12: "天津",
-      13: "河北",
-      14: "山西",
-      15: "内蒙古",
-      21: "辽宁",
-      22: "吉林",
-      23: "黑龙江",
-      31: "上海",
-      32: "江苏",
-      33: "浙江",
-      34: "安徽",
-      35: "福建",
-      36: "江西",
-      37: "山东",
-      41: "河南",
-      42: "湖北",
-      43: "湖南",
-      44: "广东",
-      45: "广西",
-      46: "海南",
-      50: "重庆",
-      51: "四川",
-      52: "贵州",
-      53: "云南",
-      54: "西藏",
-      61: "陕西",
-      62: "甘肃",
-      63: "青海",
-      64: "宁夏",
-      65: "新疆",
-      71: "台湾",
-      81: "香港",
-      82: "澳门",
-      91: "国外"
-    };
-    if (!aCity[parseInt(value?.substr(0, 2))])
-      callback(new Error("身份证地区非法"));
-    // 出生日期验证
-    var sBirthday = (
-      value.substr(6, 4) +
-      "-" +
-      Number(value.substr(10, 2)) +
-      "-" +
-      Number(value.substr(12, 2))
-    ).replace(/-/g, "-"),
-      d = new Date(sBirthday);
-    let yyyy = d.getFullYear();
-    let mm = d.getMonth() + 1;
-    let dd = d.getDate();
-    if (sBirthday !== yyyy + "-" + mm + "-" + dd) {
-      listQuery.value.ryCsrq = "";
-      callback(new Error("身份证上的出生日期非法"));
-    } else {
-      let month = mm < 10 ? "0" + mm : mm;
-      listQuery.value.ryCsrq = yyyy + "-" + month + "-" + dd;
-    }
-    // 身份证号码校验
-    var sum = 0,
-      weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2],
-      codes = "10X98765432";
-    for (var i = 0; i < value.length - 1; i++) {
-      sum += value[i] * weights[i];
-    }
-    var last = codes[sum % 11]; //计算出来的最后一位身份证号码
-    if (value[value.length - 1] !== last) {
-      listQuery.value.ryXb = "";
-      callback(new Error("输入的身份证号非法"));
-    } else {
-      if (value.length === 18) {
-        listQuery.value.ryCsrq = IdCard(value, 1);
-        listQuery.value.ryXb =
-          parseInt(value.substr(16, 1)) % 2 === 1 ? "1" : "2";
-      }
-    }
-    callback();
-  };
-};
-const { proxy } = getCurrentInstance();
-const dialogForm = ref(false); //弹窗
-const formData = ref([
-// { label: "力量编号", prop: "bh", type: "input", width: "30%" },
-  { label: "管辖部门", prop: "gxbmDm", type: "department", width: "30%" },
-  { label: "姓名", prop: "ryXm", type: "input", width: "30%" },
-  { label: "联系电话", prop: "ryLxdh", type: "input", width: "30%" },
-  { label: "身份证号", prop: "rySfzh", type: "input", width: "30%" },
-  { label: "出生日期", prop: "ryCsrq", type: "date", width: "30%" },
-  { label: "性别", prop: "ryXb", type: "select", options: props.dic.D_BZ_XB, width: "30%" },
-  { label: "民族", prop: "ryMz", type: "select", options: props.dic.D_BZ_MZ, width: "30%" },
-  { label: "学历", prop: "ryXl", type: "select", options: props.dic.D_BZ_WHCD, width: "30%" },
-  {
-    label: "政治面貌",
-    prop: "ryZzmm",
-    type: "select",
-    options: props.dic.D_BZ_ZZMM,
-    width: "30%"
-  },
-  { label: "所在单位", prop: "rySzdw", type: "input", width: "30%" },
-  { label: "工作阵地", prop: "gzzd", type: "input", width: "45%" },
-  { label: "作用发挥", prop: "zyfh", type: "input", width: "45%" },
-
-  { label: "居住地地址", prop: "jzdDz", type: "textarea", width: "100%" }
-]);
-const listQuery = ref({}); //表单
-const loading = ref(false);
-const elform = ref();
-const title = ref("");
-const rules = reactive({
-  gxbmDm: [{ required: true, message: "请选择管辖部门", trigger: "change" }],
-  // ryXm: [{ required: true, message: "请输入人员姓名", trigger: "blur" }],
-  // rySfzh: [
-  //   {
-  //     required: true,
-  //     message: "请输入人员身份证号",
-  //     trigger: ["blur", "change"]
-  //   },
-  //   { trigger: ["blur", "change"], validator: validateIdentity() }
-  // ],
-  ...rule.phoneRule({ require: true, validator: true }, "ryLxdh") // 是否必填 是否进行校验 可以传第二个参数
-});
-onMounted(() => { });
-
-// 初始化数据
-const init = (type, row) => {
-  dialogForm.value = true;
-  title.value = type == "add" ? "新增" : "编辑";
-  if (row) getDataById(row.id);
-};
-// 根据id查询详情
-const getDataById = (id) => {
-  strategicGet({}, "/mosty-api/mosty-gsxt/strategic/" + id).then((res) => {
-    listQuery.value = res;
-  });
-};
-
-// 提交
-const submit = () => {
-  elform.value.submit((data) => {
-    let url =
-      title.value == "新增"
-        ? "/mosty-api/mosty-gsxt/strategic/save"
-        : "/mosty-api/mosty-gsxt/strategic/update";
-    let params = { ...data, ryLx: "03" }; // 战略研判类型标识
-    strategicPost(params, url)
-      .then((res) => {
-        proxy.$message({ type: "success", message: title.value + "成功" });
-        emit("updateDate");
-        close();
-      })
-      .catch(() => { });
-  });
-};
-
-// 关闭
-const close = () => {
-  listQuery.value = {};
-  dialogForm.value = false;
-  loading.value = false;
-};
-defineExpose({ init });
-</script>
-
-<style lang="scss" scoped>
-@import "~@/assets/css/layout.scss";
-@import "~@/assets/css/element-plus.scss";
-</style>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue
index c6dd75f..851dd9d 100644
--- a/src/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue
@@ -2,12 +2,13 @@
   <div>
     <div class="titleBox">
       <PageTitle title="战略研判">
-        <el-button type="primary" @click="addEdit('add', '')">
+        <el-button type="primary" @click="getDataById('add', '')">
           <el-icon style="vertical-align: middle">
             <CirclePlus />
           </el-icon>
           <span style="vertical-align: middle">新增</span>
         </el-button>
+
       </PageTitle>
     </div>
     <!-- 搜索 -->
@@ -17,15 +18,18 @@
     <!-- 表格 -->
     <div class="tabBox">
       <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
-        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
-        @chooseData="chooseData">
-        <template #ryMz="{ row }">
-          <DictTag :tag="false" :value="row.ryMz" :options="D_BZ_MZ" />
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        <template #bglx="{ row }">
+          <DictTag :tag="false" :value="row.bglx" :options="D_BZ_YPLX" />
+        </template>
+        <template #ypfs="{ row }">
+          <DictTag :tag="false" :value="row.ypfs" :options="D_BZ_YPFS" />
         </template>
         <!-- 操作 -->
         <template #controls="{ row }">
-          <el-link size="small" type="success" @click="addEdit('edit', row)">编辑</el-link>
-          <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
+          <el-link size="small" type="primary" @click="getDataById('edit', row)">修改</el-link>
+          <el-link size="small" type="primary" @click="getDataById('detail', row)">详情</el-link>
+          <el-link size="small" type="danger" @click="deleteFile(row)">删除</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -33,10 +37,8 @@
         total: pageData.total
       }"></Pages>
     </div>
-    <!-- 详情 -->
-    <DetailForm v-if="show" @updateDate="getList" ref="detailDiloag"
-      :dic="{ D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM }" />
   </div>
+  <AddForm ref="addForm" @getList="getList" :dict="{ D_BZ_YPFS, D_BZ_YPLX }" />
 </template>
 
 <script setup>
@@ -44,28 +46,33 @@ import PageTitle from "@/components/aboutTable/PageTitle.vue";
 import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
-import DetailForm from "./components/addForm.vue";
-import { strategicGet, strategicPost, strategicDelete } from "@/api/strategicApi.js";
-import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
-import { ElMessage } from "element-plus";
+import { useRoute } from 'vue-router'
+import { sjzlGetPageList, sjzldeleteEntity } from "@/api/yj.js";
+import { reactive, ref, onMounted, getCurrentInstance, watch,computed } from "vue";
+import AddForm from "./addForm.vue";
 const { proxy } = getCurrentInstance();
-const { D_BZ_WHCD, D_BZ_MZ, D_BZ_XB, D_BZ_ZZMM } = proxy.$dict(
-  "D_BZ_WHCD",
-  "D_BZ_MZ",
-  "D_BZ_XB",
-  "D_BZ_ZZMM"
-); //获取字典数据
+const { D_BZ_YPFS, D_BZ_YPLX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX")
 const detailDiloag = ref();
 const searchBox = ref(); //搜索框
-const show = ref(false);
-const searchConfiger = ref([
-  { label: "姓名", prop: "ryXm", placeholder: "请输入姓名", showType: "input" },
-  {
-    label: "身份证号",
-    prop: "rySfzh",
-    placeholder: "请输入身份证号",
-    showType: "input"
+onMounted(() => {
+  tabHeightFn()
+  if (route.query.id) {
+    detailDiloag.value.init('edit', {
+      id: route.query.id
+    });
+    return
   }
+  getList()
+});
+/** 是否市情报指挥中心 */
+const isShiQingBaoZhongXin = computed(() => {
+  const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
+  return deptBizType == '23' && Jb == '01'
+})
+
+const searchConfiger = ref([
+  { label: "研判议题", prop: 'ypyt', placeholder: "请输入研判议题", showType: "input" },
+  // { label: "研判方式", prop: 'ypfs', placeholder: "请输入研判方式", showType: "radio",options:D_BZ_YPFS },
 ]);
 
 const pageData = reactive({
@@ -73,7 +80,7 @@ const pageData = reactive({
   keyCount: 0,
   tableConfiger: {
     rowHieght: 61,
-    showSelectType: "null",
+    showSelectType: "checkBox",
     loading: false
   },
   total: 0,
@@ -81,90 +88,113 @@ const pageData = reactive({
     pageSize: 20,
     pageCurrent: 1
   },
-  controlsWidth: 120,
+  controlsWidth: 240,
   tableColumn: [
-    { label: "编号", prop: "bh" },
-    { label: "姓名", prop: "ryXm" },
-    { label: "联系电话", prop: "ryLxdh" },
-    { label: "身份证号", prop: "rySfzh" },
-    { label: "工作阵地", prop: "gzzd",showOverflowTooltip: true },
-    { label: "发挥作用", prop: "zyfh" ,showOverflowTooltip: true},
-    { label: "民族", prop: "ryMz", showSolt: true },
-    { label: "居住地址", prop: "jzdDz",showOverflowTooltip: true }
+    { label: "研判议题", prop: "ypyt" },
+    { label: "研判方式", prop: "ypfs", showSolt: true },
+    { label: "报告类型", prop: "bglx", showSolt: true },
+    { label: "研判时间", prop: "ypsj" },
+    { label: "研判要求", prop: "ypyq" },
+    { label: "发起部门", prop: "ssbm" },
   ]
 });
-
 const queryFrom = ref({});
 
-onMounted(() => {
-  getList();
-  tabHeightFn();
-});
-
 // 搜索
 const onSearch = (val) => {
-  queryFrom.value = { ...val };
+  const promes = {
+    ...val,
+    ...pageData.pageConfiger,
+  }
+  queryFrom.value = { ...promes }
   pageData.pageConfiger.pageCurrent = 1;
-  getList();
-};
+  getList()
+}
 
 const changeNo = (val) => {
   pageData.pageConfiger.pageCurrent = val;
-  getList();
-};
+  getList()
+}
 const changeSize = (val) => {
   pageData.pageConfiger.pageSize = val;
-  getList();
-};
+  getList()
+}
 
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
-  let data = { ...pageData.pageConfiger, ...queryFrom.value };
-  strategicGet(data, "/mosty-api/mosty-gsxt/strategic/selectPage")
-    .then((res) => {
-      pageData.tableData = res.records || [];
-      pageData.total = res.total;
-      pageData.tableConfiger.loading = false;
-    })
-    .catch(() => {
-      pageData.tableConfiger.loading = false;
-    });
-};
+  let data = { ...pageData.pageConfiger, ...queryFrom.value, wjlb: '01' };
+  sjzlGetPageList(data).then(res => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => { pageData.tableConfiger.loading = false; })
+}
 
-// 删除
-const deleteRow = (id) => {
-  proxy
-    .$confirm("确定要删除", "警告", { type: "warning" })
-    .then(() => {
-      strategicDelete({}, "/mosty-api/mosty-gsxt/strategic/" + id).then(() => {
-        proxy.$message({ type: "success", message: "删除成功" });
-        getList();
-      });
-    })
-    .catch(() => { });
-};
-
-// 详情
-const addEdit = (type, row) => {
-  show.value = true;
-  nextTick(() => {
-    detailDiloag.value.init(type, row);
-  });
-};
 
 // 表格高度计算
 const tabHeightFn = () => {
-  pageData.tableHeight =
-    window.innerHeight - searchBox.value.offsetHeight - 250;
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
   window.onresize = function () {
     tabHeightFn();
   };
 };
+const route = useRoute()
+
+const addForm = ref(null)
+const getDataById = (type, row) => {
+  addForm.value.init(type, row, '01');
+}
+
+const deleteFile = (row) => {
+  proxy.$confirm('确定删除选中数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    sjzldeleteEntity({ ids: [row.id] }).then(res => {
+      proxy.$message.success('删除成功');
+      getList();
+    }).catch(() => {
+      proxy.$message.error('删除失败');
+    });
+  }).catch(() => {
+    proxy.$message.info('已取消删除');
+  });
+}
 </script>
 
+<style lang="scss" scoped>
+.label-pop {
+  position: relative;
+
+  &::before {
+    position: absolute;
+    content: '*';
+    top: 0;
+    left: -7px;
+    color: red;
+  }
+}
+</style>
+
 <style>
 .el-loading-mask {
   background: rgba(0, 0, 0, 0.5) !important;
 }
-</style>
\ No newline at end of file
+
+:v-deep .el-dialog {
+  width: 90% !important;
+}
+
+.zdy-model-dialogs {
+  /* background-color: rgb(50, 148, 214); */
+  background: url("~@/assets/images/bg46.png") no-repeat center center;
+  background-size: 100% 100%;
+  padding: 8px 10px;
+  box-sizing: border-box;
+  pointer-events: auto !important;
+  height: calc(100% - 50px);
+  overflow: auto;
+}
+</style>

From b9396bb37f067483ea1704e2ce99703754e7233f Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 19:47:07 +0800
Subject: [PATCH 11/13] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=A0=94?=
 =?UTF-8?q?=E5=88=A4=E6=8C=87=E4=BB=A4=E5=A4=87=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/{ => huiShangyp}/strategicApi.js      |   0
 src/api/huiShangyp/tacticalApi.js             | 150 ++++++++
 src/api/tacticalApi.js                        |  62 ----
 src/router/index.js                           |  11 +-
 .../JudgmentHome/judgmentCommand/addForm.vue  | 330 ++++++++++++++++++
 .../JudgmentHome/judgmentCommand/index.vue    | 200 +++++++++++
 .../strategicResearch/addForm.vue             |   6 +-
 .../JudgmentHome/tacticalResearch/addForm.vue |   6 +-
 8 files changed, 696 insertions(+), 69 deletions(-)
 rename src/api/{ => huiShangyp}/strategicApi.js (100%)
 create mode 100644 src/api/huiShangyp/tacticalApi.js
 delete mode 100644 src/api/tacticalApi.js
 create mode 100644 src/views/backOfficeSystem/JudgmentHome/judgmentCommand/addForm.vue
 create mode 100644 src/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue

diff --git a/src/api/strategicApi.js b/src/api/huiShangyp/strategicApi.js
similarity index 100%
rename from src/api/strategicApi.js
rename to src/api/huiShangyp/strategicApi.js
diff --git a/src/api/huiShangyp/tacticalApi.js b/src/api/huiShangyp/tacticalApi.js
new file mode 100644
index 0000000..76825c9
--- /dev/null
+++ b/src/api/huiShangyp/tacticalApi.js
@@ -0,0 +1,150 @@
+import request from "@/utils/request";
+const api = "/mosty-api/mosty-gsxt";
+
+/**
+ * 战术研判-分页查询
+ * @param {Object} params 查询参数
+ * @param {number} [params.pageSize] 每页显示数量
+ * @param {number} [params.pageCurrent] 页码
+ * @param {string} [params.startTime] 开始时间
+ * @param {string} [params.endTime] 结束时间
+ * @param {string} [params.timeField] 时间范围查询字段
+ * @param {string} [params.sort] 排序字段
+ * @param {string} [params.order] 排序方式
+ * @param {string} [params.ypyt] 研判议题
+ * @param {string} [params.yppyq] 研判要求
+ * @param {string} [params.ypfs] 研判方式（01 线上、02 线下、03 自建）
+ * @param {string} [params.bglx] 报告类型（01 战术研判 02 战略研判）查询研判列表必传
+ * @param {string} [params.ssbmdm] 所属部门代码
+ * @returns {Promise} 请求Promise对象
+ */
+export const tacticalGet = (params) => {
+  return request({
+    url: api + `/ypbg/sjzl/getPageYpList`,
+    method: "get",
+    params
+  })
+}
+
+// 战术研判-新增
+export const tacticalPost = (data, url) => {
+  return request({
+    url: api,
+    method: "post",
+    data
+  })
+}
+
+// 战术研判-删除
+export const tacticalDelete = (data, url) => {
+  return request({
+    url: api,
+    method: "delete",
+    data
+  })
+}
+
+// 战术研判-根据ID查询详情
+export const tacticalGetInfo = (id) => {
+  return request({
+    url: api + `/tactical/${id}`,
+    method: "get"
+  })
+}
+
+// 战术研判-编辑
+export const tacticalPut = (data, url) => {
+  return request({
+    url: api,
+    method: "put",
+    data
+  })
+}
+
+
+/**
+ * 开始研判
+ * @param {string|number} id 研判ID
+ * @returns {Promise} 请求Promise对象
+ */
+export const startJudgment = (id) => {
+  return request({
+    url: api + `/ypbg/sjzl/ksyp/${id}`,
+    method: "post"
+  })
+}
+
+/**
+ * 结束研判
+ * @param {string|number} id 研判ID
+ * @returns {Promise} 请求Promise对象
+ */
+export const endJudgment = (id) => {
+  return request({
+    url: api + `/ypbg/sjzl/jsyp/${id}`,
+    method: "post"
+  })
+}
+
+/**
+ * 自建研判报告
+ * @param {Object} data 自建研判数据
+ * @returns {Promise} 请求Promise对象
+ */
+export const selfBuildJudgment = (data) => {
+  return request({
+    url: api + `/ypbg/sjzl/selfBuild`,
+    method: "post",
+    data
+  })
+}
+//  =================== 指令 ====================
+/**
+ * 研判指令列表
+ * @param {Object} params 查询参数
+ * @param {number} [params.pageSize] 每页显示数量
+ * @param {number} [params.pageCurrent] 页码
+ * @param {string} [params.zlbt] 指令标题
+ * @param {string} [params.zlnr] 指令内容
+ * @param {string} [params.fqrxm] 发起人姓名
+ * @returns {Promise} 请求Promise对象
+ */
+export const getJudgmentCommandList = (params) => {
+  return request({
+    url: api + `/ypbg/zlxx/getPageList`,
+    method: "get",
+    params
+  })
+}
+
+/**
+ * 指令签收
+ * @param {Object} data 签收数据
+ * @param {string|number} data.zlid 指令ID（签收必传）
+ * @param {string} [data.bglx] 报告类型：01 战术报告 02 战略报告
+ * @param {string} [data.ypid] 研判业务ID(研判报告ID)
+ * @returns {Promise} 请求Promise对象
+ */
+export const signCommand = (data) => {
+  return request({
+    url: api + `/ypbg/zlxx/zlqs`,
+    method: "post",
+    data
+  })
+}
+
+/**
+ * 指令反馈
+ * @param {Object} data 反馈数据
+ * @param {string|number} data.zlid 指令ID（反馈必传）
+ * @param {string} data.bglx 报告类型：01 战术报告 02 战略报告（反馈必传）
+ * @param {string} data.ypid 研判业务ID(研判报告ID)（反馈必传）
+ * @returns {Promise} 请求Promise对象
+ */
+export const feedbackCommand = (data) => {
+  return request({
+    url: api + `/ypbg/zlxx/zlfk`,
+    method: "post",
+    data
+  })
+}
diff --git a/src/api/tacticalApi.js b/src/api/tacticalApi.js
deleted file mode 100644
index 0378a11..0000000
--- a/src/api/tacticalApi.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import request from "@/utils/request";
-const api = "/mosty-api/mosty-gsxt";
-
-/**
- * 战术研判-分页查询
- * @param {Object} params 查询参数
- * @param {number} [params.pageSize] 每页显示数量
- * @param {number} [params.pageCurrent] 页码
- * @param {string} [params.startTime] 开始时间
- * @param {string} [params.endTime] 结束时间
- * @param {string} [params.timeField] 时间范围查询字段
- * @param {string} [params.sort] 排序字段
- * @param {string} [params.order] 排序方式
- * @param {string} [params.ypyt] 研判议题
- * @param {string} [params.yppyq] 研判要求
- * @param {string} [params.ypfs] 研判方式（01 线上、02 线下、03 自建）
- * @param {string} [params.bglx] 报告类型（01 战术研判 02 战略研判）查询研判列表必传
- * @param {string} [params.ssbmdm] 所属部门代码
- * @returns {Promise} 请求Promise对象
- */
-export const tacticalGet = (params) => {
-  return request({
-    url: api + `/ypbg/sjzl/getPageYpList`,
-    method: "get",
-    params
-  })
-}
-
-// 战术研判-新增
-export const tacticalPost = (data, url) => {
-  return request({
-    url: api,
-    method: "post",
-    data
-  })
-}
-
-// 战术研判-删除
-export const tacticalDelete = (data, url) => {
-  return request({
-    url: api,
-    method: "delete",
-    data
-  })
-}
-
-// 战术研判-根据ID查询详情
-export const tacticalGetInfo = (id) => {
-  return request({
-    url: api + `/tactical/${id}`,
-    method: "get"
-  })
-}
-
-// 战术研判-编辑
-export const tacticalPut = (data, url) => {
-  return request({
-    url: api,
-    method: "put",
-    data
-  })
-}
diff --git a/src/router/index.js b/src/router/index.js
index 0acce2d..db82798 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -679,12 +679,21 @@ export const publicRoutes = [
           {
             path: "/strategicResearch",
             name: "strategicResearch",
-            component: () => import("@/views/backOfficeSystem/JudgmentHome/strategicResearch/index"),
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/strategicResearch/index.vue"),
             meta: {
               title: "战略研判",
               icon: "article"
             }
           },
+          {
+            path: "/judgmentCommand",
+            name: "judgmentCommand",
+            component: () => import("@/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue"),
+            meta: {
+              title: "研判指令",
+              icon: "article"
+            }
+          },
 
           // {
           //   path: "/analysisReport",
diff --git a/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/addForm.vue
new file mode 100644
index 0000000..8a0bdfe
--- /dev/null
+++ b/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/addForm.vue
@@ -0,0 +1,330 @@
+<template>
+  <div class="dialog" v-if="dialogForm">
+    <div class="head_box">
+      <span class="title">研判指令{{ title }} </span>
+      <div>
+        <el-button type="primary" size="small" v-if="title != '详情'" :loading="loading" @click="submit">保存</el-button>
+        <el-button size="small" @click="close">关闭</el-button>
+      </div>
+    </div>
+    <div style="padding-bottom: 40px;" class="form_cnt">
+      <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
+        <template #bmList>
+          <div class="table-box">
+            <el-table :data="tableList" border style="width: 100%">
+              <el-table-column prop="ypbmmc" label="部门" width="150" align="center" />
+              <el-table-column label="研判素材" width="280" align="center">
+                <template #default="{ row }">
+                  <el-input v-model="row.scyq" :disabled="!isShiQingBaoZhongXin" placeholder="请输入研判素材" />
+                </template>
+              </el-table-column>
+              <el-table-column label="附件" width="200" align="center">
+                <template #default="{ row }">
+                  <UploadFile v-model="row.fj" :disabled="!isShiQingBaoZhongXin" :limit="1" :isImg="false"
+                    :isAll="true" />
+                </template>
+              </el-table-column>
+              <el-table-column prop="wcqk" label="完成状态" width="120" align="center">
+                <template #default="{ row }">
+                  <el-tag :type="row.wcqk === '02' ? 'success' : 'warning'">
+                    {{ row.wcqk == '01' ? '准备中' : '已完成' }}
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="200" align="center">
+                <template #default="{ row }">
+                  <el-button type="text" size="small" @click="updateStatus(row)" :disabled="updateDis(row)">
+                    修改状态
+                  </el-button>
+                  <el-button type="text" size="small" @click="submitMaterial(row)" :disabled="updateDis(row)">
+                    提交素材
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
+      </FormMessage>
+    </div>
+    <!-- 底部按钮 -->
+    <div class="bottom-actions" v-if="title !== '新增' && listQuery.id">
+      <el-button type="primary" size="small" @click="handleStartJudgment" :disabled="statusDis('开始研判')">开始研判</el-button>
+      <el-button type="primary" size="small" @click="handleEndJudgment" :disabled="statusDis('结束研判')">结束研判</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import FormMessage from '@/components/FormMessage/index.vue'
+import UploadFile from '@/components/UploadFile/index.vue'
+import {
+  sjzlGetEntityById,
+  sjzlCreateEntity,
+  sjzlUpdateEntity,
+  sjzlSendNotice,
+  sjzlConfirmJudgment
+} from '@/api/yj.js'
+import { startJudgment, endJudgment } from '@/api/tacticalApi.js'
+
+const props = defineProps({
+  dict: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const dialogForm = ref(false)
+const title = ref('新增')
+const loading = ref(false)
+const elform = ref()
+
+const listQuery = ref({})
+const tableList = ref([])
+
+// 表单配置
+const formData = computed(() => [
+  {
+    label: '研判议题',
+    prop: 'ypyt',
+    type: 'input',
+    placeholder: '请输入研判议题',
+    required: true
+  },
+  {
+    label: '研判要求',
+    prop: 'ypyq',
+    type: 'textarea',
+    placeholder: '请输入研判要求',
+    required: true
+  },
+  {
+    label: '研判方式',
+    prop: 'ypfs',
+    type: 'select',
+    placeholder: '请选择研判方式',
+    options: props.dict.D_BZ_YPFS || [],
+    required: true
+  },
+  {
+    label: '研判时间',
+    prop: 'ypsj',
+    type: 'datetime',
+    placeholder: '请选择研判时间',
+    required: true
+  },
+  {
+    label: '报告类型',
+    prop: 'bglx',
+    type: 'radio',
+    placeholder: '请选择报告类型',
+    options: props.dict.D_BZ_YPLX || [],
+    required: true,
+    defaultValue: '02'
+  },
+  {
+    label: '部门列表',
+    prop: 'bmList',
+    type: 'slot',
+    slotName: 'bmList'
+  }
+])
+
+// 验证规则
+const rules = {
+  ypyt: [{ required: true, message: '请输入研判议题', trigger: 'blur' }],
+  ypyq: [{ required: true, message: '请输入研判要求', trigger: 'blur' }],
+  ypfs: [{ required: true, message: '请选择研判方式', trigger: 'change' }],
+  ypsj: [{ required: true, message: '请选择研判时间', trigger: 'change' }],
+  bglx: [{ required: true, message: '请选择报告类型', trigger: 'change' }]
+}
+
+const isShiQingBaoZhongXin = computed(() => {
+  // 这里根据实际情况判断是否是市情报指挥中心
+  return true
+})
+
+// 初始化方法
+const init = async (type, row, reportType) => {
+  title.value = type === 'add' ? '新增' : type === 'edit' ? '编辑' : '详情'
+  dialogForm.value = true
+  
+  if (type === 'add') {
+    listQuery.value = {
+      bglx: reportType,
+      wjlx: reportType
+    }
+    tableList.value = []
+  } else if (row && row.id) {
+    try {
+      const res = await sjzlGetEntityById({ id: row.id })
+      listQuery.value = res
+      tableList.value = res.ypbmList || []
+    } catch (error) {
+      ElMessage.error('获取详情失败')
+    }
+  }
+}
+
+// 提交方法
+const submit = async () => {
+  if (!elform.value) return
+  
+  try {
+    await elform.value.validate()
+    loading.value = true
+    
+    const data = {
+      ...listQuery.value,
+      ypbmList: tableList.value
+    }
+    
+    if (title.value === '新增') {
+      await sjzlCreateEntity(data)
+      ElMessage.success('新增成功')
+    } else {
+      await sjzlUpdateEntity(data)
+      ElMessage.success('修改成功')
+    }
+    
+    emit('getList')
+    close()
+  } catch (error) {
+    console.error('提交失败:', error)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 关闭方法
+const close = () => {
+  dialogForm.value = false
+  listQuery.value = {}
+  tableList.value = []
+}
+
+// 修改状态
+const updateStatus = (row) => {
+  ElMessageBox.prompt('请输入状态', '修改状态', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消'
+  }).then(({ value }) => {
+    row.wcqk = value
+    ElMessage.success('修改成功')
+  })
+}
+
+// 提交素材
+const submitMaterial = (row) => {
+  ElMessage.success('提交成功')
+}
+
+// 判断按钮是否禁用
+const statusDis = (action) => {
+  if (!listQuery.value.zt) return true
+  if (action === '开始研判') {
+    return listQuery.value.zt !== '01'
+  } else if (action === '结束研判') {
+    return listQuery.value.zt !== '02'
+  }
+  return false
+}
+
+const updateDis = (row) => {
+  return !isShiQingBaoZhongXin.value || row.wcqk === '02'
+}
+
+// 开始研判
+const handleStartJudgment = async () => {
+  try {
+    await ElMessageBox.confirm('确定要开始研判吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+    
+    await startJudgment(listQuery.value.id)
+    ElMessage.success('开始研判成功')
+    emit('getList')
+    close()
+  } catch (error) {
+    if (error !== 'cancel') {
+      ElMessage.error('开始研判失败')
+    }
+  }
+}
+
+// 结束研判
+const handleEndJudgment = async () => {
+  try {
+    await ElMessageBox.confirm('确定要结束研判吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+    
+    await endJudgment(listQuery.value.id)
+    ElMessage.success('结束研判成功')
+    emit('getList')
+    close()
+  } catch (error) {
+    if (error !== 'cancel') {
+      ElMessage.error('结束研判失败')
+    }
+  }
+}
+
+const emit = defineEmits(['getList'])
+
+defineExpose({
+  init
+})
+</script>
+
+<style lang="scss" scoped>
+.dialog {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+
+  .head_box {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20px;
+    background: #fff;
+    border-bottom: 1px solid #ebeef5;
+
+    .title {
+      font-size: 16px;
+      font-weight: 600;
+    }
+  }
+
+  .form_cnt {
+    background: #fff;
+    padding: 20px;
+    max-height: 70vh;
+    overflow-y: auto;
+  }
+
+  .bottom-actions {
+    background: #fff;
+    padding: 20px;
+    border-top: 1px solid #ebeef5;
+    text-align: center;
+  }
+}
+
+.table-box {
+  margin-top: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue b/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue
new file mode 100644
index 0000000..69dfdb6
--- /dev/null
+++ b/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue
@@ -0,0 +1,200 @@
+<template>
+  <div>
+    <div class="titleBox">
+      <PageTitle title="研判指令">
+        <el-button type="primary" @click="getDataById('add', '')">
+          <el-icon style="vertical-align: middle">
+            <CirclePlus />
+          </el-icon>
+          <span style="vertical-align: middle">新增</span>
+        </el-button>
+
+      </PageTitle>
+    </div>
+    <!-- 搜索 -->
+    <div ref="searchBox">
+      <Search :searchArr="searchConfiger" @submit="onSearch" :key="pageData.keyCount" />
+    </div>
+    <!-- 表格 -->
+    <div class="tabBox">
+      <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
+        :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth">
+        <template #bglx="{ row }">
+          <DictTag :tag="false" :value="row.bglx" :options="D_BZ_YPLX" />
+        </template>
+        <template #ypfs="{ row }">
+          <DictTag :tag="false" :value="row.ypfs" :options="D_BZ_YPFS" />
+        </template>
+        <!-- 操作 -->
+        <template #controls="{ row }">
+          <el-link size="small" type="primary" @click="getDataById('edit', row)">修改</el-link>
+          <el-link size="small" type="primary" @click="getDataById('detail', row)">详情</el-link>
+          <el-link size="small" type="danger" @click="deleteFile(row)">删除</el-link>
+        </template>
+      </MyTable>
+      <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
+        ...pageData.pageConfiger,
+        total: pageData.total
+      }"></Pages>
+    </div>
+  </div>
+  <AddForm ref="addForm" @getList="getList" :dict="{ D_BZ_YPFS, D_BZ_YPLX }" />
+</template>
+
+<script setup>
+import PageTitle from "@/components/aboutTable/PageTitle.vue";
+import MyTable from "@/components/aboutTable/MyTable.vue";
+import Pages from "@/components/aboutTable/Pages.vue";
+import Search from "@/components/aboutTable/Search.vue";
+import { useRoute } from 'vue-router'
+import { sjzlGetPageList, sjzldeleteEntity } from "@/api/yj.js";
+import { reactive, ref, onMounted, getCurrentInstance, watch,computed } from "vue";
+import AddForm from "./addForm.vue";
+const { proxy } = getCurrentInstance();
+const { D_BZ_YPFS, D_BZ_YPLX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX")
+const detailDiloag = ref();
+const searchBox = ref(); //搜索框
+onMounted(() => {
+  tabHeightFn()
+  if (route.query.id) {
+    detailDiloag.value.init('edit', {
+      id: route.query.id
+    });
+    return
+  }
+  getList()
+});
+/** 是否市情报指挥中心 */
+const isShiQingBaoZhongXin = computed(() => {
+  const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
+  return deptBizType == '23' && Jb == '01'
+})
+
+const searchConfiger = ref([
+  { label: "研判议题", prop: 'ypyt', placeholder: "请输入研判议题", showType: "input" },
+  // { label: "研判方式", prop: 'ypfs', placeholder: "请输入研判方式", showType: "radio",options:D_BZ_YPFS },
+]);
+
+const pageData = reactive({
+  tableData: [],
+  keyCount: 0,
+  tableConfiger: {
+    rowHieght: 61,
+    showSelectType: "checkBox",
+    loading: false
+  },
+  total: 0,
+  pageConfiger: {
+    pageSize: 20,
+    pageCurrent: 1
+  },
+  controlsWidth: 240,
+  tableColumn: [
+    { label: "研判议题", prop: "ypyt" },
+    { label: "研判方式", prop: "ypfs", showSolt: true },
+    { label: "报告类型", prop: "bglx", showSolt: true },
+    { label: "研判时间", prop: "ypsj" },
+    { label: "研判要求", prop: "ypyq" },
+    { label: "发起部门", prop: "ssbm" },
+  ]
+});
+const queryFrom = ref({});
+
+// 搜索
+const onSearch = (val) => {
+  const promes = {
+    ...val,
+    ...pageData.pageConfiger,
+  }
+  queryFrom.value = { ...promes }
+  pageData.pageConfiger.pageCurrent = 1;
+  getList()
+}
+
+const changeNo = (val) => {
+  pageData.pageConfiger.pageCurrent = val;
+  getList()
+}
+const changeSize = (val) => {
+  pageData.pageConfiger.pageSize = val;
+  getList()
+}
+
+// 获取列表
+const getList = () => {
+  pageData.tableConfiger.loading = true;
+  let data = { ...pageData.pageConfiger, ...queryFrom.value, wjlb: '01' };
+  sjzlGetPageList(data).then(res => {
+    pageData.tableData = res.records || [];
+    pageData.total = res.total;
+    pageData.tableConfiger.loading = false;
+  }).catch(() => { pageData.tableConfiger.loading = false; })
+}
+
+
+// 表格高度计算
+const tabHeightFn = () => {
+  pageData.tableHeight = window.innerHeight - searchBox.value.offsetHeight - 250;
+  window.onresize = function () {
+    tabHeightFn();
+  };
+};
+const route = useRoute()
+
+const addForm = ref(null)
+const getDataById = (type, row) => {
+  addForm.value.init(type, row, '01');
+}
+
+const deleteFile = (row) => {
+  proxy.$confirm('确定删除选中数据吗？', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    sjzldeleteEntity({ ids: [row.id] }).then(res => {
+      proxy.$message.success('删除成功');
+      getList();
+    }).catch(() => {
+      proxy.$message.error('删除失败');
+    });
+  }).catch(() => {
+    proxy.$message.info('已取消删除');
+  });
+}
+</script>
+
+<style lang="scss" scoped>
+.label-pop {
+  position: relative;
+
+  &::before {
+    position: absolute;
+    content: '*';
+    top: 0;
+    left: -7px;
+    color: red;
+  }
+}
+</style>
+
+<style>
+.el-loading-mask {
+  background: rgba(0, 0, 0, 0.5) !important;
+}
+
+:v-deep .el-dialog {
+  width: 90% !important;
+}
+
+.zdy-model-dialogs {
+  /* background-color: rgb(50, 148, 214); */
+  background: url("~@/assets/images/bg46.png") no-repeat center center;
+  background-size: 100% 100%;
+  padding: 8px 10px;
+  box-sizing: border-box;
+  pointer-events: auto !important;
+  height: calc(100% - 50px);
+  overflow: auto;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/backOfficeSystem/JudgmentHome/strategicResearch/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/addForm.vue
index 38571e0..1e9a0ab 100644
--- a/src/views/backOfficeSystem/JudgmentHome/strategicResearch/addForm.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/strategicResearch/addForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">数据整理{{ title }} </span>
+      <span class="title">战略研判{{ title }} </span>
       <div>
         <el-button type="primary" size="small" v-if="title != '详情'" :loading="loading" @click="submit">保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
@@ -186,7 +186,7 @@ watch(() => listQuery.value.jsdxBmDm, (val) => {
     const isAddForm = !listQuery.value.id
     return {
       // id: null,
-      // sjzlid: null, // 研判数据整理ID
+      // sjzlid: null, // 研判战略研判ID
       /** 部门代码 */
       ypbmdm: item,
       ypbmmc: listQuery.value.jsdxBmMc[i],
@@ -232,7 +232,7 @@ const getXfbmList = () => {
     const curr = cyypList.find(item => item.ypbmdm == item.ypbmdm) || {}
     return {
       id: curr.id || null,
-      sjzlid: curr.sjzlid || null, // 研判数据整理ID
+      sjzlid: curr.sjzlid || null, // 研判战略研判ID
       ypbmdm: item.ypbmdm,
       ypbmmc: listQuery.value.jsdxBmMc[i],
       /** 素材要求 */
diff --git a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue
index 38571e0..e34b2e6 100644
--- a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="dialog" v-if="dialogForm">
     <div class="head_box">
-      <span class="title">数据整理{{ title }} </span>
+      <span class="title">战术研判{{ title }} </span>
       <div>
         <el-button type="primary" size="small" v-if="title != '详情'" :loading="loading" @click="submit">保存</el-button>
         <el-button size="small" @click="close">关闭</el-button>
@@ -186,7 +186,7 @@ watch(() => listQuery.value.jsdxBmDm, (val) => {
     const isAddForm = !listQuery.value.id
     return {
       // id: null,
-      // sjzlid: null, // 研判数据整理ID
+      // sjzlid: null, // 研判战术研判ID
       /** 部门代码 */
       ypbmdm: item,
       ypbmmc: listQuery.value.jsdxBmMc[i],
@@ -232,7 +232,7 @@ const getXfbmList = () => {
     const curr = cyypList.find(item => item.ypbmdm == item.ypbmdm) || {}
     return {
       id: curr.id || null,
-      sjzlid: curr.sjzlid || null, // 研判数据整理ID
+      sjzlid: curr.sjzlid || null, // 研判战术研判ID
       ypbmdm: item.ypbmdm,
       ypbmmc: listQuery.value.jsdxBmMc[i],
       /** 素材要求 */

From 22a838124773ddffcde14d0b974afb1d5764d677 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 20:08:10 +0800
Subject: [PATCH 12/13] =?UTF-8?q?feat:=20=E5=85=88=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=A0=94=E5=88=A4=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/huiShangyp/judgmentCommand.js         | 54 +++++++++++++
 .../JudgmentHome/judgmentCommand/addForm.vue  | 75 ++++---------------
 .../JudgmentHome/judgmentCommand/index.vue    | 12 +--
 3 files changed, 71 insertions(+), 70 deletions(-)
 create mode 100644 src/api/huiShangyp/judgmentCommand.js

diff --git a/src/api/huiShangyp/judgmentCommand.js b/src/api/huiShangyp/judgmentCommand.js
new file mode 100644
index 0000000..d4b632e
--- /dev/null
+++ b/src/api/huiShangyp/judgmentCommand.js
@@ -0,0 +1,54 @@
+import request from "@/utils/request";
+const api = "/mosty-api/mosty-gsxt";
+
+
+//  =================== 指令 ====================
+/**
+ * 研判指令列表
+ * @param {Object} params 查询参数
+ * @param {number} [params.pageSize] 每页显示数量
+ * @param {number} [params.pageCurrent] 页码
+ * @param {string} [params.zlbt] 指令标题
+ * @param {string} [params.zlnr] 指令内容
+ * @param {string} [params.fqrxm] 发起人姓名
+ * @returns {Promise} 请求Promise对象
+ */
+export const getJudgmentCommandList = (params) => {
+  return request({
+    url: api + `/ypbg/zlxx/getPageList`,
+    method: "get",
+    params
+  })
+}
+
+/**
+ * 指令签收
+ * @param {Object} data 签收数据
+ * @param {string|number} data.zlid 指令ID（签收必传）
+ * @param {string} [data.bglx] 报告类型：01 战术报告 02 战略报告
+ * @param {string} [data.ypid] 研判业务ID(研判报告ID)
+ * @returns {Promise} 请求Promise对象
+ */
+export const signCommand = (data) => {
+  return request({
+    url: api + `/ypbg/zlxx/zlqs`,
+    method: "post",
+    data
+  })
+}
+
+/**
+ * 指令反馈
+ * @param {Object} data 反馈数据
+ * @param {string|number} data.zlid 指令ID（反馈必传）
+ * @param {string} data.bglx 报告类型：01 战术报告 02 战略报告（反馈必传）
+ * @param {string} data.ypid 研判业务ID(研判报告ID)（反馈必传）
+ * @returns {Promise} 请求Promise对象
+ */
+export const feedbackCommand = (data) => {
+  return request({
+    url: api + `/ypbg/zlxx/zlfk`,
+    method: "post",
+    data
+  })
+}
diff --git a/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/addForm.vue
index 8a0bdfe..10fa57f 100644
--- a/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/addForm.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/addForm.vue
@@ -46,19 +46,15 @@
         </template>
       </FormMessage>
     </div>
-    <!-- 底部按钮 -->
-    <div class="bottom-actions" v-if="title !== '新增' && listQuery.id">
-      <el-button type="primary" size="small" @click="handleStartJudgment" :disabled="statusDis('开始研判')">开始研判</el-button>
-      <el-button type="primary" size="small" @click="handleEndJudgment" :disabled="statusDis('结束研判')">结束研判</el-button>
-    </div>
+
   </div>
 </template>
 
 <script setup>
 import { ref, reactive, computed, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import FormMessage from '@/components/FormMessage/index.vue'
-import UploadFile from '@/components/UploadFile/index.vue'
+import FormMessage from '@/components/aboutTable/FormMessage.vue'
+import UploadFile from "@/components/MyComponents/Upload/index.vue";
 import {
   sjzlGetEntityById,
   sjzlCreateEntity,
@@ -66,7 +62,9 @@ import {
   sjzlSendNotice,
   sjzlConfirmJudgment
 } from '@/api/yj.js'
-import { startJudgment, endJudgment } from '@/api/tacticalApi.js'
+//
+import { getJudgmentCommandList, signCommand, feedbackCommand } from "@/api/huiShangyp/judgmentCommand.js";
+
 
 const props = defineProps({
   dict: {
@@ -149,7 +147,7 @@ const isShiQingBaoZhongXin = computed(() => {
 const init = async (type, row, reportType) => {
   title.value = type === 'add' ? '新增' : type === 'edit' ? '编辑' : '详情'
   dialogForm.value = true
-  
+
   if (type === 'add') {
     listQuery.value = {
       bglx: reportType,
@@ -170,16 +168,16 @@ const init = async (type, row, reportType) => {
 // 提交方法
 const submit = async () => {
   if (!elform.value) return
-  
+
   try {
     await elform.value.validate()
     loading.value = true
-    
+
     const data = {
       ...listQuery.value,
       ypbmList: tableList.value
     }
-    
+
     if (title.value === '新增') {
       await sjzlCreateEntity(data)
       ElMessage.success('新增成功')
@@ -187,7 +185,7 @@ const submit = async () => {
       await sjzlUpdateEntity(data)
       ElMessage.success('修改成功')
     }
-    
+
     emit('getList')
     close()
   } catch (error) {
@@ -220,60 +218,13 @@ const submitMaterial = (row) => {
   ElMessage.success('提交成功')
 }
 
-// 判断按钮是否禁用
-const statusDis = (action) => {
-  if (!listQuery.value.zt) return true
-  if (action === '开始研判') {
-    return listQuery.value.zt !== '01'
-  } else if (action === '结束研判') {
-    return listQuery.value.zt !== '02'
-  }
-  return false
-}
+
 
 const updateDis = (row) => {
   return !isShiQingBaoZhongXin.value || row.wcqk === '02'
 }
 
-// 开始研判
-const handleStartJudgment = async () => {
-  try {
-    await ElMessageBox.confirm('确定要开始研判吗？', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    })
-    
-    await startJudgment(listQuery.value.id)
-    ElMessage.success('开始研判成功')
-    emit('getList')
-    close()
-  } catch (error) {
-    if (error !== 'cancel') {
-      ElMessage.error('开始研判失败')
-    }
-  }
-}
 
-// 结束研判
-const handleEndJudgment = async () => {
-  try {
-    await ElMessageBox.confirm('确定要结束研判吗？', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    })
-    
-    await endJudgment(listQuery.value.id)
-    ElMessage.success('结束研判成功')
-    emit('getList')
-    close()
-  } catch (error) {
-    if (error !== 'cancel') {
-      ElMessage.error('结束研判失败')
-    }
-  }
-}
 
 const emit = defineEmits(['getList'])
 
@@ -327,4 +278,4 @@ defineExpose({
 .table-box {
   margin-top: 10px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue b/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue
index 69dfdb6..034beb1 100644
--- a/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/judgmentCommand/index.vue
@@ -47,7 +47,7 @@ import MyTable from "@/components/aboutTable/MyTable.vue";
 import Pages from "@/components/aboutTable/Pages.vue";
 import Search from "@/components/aboutTable/Search.vue";
 import { useRoute } from 'vue-router'
-import { sjzlGetPageList, sjzldeleteEntity } from "@/api/yj.js";
+import { getJudgmentCommandList, signCommand, feedbackCommand } from "@/api/huiShangyp/judgmentCommand.js";
 import { reactive, ref, onMounted, getCurrentInstance, watch,computed } from "vue";
 import AddForm from "./addForm.vue";
 const { proxy } = getCurrentInstance();
@@ -64,11 +64,7 @@ onMounted(() => {
   }
   getList()
 });
-/** 是否市情报指挥中心 */
-const isShiQingBaoZhongXin = computed(() => {
-  const Jb = deptLevel[0] == '2' ? '01' : deptLevel[0] == '3' ? '02' : '03'
-  return deptBizType == '23' && Jb == '01'
-})
+
 
 const searchConfiger = ref([
   { label: "研判议题", prop: 'ypyt', placeholder: "请输入研判议题", showType: "input" },
@@ -124,7 +120,7 @@ const changeSize = (val) => {
 const getList = () => {
   pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...queryFrom.value, wjlb: '01' };
-  sjzlGetPageList(data).then(res => {
+  getJudgmentCommandList(data).then(res => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
     pageData.tableConfiger.loading = false;
@@ -197,4 +193,4 @@ const deleteFile = (row) => {
   height: calc(100% - 50px);
   overflow: auto;
 }
-</style>
\ No newline at end of file
+</style>

From 59bd75270a06b79efc93272b2ee3b27582606a45 Mon Sep 17 00:00:00 2001
From: huangchengfa <171504222@qq.com>
Date: Wed, 10 Dec 2025 20:33:33 +0800
Subject: [PATCH 13/13] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3=E8=BF=99?=
 =?UTF-8?q?=E9=87=8C=E6=8A=A5=E9=94=99=E5=8D=A1=E4=BD=8F=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Communications/personnel.vue     | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/personnel.vue b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/personnel.vue
index c118b00..db58218 100644
--- a/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/personnel.vue
+++ b/src/views/backOfficeSystem/JudgmentHome/MeetingRoom/components/Communications/personnel.vue
@@ -42,13 +42,16 @@ const handleClick = (tab) => {
   console.log(tab)
 }
 onMounted(() => {
-  lemon.basedata.fetchSystemOrg({
-    flat: true,
-    key_word: ""
-  }).then(res => {
-    console.log(res);
-
-  })
+  try {
+    lemon?.basedata?.fetchSystemOrg({
+      flat: true,
+      key_word: ""
+    }).then(res => {
+      console.log(res);
+    })
+  } catch (error) {
+    console.log('error: ', error);
+  }
 })
 
 const getJgList = () => {