From 7e61b43e5c87d1bfff0020ad04388e3aa8126545 Mon Sep 17 00:00:00 2001 From: huangchengfa <171504222@qq.com> Date: Fri, 19 Dec 2025 10:33:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=88=98=E6=9C=AF=E7=A0=94=E5=88=A4-?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JudgmentHome/tacticalResearch/addForm.vue | 18 +- .../tacticalResearch/addReport.vue | 254 ++++++++++++++++++ .../JudgmentHome/tacticalResearch/index.vue | 21 +- 3 files changed, 277 insertions(+), 16 deletions(-) create mode 100644 src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addReport.vue diff --git a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue index bdbc122..7ffc8be 100644 --- a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue +++ b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue @@ -176,6 +176,8 @@ function updateDis(row) { const isFinish = row.wcqk === '02' return isShiQingBaoZhongXin.value || !iscjr || isFinish } + +/** 获取附件数组 */ function getFjArr(fj) { if (typeof fj !== 'string' || !fj) return [] let fjArr = [] @@ -231,7 +233,6 @@ const init = (type, row, wjlb) => { // 根据id查询详情 const getDataById = (id) => { sjzlGetInfo(id).then((res) => { - console.log('res: ', res); listQuery.value = res || {}; /** @type {Array} 参与研判部门数据数组 */ const cyypList = Array.isArray(res.cyypList) ? res.cyypList : [] @@ -252,9 +253,7 @@ function getFjString(arr) { const getXfbmList = () => { /** @type {Array} 参与研判部门数据数组 */ const cyypList = Array.isArray(listQuery.value.cyypList) ? listQuery.value.cyypList : [] - return tableList.value.map((item, i) => { - /** @type {JudgmentDept} 找原来的对象 */ const curr = cyypList.find(item => item.ypbmdm == item.ypbmdm) || {} return { @@ -278,13 +277,6 @@ const submit = () => { 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; @@ -384,7 +376,7 @@ const submitMaterialAction = async () => { closeMaterialDialog() if (outRow.value.id) { getDataById(outRow.value.id) } } catch (error) { - console.log(error) + } finally { materialLoading.value = false } @@ -410,7 +402,7 @@ const sendNotice = () => { proxy.$message({ type: "success", message: "下发通知成功" }); close(); } catch (error) { - console.log(error); + } finally { noticeLoading.value = false; } @@ -431,7 +423,7 @@ const confirmJudgment = () => { proxy.$message({ type: "success", message: "确认研判成功" }); close(); } catch (error) { - console.log(error); + } finally { confirmLoading.value = false; } diff --git a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addReport.vue b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addReport.vue new file mode 100644 index 0000000..ff541e4 --- /dev/null +++ b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addReport.vue @@ -0,0 +1,254 @@ + + + + + diff --git a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue index 9ad9f6f..8d30d8d 100644 --- a/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue +++ b/src/views/backOfficeSystem/JudgmentHome/tacticalResearch/index.vue @@ -29,6 +29,7 @@ @@ -39,6 +40,9 @@ + + +