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

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

@@ -287,7 +287,6 @@ import { getLoad } from '@/api/sys/sysDataItemDetail';
 import { getChildrenTree } from '@/api/demo/system';
 import MapboxMap from '@/components/MapboxMaps/MapComponent.vue';
 import { getGeom } from '@/api/sys/layerManagement';
-import { UpdateCaseInfoBySubject } from '@/api/audit/index'
 import axios from "axios";
 
 const props = defineProps(['infoData','control','modalLoading'])
@@ -405,21 +404,11 @@ const submit = () => {
     okText: '确认',
     cancelText: '取消',
     onOk: () => {
-      emits('changeLoading',true)
-      try{
       let params = {
         ...props.infoData,
         subject: '非法采矿',
       }
-        console.log(params)
-        UpdateCaseInfoBySubject(params).then(res => {
-          if(res){
-            emits('handleOk')
-          }
-        })
-      }catch(error){
-        emits('changeLoading',false)
-      }
+      emits('handleOk',params)
     }
   })
 }

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

@@ -65,7 +65,7 @@ import { SaveReSubmitInfo } from '@/api/demo/resubmit';
 import { uploadFile } from '@/api/formrender/index';
 import { MainLoadCaseInfoLists, MainGetCaseInfo, MainCloseCaseInfo, MainUpdateCaseInfoShpData, MainExportapprovalCaseInfoShapefile } from '@/api/illegalmining/index';
 import ImportDataModal from '@/components/Audit/ImportDataModal/index.vue'
-import { UpdateCaseNoBySubject, LoadCaseImportInfoLast } from '@/api/audit/index';
+import { UpdateCaseNoBySubject, LoadCaseImportInfoLast, UpdateCaseInfoBySubject } from '@/api/audit/index';
 
 const userStore = useUserStore();
 const userInfo = userStore.getUserInfo;
@@ -121,12 +121,13 @@ function handleAudit(record) {
     openModal.value = true
   })
 }
-const handleOk = async () => {
+const handleOk = async (params) => {
   changeLoading(true)
   try {
     const { id } = infoData.value.info
     const checkValue = await GetDraft({id})
     if(checkValue.process == null){
+      await UpdateCaseInfoBySubject(params)
       let data = await getDetail({ code });
       let content = JSON.parse(data.scheme.content);
       const currentNode = content.wfData.find((t) => t.type == 'bpmn:StartEvent');