feat: 预警模块重构

src/api/warning/business.ts

@@ -0,0 +1,79 @@
+import request from "@/api/request";
+
+// 预警业务 API
+
+/**
+ * 获取预警详情
+ */
+export function getWarningBusiness(reportId: string) {
+    return request.get({
+        url: `/warning/business/${reportId}`
+    });
+}
+
+/**
+ * 保存预警内容
+ */
+export function saveWarningBusiness(data: any) {
+    return request.post({
+        url: '/warning/business/save',
+        body: data
+    });
+}
+
+/**
+ * 提交给领导审批
+ */
+export function submitWarningBusiness(data: any) {
+    return request.post({
+        url: '/warning/business/submit',
+        body: data
+    });
+}
+
+/**
+ * 直接结束预警
+ */
+export function endWarningBusiness(data: any) {
+    return request.post({
+        url: '/warning/business/end',
+        body: data
+    });
+}
+
+/**
+ * 领导审批-通过（带问题数据分发）
+ */
+export function auditPassWarningDistribute(data: any) {
+    return request.post({
+        url: '/warning/business/audit/pass/distribute',
+        body: data
+    });
+}
+
+/**
+ * 领导审批-驳回
+ */
+export function auditRejectWarning(data: any) {
+    return request.post({
+        url: '/warning/business/audit/reject',
+        body: data
+    });
+}
+
+/**
+ * 获取预警审批记录
+ */
+export function getWarningFlowList(reportId: string) {
+    return request.get({
+        url: `/warning/business/flow/${reportId}`
+    });
+}
+
+
+export const getCompilePage=(body)=>{
+    return request.post({
+        url:`/warning/business/compile/page`,
+        body
+    })
+}

src/components/reportAudit/finishDistrbute.vue

@@ -1,13 +1,14 @@
 <script setup>
 
 import {auditReport,auditWarning} from "@/api/report/flow";
+import {auditPassWarningDistribute} from "@/api/warning/business";
 import feedback from "@/utils/feedback";
 import {listPolice} from "@/api/system/police";
 import {getList,save,delCommon} from '@/api/commonOpinions';
 import useCatchStore from "@/stores/modules/catch";
 import useUserStore from "@/stores/modules/user";
 const userStore = useUserStore();
-const props = defineProps(['dialog','reportId','nextNode','message',"isWarning"])
+const props = defineProps(['dialog','reportId','nextNode','message',"isWarning","flowId"])
 const emits = defineEmits(['submitFeedback',"closeFun"])
 
 const catchStore = useCatchStore();
@@ -102,12 +103,14 @@ const submitFun = async ()=>{
   await auditForm.value.validate();
   await feedback.confirm("是否确认通过？");
   formData.value.reportId = props.reportId;
+  formData.value.flowId = props.flowId;
   //nextNode
   if(props.nextNode){
     formData.value.nextNode = props.nextNode;
   }
   if(props.isWarning){
-    const res = await auditWarning(formData.value);
+    const res = await auditPassWarningDistribute(formData.value);
+    // const res = await auditWarning(formData.value);
   }else{
     const res = await auditReport(formData.value);
   }

src/components/reportAudit/start.vue

@@ -1,13 +1,14 @@
 <script setup>
 
-  import {auditReport,auditWarning,auditWarningInform} from "@/api/report/flow";
+  import {auditReport} from "@/api/report/flow";
+import {submitWarningBusiness} from "@/api/warning/business";
   import feedback from "@/utils/feedback";
   import {listPolice} from "@/api/system/police";
   import {getList,save,delCommon} from '@/api/commonOpinions';
   import useCatchStore from "@/stores/modules/catch";
   import useUserStore from "@/stores/modules/user";
   const userStore = useUserStore();
-  const props = defineProps(['dialog','reportId','nextNode','message',"isWarning","isCityAudit","reportProject", 'currentNode', 'auditUnitId'])
+  const props = defineProps(['dialog','reportId','nextNode','message',"isWarning","isCityAudit","reportProject", 'currentNode', 'auditUnitId', 'flowId'])
   const emits = defineEmits(['submitFeedback',"closeFun"])
   import { getDictValue } from "@/utils/util";
   import { saveLastChoice, loadLastChoice } from '@/utils/lastChoice';
@@ -107,12 +108,8 @@
       formData.value.nextNode = props.nextNode;
     }
     if(props.isWarning){
-      if("inform" === props.isWarning){
+      formData.value.reportId = props.reportId;
-        const res = await  auditWarningInform(formData.value);
+      const res = await submitWarningBusiness(formData.value);
-      }else{
-        const res = await auditWarning(formData.value);
-      }
-
     }else{
       const res = await auditReport(formData.value);
     }

src/permission.ts

@@ -12,7 +12,7 @@ import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 
 
-const delPathList =['/warning/edit','/report/edit/controlPrice','/warning/compile/edit']
+const delPathList =['/warning/edit','/warning/business','/report/edit/controlPrice','/warning/compile/edit']
 // NProgress配置
 NProgress.configure({ showSpinner: false })
 // 免登录白名单

src/views/warning/business.vue

@@ -0,0 +1,591 @@
+<script setup>
+import {useRoute, useRouter} from "vue-router";
+import {AuditRuleEnums} from "@/enums/AuditRuleEnums.ts"
+import feedback from "@/utils/feedback";
+import {
+  getWarningBusiness,
+  saveWarningBusiness,
+  endWarningBusiness,
+  auditRejectWarning, getWarningFlowList
+} from '@/api/warning/business'
+import { timeFormat } from '@/utils/util'
+import warningDetail from './components/detail.vue'
+import reportAudit from '@/components/reportAudit/start.vue'
+import finishDistrbute from '@/components/reportAudit/finishDistrbute.vue'
+import useTabsStore from "@/stores/modules/multipleTabs";
+
+const { removeTab } = useTabsStore();
+const route = useRoute()
+const router = useRouter()
+
+const loading = ref(false)
+
+// 审批记录相关
+const reportFlowDialog = ref(false)
+const reportFlowLoading = ref(false)
+const reportFlowTable = ref([])
+
+// 详情相关
+const detailShow = ref(false)
+const detailProps = ref({})
+
+// 提交给领导弹窗相关
+const dialog = ref(false)
+const warningCode = ref("warning")
+const node = ref("leader")
+
+// 领导通过弹窗相关
+const finishDialog = ref(false)
+
+// 表单数据
+const formData = ref({
+  reportProject: {},
+  record: {},
+  contents: []
+})
+
+// 行样式（已填写备注的行高亮）
+const tableRowClassName = ({row}) => {
+  return row.remark ? 'warning-row' : ''
+}
+
+// 是否为查看模式（已预警或有 flowId 但不是待审批状态）
+const isViewMode = computed(() => {
+  return formData.value.reportProject.warningState === '1'
+})
+
+// 是否为领导审批模式（warning_state='2' 且有 flowId）
+const isLeaderMode = computed(() => {
+  return formData.value.reportProject.warningState === '2' && route.query.flowId
+})
+
+// 问题详情是否可编辑
+const canEditRemark = computed(() => {
+  return formData.value.reportProject.warningState === '0'
+      // ||
+      //    (formData.value.reportProject.warningState === '2' && !route.query.flowId)
+})
+
+// 加载数据
+const loadData = async () => {
+  console.log(route.query)
+  const reportId = route.query.reportId
+  if (!reportId) {
+    closePage()
+    return
+  }
+
+  loading.value = true
+  try {
+    // 获取预警业务数据
+    const res = await getWarningBusiness(reportId)
+
+    // 填充项目信息
+    formData.value.reportProject = res.reportProject || {}
+    formData.value.record = res.record || {}
+
+    // 填充预警内容（已有数据则用已有数据，否则用枚举）
+    if (res.contents && res.contents.length > 0) {
+      formData.value.contents = res.contents
+    } else {
+      formData.value.contents = AuditRuleEnums.map(item => ({
+        ...item,
+        remark: ''
+      }))
+    }
+  } catch (e) {
+    console.error('加载数据失败', e)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 保存
+const handleSave = async () => {
+  loading.value = true
+  try {
+    await saveWarningBusiness({
+      reportId: route.query.reportId,
+      contents: formData.value.contents.map(c => ({
+        type: c.type,
+        title: c.title,
+        content: c.content,
+        remark: c.remark || ''
+      }))
+    })
+    feedback.msgSuccess('保存成功')
+    loadData()
+  } catch (e) {
+    console.error(e)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 直接结束
+const handleEnd = async () => {
+  await feedback.confirm('确定直接结束预警吗？')
+
+  loading.value = true
+  try {
+    await endWarningBusiness({
+      reportId: route.query.reportId,
+      contents: formData.value.contents.map(c => ({
+        type: c.type,
+        title: c.title,
+        content: c.content,
+        remark: c.remark || ''
+      })),
+      flowId: route.query.flowId,
+    })
+    feedback.msgSuccess('操作成功')
+    closePage()
+  } catch (e) {
+    console.error(e)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 提交给领导
+const handleSubmit = async () => {
+  debugger
+  loading.value = true
+  try {
+    await saveWarningBusiness({
+      reportId: route.query.reportId,
+      contents: formData.value.contents.map(c => ({
+        type: c.type,
+        title: c.title,
+        content: c.content,
+        remark: c.remark || ''
+      })),
+
+    })
+    loading.value = false
+    dialog.value = true
+  } catch (e) {
+    loading.value = false
+    console.error(e)
+  }
+}
+
+// 弹窗提交成功回调
+const submitFeedback = () => {
+  dialog.value = false
+  closePage()
+}
+
+// 关闭弹窗回调
+const closeAuditDialogFun = () => {
+  dialog.value = false
+}
+
+// 领导通过
+const handlePass = () => {
+  finishDialog.value = true
+}
+
+// 弹窗提交成功回调
+const FinishSubmitFeedback = () => {
+  finishDialog.value = false
+  feedback.msgSuccess('审批通过')
+  closePage()
+}
+
+// 关闭弹窗回调
+const FinishCloseAuditDialogFun = () => {
+  finishDialog.value = false
+}
+
+// 领导驳回
+const handleReject = async () => {
+  loading.value = true
+  try {
+    await auditRejectWarning({
+      flowId: route.query.flowId,
+      reportId: route.query.reportId,
+      approverMessage: ''
+    })
+    feedback.msgSuccess('已驳回')
+    closePage()
+  } catch (e) {
+    console.error(e)
+  } finally {
+    loading.value = false
+  }
+}
+
+// 打开审批记录
+const getAuditTableFun = async () => {
+  reportFlowDialog.value = true
+  reportFlowLoading.value = true
+  const res = await getWarningFlowList(route.query.reportId)
+  reportFlowLoading.value = false
+  reportFlowTable.value = res
+}
+
+// 打开详情
+const DetailReport = () => {
+  detailProps.value = {
+    isEnd: formData.value.reportProject.reportType === "结算项目",
+    id: formData.value.reportProject.id,
+    backPath: '/entryWindow',
+    node: formData.value.reportProject.node
+  }
+  detailShow.value = true
+}
+
+// 关闭详情
+const closeDetailShow = () => {
+  detailShow.value = false
+}
+
+// 取消/返回
+const handleCancel = () => {
+  closePage()
+}
+
+const closePage = () => {
+  removeTab('/warning/business', router)
+  router.back()
+}
+
+onMounted(() => {
+  loadData()
+})
+</script>
+
+<template>
+  <div class="warning-business-page" v-loading="loading">
+    <!-- 报审信息 -->
+    <div class="section">
+      <h5>报审信息</h5>
+      <el-form :model="formData.reportProject" label-width="140">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="报审类型">
+              <el-input :model-value="formData.reportProject.reportType" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目名称">
+              <el-input :model-value="formData.reportProject.reportName" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目类别">
+              <el-input :model-value="formData.reportProject.projectType" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="审计单位">
+              <el-input :model-value="formData.reportProject.auditUnit" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="项目单位">
+              <el-input :model-value="formData.reportProject.projectUnit" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目负责人">
+              <el-input :model-value="formData.reportProject.projectPrincipal" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="负责人联系方式">
+              <el-input :model-value="formData.reportProject.projectPhone" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="报审金额（元）">
+              <el-input :model-value="formData.reportProject.reportMoney" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="立项日期">
+              <el-input :model-value="formData.reportProject.projectApprovalTime || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="立项金额（元）">
+              <el-input :model-value="formData.reportProject.projectApprovalMoney" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="立项审批领导">
+              <el-input :model-value="formData.reportProject.projectApprovalLead" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="报审人">
+              <el-input :model-value="formData.reportProject.applicant" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="采购方式">
+              <el-input :model-value="formData.reportProject.purchaseMethod || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="报审日期">
+              <el-input :model-value="formData.reportProject.applicantTime" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="文号">
+              <el-input :model-value="formData.reportProject.referenceNumber" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发文日期">
+              <el-input :model-value="formData.reportProject.publicationDate" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="formData.reportProject.reportType === '结算项目'">
+          <el-col :span="6">
+            <el-form-item label="合同签订日期">
+              <el-input :model-value="formData.reportProject.contractTime || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="合同金额">
+              <el-input :model-value="formData.reportProject.contractMount" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="服务单位">
+              <el-input :model-value="formData.reportProject.serviceUnit || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="服务单位负责人">
+              <el-input :model-value="formData.reportProject.serviceUnitManager || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="formData.reportProject.reportType === '结算项目'">
+          <el-col :span="6">
+            <el-form-item label="服务日期">
+              <el-input :model-value="formData.reportProject.serviceTime || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="服务单位联系电话">
+              <el-input :model-value="formData.reportProject.serviceUnitPhone || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="审减金额">
+              <el-input :model-value="formData.reportProject.archivingReduceMoney" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="formData.reportProject.reportType === '结算项目'">
+          <el-col :span="6">
+            <el-form-item label="归档时间">
+              <el-input :model-value="formData.reportProject.archiving || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="审定金额（元）">
+              <el-input :model-value="formData.reportProject.archivingMoney" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <!-- 预警监督信息 -->
+    <div class="section">
+      <h5>预警监督信息</h5>
+      <el-form :model="formData.reportProject" label-width="140">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="预警监督状态">
+              <el-input :model-value="{
+                '0': '未预警监督',
+                '1': '已预警监督',
+                '2': '预警中'
+              }[formData.reportProject.warningState] || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预警监督人员">
+              <el-input :model-value="formData.reportProject.warningSupervision || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预警监督日期">
+              <el-input :model-value="formData.reportProject.supervisionTime || '-'" readonly class="select-disabled-like"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label=" ">
+              <el-button type="primary" style="width: 100%" @click="DetailReport">详情</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <!-- 预警监督情况 -->
+    <div class="section">
+      <h5>预警监督情况</h5>
+      <el-table :data="formData.contents" border :row-class-name="tableRowClassName">
+        <el-table-column label="序号" type="index" width="60" align="center"/>
+        <el-table-column label="预警类型" prop="type" width="120"/>
+        <el-table-column label="预警标题" prop="title" width="150"/>
+        <el-table-column label="预警内容" prop="content"/>
+        <el-table-column label="问题详情" min-width="200">
+          <template #default="{ row }">
+            <el-input
+              v-model="row.remark"
+              type="textarea"
+              :rows="2"
+              :disabled="!canEditRemark"
+              placeholder="请填写问题详情"/>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <!-- 操作按钮 -->
+    <div class="flex end mt-20">
+      <!-- 待预警状态 (warning_state = '0')：预警人操作 -->
+      <template v-if="formData.reportProject.warningState === '0'">
+        <el-button type="primary" @click="handleSave" :loading="loading">保存</el-button>
+        <el-button type="warning" @click="handleEnd" :loading="loading">直接结束</el-button>
+        <el-button type="success" @click="handleSubmit" :loading="loading">提交给领导</el-button>
+      </template>
+
+      <!-- 预警中状态 (warning_state = '2')：领导审批操作 -->
+      <template v-else-if="isLeaderMode">
+        <el-button type="danger" @click="handleReject" :loading="loading">驳回</el-button>
+        <el-button type="success" @click="handlePass" :loading="loading">通过</el-button>
+      </template>
+
+      <el-button type="primary" @click="getAuditTableFun" :loading="reportFlowLoading">审批记录</el-button>
+      <el-button @click="handleCancel">取消</el-button>
+    </div>
+
+    <!-- 审批记录弹窗 -->
+    <el-dialog v-model="reportFlowDialog" title="审批记录" width="80vw">
+      <div class="table-container">
+        <el-table :data="reportFlowTable" v-loading="reportFlowLoading">
+          <el-table-column width="50" type="index" label="序号" :index="(index) => index + 1"/>
+          <el-table-column label="操作" prop="reportCode"/>
+          <el-table-column label="办理人" prop="approver"/>
+          <el-table-column label="提交时间" prop="areportTime">
+            <template #default="{row}">
+              {{ timeFormat(row.areportTime, 'yyyy-mm-dd hh:MM:ss') }}
+            </template>
+          </el-table-column>
+          <el-table-column label="完成时间" prop="approverTime">
+            <template #default="{row}">
+              {{ timeFormat(row.approverTime, 'yyyy-mm-dd hh:MM:ss') }}
+            </template>
+          </el-table-column>
+          <el-table-column label="办理结果" prop="approverState">
+            <template #default="{row}">
+              <el-tag type="primary" v-if="row.approverState === 'start'">开始</el-tag>
+              <el-tag type="success" v-if="row.approverState === 'end'">完成</el-tag>
+              <el-tag type="danger" v-if="row.approverState === 'reject'">驳回</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="办理意见" prop="approverMessage" show-overflow-tooltip/>
+<!--          <el-table-column label="办理状态" prop="approverState"/>-->
+        </el-table>
+      </div>
+    </el-dialog>
+
+    <!-- 详情弹窗 -->
+    <el-dialog v-model="detailShow" title="项目详情" width="90vw" @close="closeDetailShow">
+      <warningDetail
+        :id="detailProps.id"
+        :node="detailProps.node"
+        :back-path="detailProps.backPath"
+        :is-end="detailProps.isEnd"
+        @close-page-fun="closeDetailShow">
+      </warningDetail>
+    </el-dialog>
+
+    <!-- 提交给领导弹窗 -->
+    <report-audit
+      @submitFeedback="submitFeedback"
+      @closeFun="closeAuditDialogFun"
+      :isWarning="warningCode"
+      :reportId="formData.reportProject.id"
+      :dialog="dialog"
+      :nextNode="node"
+      :reportProject="formData.reportProject"
+    />
+
+    <!-- 领导通过弹窗 -->
+    <finish-distrbute
+      @submitFeedback="FinishSubmitFeedback"
+      @closeFun="FinishCloseAuditDialogFun"
+      :isWarning="true"
+      :reportId="formData.reportProject.id"
+      :flowId="route.query.flowId"
+      :dialog="finishDialog"
+      :nextNode="'end'"
+    />
+  </div>
+</template>
+
+<style lang="scss">
+.warning-business-page {
+  padding: 20px;
+  background: #fff;
+}
+
+.section {
+  margin-bottom: 20px;
+}
+
+.section h5 {
+  margin: 0 0 15px 0;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #eee;
+  color: #333;
+  font-weight: 600;
+}
+
+.button-group {
+  margin-top: 30px;
+  text-align: center;
+  padding: 20px 0;
+  border-top: 1px solid #eee;
+}
+
+.el-table .warning-row {
+  --el-table-tr-bg-color: var(--el-color-warning-light-9);
+}
+
+.select-disabled-like {
+  --el-input-bg-color: #ffffff;
+  --el-input-border-color: #dcdfe6;
+  --el-input-text-color: #000000;
+
+  .el-input__wrapper {
+    background-color: #ffffff;
+    box-shadow: 0 0 0 1px var(--el-disabled-border-color) inset;
+    cursor: not-allowed;
+  }
+
+  .el-input__inner {
+    color: #000000;
+    -webkit-text-fill-color: #000000;
+    cursor: text;
+  }
+}
+</style>

src/views/warning/compile/compileTable.vue

@@ -4,6 +4,7 @@ import {timeFormat} from "@/utils/util";
 import {invertRecorPage} from "@/api/investRecord/index";
 import feedback from "@/utils/feedback";
 import useUserStore from "@/stores/modules/user";
+import {getCompilePage} from "@/api/warning/business.ts";
 const showDetail = ref(false)
 const loading =ref(false)
 const tableData = ref([])
@@ -24,6 +25,15 @@ const updataFun =(row)=>{
           isEdit:row.warningState == '0'
     }
   })
+
+  let routeQuery ={
+    reportId:row.id,
+  }
+  router.push({
+    path:`/warning/business`,
+    query: routeQuery
+  });
+
 }
 
 //重置
@@ -32,12 +42,14 @@ const resetFun = ()=>{
     size:10,
     current:1
   }
+  getList()
 }
 //分页查询
 const getList = async ()=>{
 
   loading.value=true;
-  const res = await  invertRecorPage(query.value);
+  // const res = await  invertRecorPage(query.value);
+  const res = await  getCompilePage(query.value);
   tableData.value=res.records;
   total.value=res.total
   loading.value=false;
@@ -70,9 +82,9 @@ watch(()=>route.query.load,(val)=>{
             </el-col>
             <el-col :span="6">
               <el-form-item label="是否已修复">
-                <el-select v-model="query.warningState" clearable>
+                <el-select v-model="query.processingStatus" clearable>
-                  <el-option label="未修复" value="0"></el-option>
+                  <el-option label="未修复" value="未修复"></el-option>
-                  <el-option label="已修复" value="1"></el-option>
+                  <el-option label="已修复" value="已修复"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -100,14 +112,14 @@ watch(()=>route.query.load,(val)=>{
                 {{timeFormat(row.supervisionTime)}}
               </template>
             </el-table-column>
-            <el-table-column label="是否修复">
+            <el-table-column label="是否修复" prop="processingStatus">
-              <template #default="{row}">
+<!--              <template #default="{row}">-->
-                {{row.warningState == '0'?'待修复':'已修复'}}
+<!--                {{// row.warningState == '0'?'待修复':'已修复'}}-->
-              </template>
+<!--              </template>-->
             </el-table-column>
             <el-table-column label="操作" width="180">
               <template #default="{row}">
-                <el-button v-if="row.warningState == '0'" type="primary" link @click="updataFun(row)">编辑</el-button>
+<!--                <el-button v-if="row.warningState == '0'" type="primary" link @click="updataFun(row)">编辑</el-button>-->
                 <el-button type="primary" link @click="updataFun(row)">查看</el-button>
                 <!--                <el-button type="primary" link @click="updataFun(row)">编辑</el-button>-->
               </template>

src/views/warning/index.vue

@@ -53,16 +53,14 @@ const getList = async ()=>{
 const router = useRouter();
 const editFun = (row) =>{
   console.log('row',row)
-  const listQuery = query.value
   let routeQuery ={
-    isEnd:row.reportType === "结算项目",
+    // isEnd:row.reportType === "结算项目",
     reportId:row.id,
-    isEdit:true,
+    // isEdit:true,
     backPath:'/warning',
-    listQuery: JSON.stringify(listQuery)
   }
   router.push({
-    path:`/warning/edit`,
+    path:`/warning/business`,
     query: routeQuery
   });
 }
@@ -180,12 +178,12 @@ watch(()=>route.query.load,(val)=>{
           </el-table-column>
           <el-table-column
               label="预警时间"
-              prop="lastWarningTime"
+              prop="supervisionTime"
               align="center"
               width="160"
           >
             <template #default="{ row }">
-              {{ row.lastWarningTime || '/' }}
+              {{ row.supervisionTime || '/' }}
             </template>
           </el-table-column>
           <el-table-column
@@ -261,8 +259,7 @@ watch(()=>route.query.load,(val)=>{
           </el-table-column>
           <el-table-column  label="操作" fixed="right" min-width="120px">
             <template #default="{ row }">
-              <p v-if="row.stateData == '1'">已下发问题</p>
+              <el-button  v-if="row.warningState == '1' || row.warningState == '2'" @click="editFun(row)">查看</el-button>
-              <el-button v-else-if ="row.warningState == '1' || row.warningState == '2'" @click="editFun(row)">查看</el-button>
               <el-button v-else type="primary" @click="editFun(row)">预警</el-button>
             </template>
           </el-table-column>

src/views/work/work.vue

@@ -55,21 +55,21 @@ const getWorkTabFun = async () => {
 //我的待办点击
 const rowWorkClick = (row) => {
   console.log('当前待办项目节点',row.flowCode)
+  if (activeName.value === 'second') {
+    return;
+  }
   let isEnd = row.reportType === "结算项目";
   if(row.isWarning){
 
-    //跳转值审计预警审核
+    //跳转至审计预警业务页面（新）
     let query ={
-      isEnd:row.reportType === "项目控制价",
       reportId:row.reportId,
-      warningId:row.warningId,
+      flowId: row.flowId,
-      isAudit:true,
+      isAudit: row.flowState === 'start', // 领导待办时为true
-      backPath:'/work',
+      isLeader: row.flowState === 'start'  // 领导审批模式
-      warningCode:row.flowCode,
-      flowId: row.flowId
     }
     router.push({
-      path:`/warning/edit`,
+      path:`/warning/business`,
       query: query
     });
   }