From fc864828e9aabb0b6e28203598ff82d579a8e54e Mon Sep 17 00:00:00 2001
From: buaixuexideshitongxue <2936013465@qq.com>
Date: Wed, 24 Dec 2025 15:22:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=9B=91=E7=9D=A3=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=94=B9=E9=80=A0--=E5=8F=96=E6=B6=88=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E6=8A=A5=E5=AE=A1=E4=BA=BA=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/warning/index.ts    |  8 +++++++
 src/views/warning/edit.vue  | 48 ++++++++++++++++++++++++++++++-------
 src/views/warning/index.vue | 18 +++++++-------
 3 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/src/api/warning/index.ts b/src/api/warning/index.ts
index b71d30b..ef1a567 100644
--- a/src/api/warning/index.ts
+++ b/src/api/warning/index.ts
@@ -45,3 +45,11 @@ export function getWarningInformList(id){
         url:`/warning/getWarningInformList/${id}`
     })
 }
+
+
+export  function  auditEndWarningApi(body){
+    return request.post({
+        url:'/reportFlow/auditEndWarning',
+        body
+    })
+}
\ No newline at end of file
diff --git a/src/views/warning/edit.vue b/src/views/warning/edit.vue
index c54bbec..5ce6a52 100644
--- a/src/views/warning/edit.vue
+++ b/src/views/warning/edit.vue
@@ -3,7 +3,14 @@ import useUserStore from "@/stores/modules/user";
 import {FlowWarningEnum} from '@/enums/flowWarningEnums'
 import {getDetail} from "@/api/report/index";
 import {getReportFlow} from "@/api/report/flow";
-import {addOrUpData,getWarningDetail,getWarningRecord,getWarningAudit,getWarningInformList} from '@/api/warning/index'
+import {
+  addOrUpData,
+  getWarningDetail,
+  getWarningRecord,
+  getWarningAudit,
+  getWarningInformList,
+  auditEndWarningApi
+} from '@/api/warning/index'
 import useCatchStore from "@/stores/modules/catch";
 import {listPolice} from "@/api/system/police";
 import {timeFormat} from "@/utils/util";
@@ -73,7 +80,9 @@ const getReportDetailFun =async (id)=>{
     await getWarningDetailFun(data.id)
   }else{
     //获取历史记录
-
+    console.log("==============")
+    console.log(res.project)
+    res.project.warningState=="1"? recordDisplay.value=true: recordDisplay.value=false
   }
 }
 
@@ -139,7 +148,23 @@ const warningInformFun = async ()=>{
   loading.value=false;
   dialog.value=true
 }
-
+//结束预警
+const auditEndWarning = async ()=>{
+  await formDataRef.value.validate();
+  loading.value=true;
+  const body={
+    reportId:formData.value.reportProject.id
+  }
+  const res= await auditEndWarningApi(body)
+  feedback.msgSuccess("操作成功")
+  router.push({
+    path: "/warning",
+    query: {
+      refresh: Date.now()
+    }
+  })
+  loading.value=false;
+}
 
 const closePage = ()=>{
   if (route.query.isEdit) {
@@ -172,7 +197,7 @@ const addOrUpDataFun = async ()=>{
 
 }
 
-//提交
+//提交至领导
 async function SubmitFun(){
   await formDataRef.value.validate();
   await feedback.confirm("是否提交审计数据？");
@@ -255,11 +280,16 @@ async function  getAuditTableFun(){
   reportFlowTable.value = res;
 }
 
-async function getAuditTableInformFun(){
+async function getAuditTableInformFun(type){
   //打开审批记录
   reportFlowDialog.value = true
   reportFlowLoading.value=true
-  const res = await getReportFlow({id:formData.value.record.id,code:'inform'});
+  let res;
+  if (type){
+    res= await getReportFlow({id:formData.value.reportProject.id,code:type});
+  }else {
+    res = await getReportFlow({id:formData.value.record.id,code:'inform'});
+  }
   reportFlowLoading.value=false
   reportFlowTable.value = res;
 }
@@ -698,13 +728,15 @@ const ensureSupervisionTime = () => {
         </div>
         <div  class="flex end mt-20"  v-if="route.query.isEdit && !recordDisplay ">
           <el-button type="primary" @click="addOrUpDataFun">保存</el-button>
-          <el-button type="primary" @click="warningInformFun">通知报审单位</el-button>
+<!--          <el-button type="primary" @click="warningInformFun">通知报审单位</el-button>-->
+          <el-button type="primary" @click="getAuditTableInformFun('end')">签收审批记录</el-button>
+          <el-button type="warning" @click="auditEndWarning">结束</el-button>
           <el-button type="primary" @click="SubmitFun">提交至领导</el-button>
           <el-button @click="closePage" >取消</el-button>
         </div>
         <div class="flex end mt-20" v-else>
           <el-button type="primary" @click="getAuditTableFun">领导审批记录</el-button>
-          <el-button type="primary" @click="getAuditTableInformFun">签收审批记录</el-button>
+          <el-button type="primary" @click="getAuditTableInformFun('end')">签收审批记录</el-button>
           <el-button type="primary" v-if="isAudit && (codeData !='inform')" @click="passFun">通过</el-button>
           <el-button type="primary" v-if="isAudit && (codeData =='inform')" @click="passInformFun">签收</el-button>
           <el-button type="danger" v-if="isAudit" @click="rejectFun">驳回</el-button>
diff --git a/src/views/warning/index.vue b/src/views/warning/index.vue
index 50fecd6..46855c6 100644
--- a/src/views/warning/index.vue
+++ b/src/views/warning/index.vue
@@ -126,15 +126,15 @@ watch(()=>route.query.load,(val)=>{
               min-width="120"
               show-overflow-tooltip
           />
-          <el-table-column label="数据状态"  width="110">
-            <template #default="{ row }">
-              <!--              //1 为 已下发问题 ，2 为已提交审核,0为常规-->
+<!--          <el-table-column label="数据状态"  width="110">-->
+<!--            <template #default="{ row }">-->
+<!--              &lt;!&ndash;              //1 为 已下发问题 ，2 为已提交审核,0为常规&ndash;&gt;-->
 
-              <p v-if="row.stateData == '1'">已下发问题</p>
-              <p v-else-if ="row.stateData == '2'" >已提交审核</p>
-              <p v-else >待预警</p>
-            </template>
-          </el-table-column>
+<!--              <p v-if="row.stateData == '1'">已下发问题</p>-->
+<!--              <p v-else-if ="row.stateData == '2'" >已提交审核</p>-->
+<!--              <p v-else >待预警</p>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column
               label="项目类别"
               min-width="120"
@@ -230,7 +230,7 @@ watch(()=>route.query.load,(val)=>{
           <el-table-column  label="操作" fixed="right" min-width="120px">
             <template #default="{ row }">
               <p v-if="row.stateData == '1'">已下发问题</p>
-              <el-button v-else-if ="row.stateData == '2'" @click="editFun(row)">查看</el-button>
+              <el-button v-else-if ="row.warningState == '1'" @click="editFun(row)">查看</el-button>
               <el-button v-else type="primary" @click="editFun(row)">预警</el-button>
             </template>
           </el-table-column>