feat: 更新一次选择研判报告

src/api/huiShangyp/strategicApi.js

@@ -1,12 +1,28 @@
 import request from "@/utils/request";
 const api = "/mosty-api/mosty-gsxt";
 
-// 战略研判-分页查询
+/**
-export const strategicGet = (data, url) => {
+ * 战术研判-分页查询
+ * @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: url + `/ypbg/sjzl/getPageYpList`,
+    url: api + `/ypbg/sjzl/getPageYpList`,
-    method: "post",
+    method: "get",
-    data
+    params
   })
 }
 

src/views/backOfficeSystem/JudgmentHome/judgmentCommand/components/FeedbackDialog.vue

@@ -0,0 +1,148 @@
+<template>
+  <el-dialog v-model="visible" title="指令反馈" width="50%" :before-close="handleClose">
+    <div class="feedback-form">
+      <!-- 报告类型下拉框 -->
+      <div class="form-item">
+        <label class="form-label">报告类型：</label>
+        <el-select v-model="formData.bglx" placeholder="请选择报告类型" style="width: 100%">
+          <el-option label="战术报告" value="01" />
+          <el-option label="战略报告" value="02" />
+        </el-select>
+      </div>
+
+      <!-- 研判报告选择 -->
+      <div class="form-item">
+        <label class="form-label">研判报告：</label>
+        <ReportSelectInput
+          v-model="formData.ypmc"
+          :bglx="formData.bglx"
+          @change="handleReportChange"
+        />
+      </div>
+    </div>
+
+    <template #footer>
+      <el-button @click="handleClose">关闭</el-button>
+      <el-button type="primary" @click="handleSave" :loading="loading">保存</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import ReportSelectInput from './ReportSelectInput.vue'
+import { feedbackCommand } from '@/api/huiShangyp/judgmentCommand'
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  currentRow: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const emit = defineEmits(['update:modelValue', 'success'])
+
+const visible = ref(false)
+const loading = ref(false)
+
+// 表单数据
+const formData = reactive({
+  bglx: '01', // 默认战术报告
+  ypmc: '', // 研判报告名称
+  ypid: '' // 研判报告ID
+})
+
+// 选中的报告数据
+const selectedReport = ref(null)
+
+// 监听弹框显示状态
+watch(() => props.modelValue, (newVal) => {
+  visible.value = newVal
+  if (newVal && props.currentRow?.id) {
+    // 重置表单
+    formData.bglx = '01'
+    formData.ypmc = ''
+    formData.ypid = ''
+    selectedReport.value = null
+  }
+})
+
+// 监听弹框关闭状态
+watch(visible, (newVal) => {
+  emit('update:modelValue', newVal)
+})
+
+// 报告选择变化处理
+const handleReportChange = (report) => {
+  selectedReport.value = report
+  if (report && report.id) {
+    formData.ypid = report.id
+  } else {
+    formData.ypid = ''
+  }
+}
+
+// 关闭弹框
+const handleClose = () => {
+  visible.value = false
+  // 重置表单
+  formData.bglx = '01'
+  formData.ypmc = ''
+  formData.ypid = ''
+  selectedReport.value = null
+}
+
+// 保存反馈
+const handleSave = async () => {
+  if (!props.currentRow?.id) {
+    ElMessage.error('请先选择要反馈的指令')
+    return
+  }
+
+  if (!formData.ypid) {
+    ElMessage.error('请选择研判报告')
+    return
+  }
+
+  try {
+    loading.value = true
+
+    const params = {
+      zlid: props.currentRow.id,
+      bglx: formData.bglx,
+      ypid: formData.ypid
+    }
+
+    await feedbackCommand(params)
+
+    ElMessage.success('反馈成功')
+    emit('ok')
+    handleClose()
+  } catch (error) {
+    console.error('反馈失败:', error)
+    ElMessage.error('反馈失败，请重试')
+  } finally {
+    loading.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.feedback-form {
+  .form-item {
+    margin-bottom: 24px;
+
+    .form-label {
+      display: block;
+      margin-bottom: 8px;
+      font-weight: 500;
+      color: #303133;
+    }
+  }
+}
+</style>

src/views/backOfficeSystem/JudgmentHome/judgmentCommand/components/ReportSelectInput.vue

@@ -0,0 +1,158 @@
+<template>
+  <div class="report-select-input">
+    <el-input
+      v-model="inputValue"
+      placeholder="请选择研判报告"
+      readonly
+      @click="showDialog = true"
+    >
+      <template #suffix>
+        <el-icon class="cursor-pointer" @click="showDialog = true">
+          <ArrowDown />
+        </el-icon>
+      </template>
+    </el-input>
+    
+    <!-- 选择报告弹框 -->
+    <el-dialog v-model="showDialog" title="选择研判报告" width="80%">
+      <div class="dialog-content">
+        <!-- 顶部筛选区域 -->
+        <div class="filter-section">
+          <el-radio-group v-model="reportType" @change="onTypeChange">
+            <el-radio label="01">战术报告</el-radio>
+            <el-radio label="02">战略报告</el-radio>
+          </el-radio-group>
+          <el-button type="primary" @click="handleQuery" :loading="loading">查询</el-button>
+        </div>
+
+        <!-- 表格区域 -->
+        <div class="table-section">
+          <ReportSelectTable
+            :tableData="tableData"
+            :loading="loading"
+            :selectedId="selectedId"
+            @select="handleSelect"
+          />
+        </div>
+      </div>
+      
+      <template #footer>
+        <el-button @click="showDialog = false">关闭</el-button>
+        <el-button type="primary" @click="handleConfirm">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+import { ArrowDown } from '@element-plus/icons-vue'
+import ReportSelectTable from './ReportSelectTable.vue'
+import { tacticalGet } from '@/api/huiShangyp/tacticalApi.js'
+
+const props = defineProps({
+  modelValue: {
+    type: [String, Number],
+    default: ''
+  },
+  bglx: {
+    type: String,
+    default: '01'
+  }
+})
+
+const emit = defineEmits(['update:modelValue', 'change'])
+
+const inputValue = ref('')
+const showDialog = ref(false)
+const reportType = ref('01')
+const loading = ref(false)
+const tableData = ref([])
+const selectedId = ref('')
+const selectedReport = ref(null)
+
+// 监听外部传入的值
+watch(() => props.modelValue, (newVal) => {
+  inputValue.value = newVal || ''
+})
+
+// 监听报告类型变化
+watch(() => props.bglx, (newVal) => {
+  reportType.value = newVal || '01'
+})
+
+// 监听报告类型变化，自动查询
+watch(reportType, () => {
+  handleQuery()
+})
+
+// 报告类型变化处理
+const onTypeChange = () => {
+  selectedId.value = ''
+  selectedReport.value = null
+}
+
+// 查询报告列表
+const handleQuery = async () => {
+  try {
+    loading.value = true
+    const params = {
+      bglx: reportType.value,
+      pageSize: 20,
+      pageCurrent: 1
+    }
+    
+    const res = await tacticalGet(params)
+    tableData.value = res.records || []
+  } catch (error) {
+    console.error('查询报告列表失败:', error)
+    tableData.value = []
+  } finally {
+    loading.value = false
+  }
+}
+
+// 选择报告
+const handleSelect = (row) => {
+  selectedId.value = row.id
+  selectedReport.value = row
+}
+
+// 确定选择
+const handleConfirm = () => {
+  if (!selectedReport.value) {
+    return
+  }
+  
+  inputValue.value = selectedReport.value.ypyt || selectedReport.value.zlbt || ''
+  emit('update:modelValue', inputValue.value)
+  emit('change', selectedReport.value)
+  showDialog.value = false
+}
+
+// 初始化时加载默认数据
+handleQuery()
+</script>
+
+<style lang="scss" scoped>
+.report-select-input {
+  .cursor-pointer {
+    cursor: pointer;
+  }
+}
+
+.filter-section {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+  margin-bottom: 20px;
+  padding: 16px;
+  background: #f5f7fa;
+  border-radius: 4px;
+}
+
+.table-section {
+  max-height: 400px;
+  overflow-y: auto;
+}
+</style>

src/views/backOfficeSystem/JudgmentHome/judgmentCommand/components/ReportSelectTable.vue

@@ -0,0 +1,90 @@
+<template>
+  <div class="report-select-table">
+    <el-table :data="tableData" :loading="loading" height="600px"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" :reserve-selection="false" />
+      <el-table-column label="研判议题" prop="ypyt" />
+      <el-table-column label="研判要求" prop="ypyq" />
+      <el-table-column label="研判时间" prop="ypsj" />
+      <el-table-column label="发起部门" prop="ssbm" />
+    </el-table>
+  </div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+
+const props = defineProps({
+  tableData: {
+    type: Array,
+    default: () => []
+  },
+  loading: {
+    type: Boolean,
+    default: false
+  },
+  selectedId: {
+    type: [String, Number],
+    default: ''
+  }
+})
+
+const emit = defineEmits(['select'])
+
+const selectedRows = ref([])
+
+// 监听选中ID变化，用于回显
+watch(() => props.selectedId, (newId) => {
+  if (newId && props.tableData.length > 0) {
+    // 清空当前选择
+    selectedRows.value = []
+
+    // 找到对应的行并选中
+    const targetRow = props.tableData.find(row => row.id === newId)
+    if (targetRow) {
+      selectedRows.value = [targetRow]
+    }
+  }
+}, { immediate: true })
+
+// 监听表格数据变化，回显选中状态
+watch(() => props.tableData, () => {
+  if (props.selectedId) {
+    const targetRow = props.tableData.find(row => row.id === props.selectedId)
+    if (targetRow) {
+      selectedRows.value = [targetRow]
+    }
+  }
+}, { immediate: true })
+
+// 选择变化处理
+const handleSelectionChange = (selection) => {
+  // 由于是单选，只取第一个
+  if (selection.length > 0) {
+    // 清空之前的选择
+    selectedRows.value = []
+    // 设置新的选择
+    setTimeout(() => {
+      selectedRows.value = [selection[selection.length - 1]]
+      emit('select', selection[selection.length - 1])
+    }, 0)
+  } else {
+    selectedRows.value = []
+    emit('select', null)
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.report-select-table {
+
+  // 表格样式
+  :deep(.el-table) {
+    border: 1px solid #ebeef5;
+  }
+
+  :deep(.el-table__header-wrapper) {
+    background: #f5f7fa;
+  }
+}
+</style>

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

@@ -31,6 +31,7 @@
           <el-link size="small" type="primary" @click="getDataById('detail', row)">详情</el-link>
           <el-link size="small" type="danger" @click="deleteFile(row)">删除</el-link>
           <el-link size="small" type="success" @click="sign(row)">签收</el-link>
+          <el-link size="small" type="warning" @click="feedback(row)">反馈</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -40,6 +41,11 @@
     </div>
   </div>
   <AddForm ref="addForm" @getList="getList" :dict="{ D_BZ_YPFS, D_BZ_YPLX }" />
+  <FeedbackDialog
+    v-model="feedbackDialog"
+    :currentRow="currentFeedbackRow"
+    @ok="handleFeedbackSuccess"
+  />
 </template>
 
 <script setup>
@@ -51,6 +57,7 @@ import { useRoute } from 'vue-router'
 import { getJudgmentCommandList, deleteJudgmentCommand, signCommand,feedbackCommand } from "@/api/huiShangyp/judgmentCommand.js";
 import { reactive, ref, onMounted, getCurrentInstance, watch, computed } from "vue";
 import AddForm from "./addForm.vue";
+import FeedbackDialog from "./components/FeedbackDialog.vue";
 const { proxy } = getCurrentInstance();
 const { D_BZ_YPFS, D_BZ_YPLX } = proxy.$dict("D_BZ_YPFS", "D_BZ_YPLX")
 const detailDiloag = ref();
@@ -136,6 +143,8 @@ const tabHeightFn = () => {
 const route = useRoute()
 
 const addForm = ref(null)
+const feedbackDialog = ref(false)
+const currentFeedbackRow = ref({})
 const getDataById = (type, row) => {
   addForm.value.init(type, row, '01');
 }
@@ -172,6 +181,16 @@ const sign = (row) => {
     proxy.$message.info('已取消签收');
   });
 }
+
+const feedback = (row) => {
+  currentFeedbackRow.value = row;
+  feedbackDialog.value = true;
+}
+
+const handleFeedbackSuccess = () => {
+  // 反馈成功后刷新列表
+  getList();
+}
 </script>
 
 <style lang="scss" scoped>

src/views/backOfficeSystem/JudgmentHome/strategicResearch/addForm.vue

@@ -7,7 +7,7 @@
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div style="padding-bottom: 40px;" class="form_cnt">
+    <div style="padding-bottom: 0px;" class="form_cnt">
       <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
         <template #bmList>
           <div class="table-box">
@@ -15,12 +15,12 @@
               <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="请输入研判素材" />
+                  <el-input v-model="row.scyq" :disabled="true" 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"
+                  <UploadFile v-model="row.fj" :disabled="true" :limit="1" :isImg="false"
                     :isAll="true" />
                 </template>
               </el-table-column>
@@ -31,7 +31,7 @@
                   </el-tag>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="200" 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)">
                     修改状态
@@ -40,17 +40,17 @@
                     提交素材
                   </el-button>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
             </el-table>
           </div>
         </template>
       </FormMessage>
     </div>
     <!-- 底部按钮 -->
-    <div class="bottom-actions" v-if="title !== '新增' && listQuery.id">
+    <!-- <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>
 
   <!-- 修改状态弹框 -->
@@ -96,6 +96,7 @@ 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 { tacticalGet, strategicDelete } from "@/api/huiShangyp/strategicApi.js";
 import { getItem } from '@//utils/storage.js'
 
 const emit = defineEmits(["updateDate", "getList"]);

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

@@ -29,7 +29,7 @@
         <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> -->
+          <el-link size="small" type="danger" @click="deleteFile(row)">删除</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -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 { tacticalGet, strategicDelete } from "@/api/huiShangyp/strategicApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, watch,computed } from "vue";
 import AddForm from "./addForm.vue";
 const { proxy } = getCurrentInstance();
@@ -123,8 +123,9 @@ const changeSize = (val) => {
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
-  let data = { ...pageData.pageConfiger, ...queryFrom.value, wjlb: '01' };
+  // bglx 报告类型（01 战术研判 02 战略研判）
-  sjzlGetPageList(data).then(res => {
+  let data = { ...pageData.pageConfiger, ...queryFrom.value, bglx: '02' };
+  tacticalGet(data).then(res => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
     pageData.tableConfiger.loading = false;
@@ -152,7 +153,7 @@ const deleteFile = (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
-    sjzldeleteEntity({ ids: [row.id] }).then(res => {
+    strategicDelete({ ids: [row.id] }).then(res => {
       proxy.$message.success('删除成功');
       getList();
     }).catch(() => {

src/views/backOfficeSystem/JudgmentHome/tacticalResearch/addForm.vue

@@ -7,7 +7,7 @@
         <el-button size="small" @click="close">关闭</el-button>
       </div>
     </div>
-    <div style="padding-bottom: 40px;" class="form_cnt">
+    <div style="padding-bottom: 0px;" class="form_cnt">
       <FormMessage v-model="listQuery" :formList="formData" ref="elform" :rules="rules">
         <template #bmList>
           <div class="table-box">
@@ -15,12 +15,12 @@
               <el-table-column prop="ypbmmc" label="部门" width="150" align="center" />
               <el-table-column label="研判素材" width="380" align="center">
                 <template #default="{ row }">
-                  <el-input v-model="row.scyq" type="textarea" :rows="3" :disabled="!isShiQingBaoZhongXin" placeholder="请输入研判素材" />
+                  <el-input v-model="row.scyq" type="textarea" :rows="3" :disabled="true" 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"
+                  <UploadFile v-model="row.fj" :disabled="true" :limit="1" :isImg="false"
                     :isAll="true" />
                 </template>
               </el-table-column>
@@ -31,7 +31,7 @@
                   </el-tag>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="200" 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)">
                     修改状态
@@ -40,17 +40,17 @@
                     提交素材
                   </el-button>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
             </el-table>
           </div>
         </template>
       </FormMessage>
     </div>
     <!-- 底部按钮 -->
-    <div class="bottom-actions" v-if="title !== '新增' && listQuery.id">
+    <!-- <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>
 
   <!-- 修改状态弹框 -->

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

@@ -29,7 +29,7 @@
         <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> -->
+          <el-link size="small" type="danger" @click="deleteFile(row)">删除</el-link>
         </template>
       </MyTable>
       <Pages @changeNo="changeNo" @changeSize="changeSize" :tableHeight="pageData.tableHeight" :pageConfiger="{
@@ -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 { tacticalGet, strategicDelete } from "@/api/huiShangyp/tacticalApi.js";
 import { reactive, ref, onMounted, getCurrentInstance, watch, computed } from "vue";
 import AddForm from "./addForm.vue";
 const { proxy } = getCurrentInstance();
@@ -123,8 +123,9 @@ const changeSize = (val) => {
 // 获取列表
 const getList = () => {
   pageData.tableConfiger.loading = true;
-  let data = { ...pageData.pageConfiger, ...queryFrom.value, wjlb: '01' };
+   // bglx 报告类型（01 战术研判 02 战略研判）
-  sjzlGetPageList(data).then(res => {
+  let data = { ...pageData.pageConfiger, ...queryFrom.value, bglx: '01' };
+  tacticalGet(data).then(res => {
     pageData.tableData = res.records || [];
     pageData.total = res.total;
     pageData.tableConfiger.loading = false;
@@ -152,7 +153,7 @@ const deleteFile = (row) => {
     cancelButtonText: '取消',
     type: 'warning'
   }).then(() => {
-    sjzldeleteEntity({ ids: [row.id] }).then(res => {
+    strategicDelete({ ids: [row.id] }).then(res => {
       proxy.$message.success('删除成功');
       getList();
     }).catch(() => {