Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/api/audit/index.ts

@@ -28,7 +28,9 @@ enum Api {
   // 判读-预览最后一次数据
   LoadCaseImportInfoLast = '/api/DroneCaseInfoTask/LoadCaseImportInfoLast',
   // 判读-导出shp文件
-  ExportapprovalCaseInfoShapefile = 'ExportapprovalCaseInfoShapefile'
+  ExportapprovalCaseInfoShapefile = 'ExportapprovalCaseInfoShapefile',
+  // 查询是否有复提条件
+  IsReSubmit = '/api/DroneCaseInfoSingle/IsReSubmit'
 }
 
 const typeObj = {
@@ -146,4 +148,10 @@ export function ExportapprovalCaseInfoShapefile(type, params?){
     params,
     responseType: 'blob',
   })
+}
+export function IsReSubmit(params: { originalcaseno: string, subjectkey: string }){
+  return defHttp.get({
+    url: Api.IsReSubmit,
+    params
+  })
 }

src/components/Audit/InfoModal/index.vue

@@ -262,6 +262,7 @@ import { getGeom } from '@/api/sys/layerManagement';
 import { typenameKey } from '@/views/demo/audit/util'
 import axios from "axios";
 import { tubanbiaoqian1Options, tubanbiaoqian2Options } from './util'
+import { IsReSubmit } from '@/api/audit/index'
 
 const props = defineProps(['infoData','control','type','modalLoading'])
 const emits = defineEmits(['handleOk','closeModal','closeCase','reSubmit','changeLoading'])
@@ -385,14 +386,20 @@ const submitApi = () => {
     okText: '确认',
     cancelText: '取消',
     onOk: () => {
-      if(props.type == '违法用地'){
+      IsReSubmit({originalcaseno: props.infoData.original_case_no, subjectkey: props.type}).then(res => {
-        props.infoData.case_description = caseDescription.value.join('-')
+        if(res){
-      }
+          if(props.type == '违法用地'){
-      let params = {
+            props.infoData.case_description = caseDescription.value.join('-')
-        ...props.infoData,
+          }
-        subject: props.type,
+          let params = {
-      }
+            ...props.infoData,
-      emits('handleOk',params)
+            subject: props.type,
+          }
+          emits('handleOk',params)
+        }else{
+          message.error('审核失败')
+        }
+      })
     }
   })
   

src/views/demo/illegalmining/mainaudit/InfoModal/index.vue

@@ -288,6 +288,7 @@ import { getChildrenTree } from '@/api/demo/system';
 import MapboxMap from '@/components/MapboxMaps/MapComponent.vue';
 import { getGeom } from '@/api/sys/layerManagement';
 import axios from "axios";
+import { IsReSubmit } from '@/api/audit/index'
 
 const props = defineProps(['infoData','control','modalLoading'])
 const emits = defineEmits(['handleOk','closeModal','closeCase','reSubmit','changeLoading'])
@@ -404,11 +405,17 @@ const submit = () => {
     okText: '确认',
     cancelText: '取消',
     onOk: () => {
-      let params = {
+      IsReSubmit({originalcaseno: props.infoData.original_case_no, subjectkey: '非法采矿'}).then(res => {
-        ...props.infoData,
+        if(res){
-        subject: '非法采矿',
+          let params = {
-      }
+            ...props.infoData,
-      emits('handleOk',params)
+            subject: '非法采矿',
+          }
+          emits('handleOk',params)
+        }else{
+          message.error('审核失败')
+        }
+      })
     }
   })
 }