diff --git a/src/components/Audit/InfoModal/index.vue b/src/components/Audit/InfoModal/index.vue
index f104679a..fa1b5c06 100644
--- a/src/components/Audit/InfoModal/index.vue
+++ b/src/components/Audit/InfoModal/index.vue
@@ -22,7 +22,21 @@
@@ -247,6 +261,7 @@ import MapboxMap from '@/components/MapboxMaps/MapComponent.vue';
import { getGeom } from '@/api/sys/layerManagement';
import { typenameKey } from '@/views/demo/audit/util'
import axios from "axios";
+import { tubanbiaoqian1Options, tubanbiaoqian2Options } from './util'
const props = defineProps(['infoData','control','type','modalLoading'])
const emits = defineEmits(['handleOk','closeModal','closeCase','reSubmit','changeLoading'])
@@ -265,8 +280,15 @@ const yesOrNoOptions = ref([
{ label: '是', value: 1 },
{ label: '否', value: 0 },
])
+const caseDescription = ref(["",""])
onMounted(() => {
+ if(props.type == '违法用地'){
+ if(props.infoData.case_description){
+ caseDescription.value = props.infoData.case_description.split('-')
+ console.log('caseDescription1.value',caseDescription.value)
+ }
+ }
getLoad({code: typenameKey[props.type]}).then(res => {
typenameOptions.value = res.map(item => {
return {
@@ -363,6 +385,9 @@ const submitApi = () => {
okText: '确认',
cancelText: '取消',
onOk: () => {
+ if(props.type == '违法用地'){
+ props.infoData.case_description = caseDescription.value.join('-')
+ }
let params = {
...props.infoData,
subject: props.type,
diff --git a/src/components/Audit/InfoModal/util.ts b/src/components/Audit/InfoModal/util.ts
new file mode 100644
index 00000000..4a0d1c5f
--- /dev/null
+++ b/src/components/Audit/InfoModal/util.ts
@@ -0,0 +1,3 @@
+import { asyncGetOptions } from '@/utils/global'
+export const tubanbiaoqian1Options = await asyncGetOptions('tubanbiaoqian1');
+export const tubanbiaoqian2Options = await asyncGetOptions('tubanbiaoqian2');
\ No newline at end of file
diff --git a/src/views/demo/audit/audit/index.vue b/src/views/demo/audit/audit/index.vue
index 084bfcbf..5a505389 100644
--- a/src/views/demo/audit/audit/index.vue
+++ b/src/views/demo/audit/audit/index.vue
@@ -94,7 +94,7 @@ const picihao = ref()
const openProgressModal = ref(false)
const modalLoading = ref(false)
-const [registerTable, { reload, expandAll}] = useTable({
+const [registerTable, { reload, expandAll, getForm}] = useTable({
title: '待审核',
api: (params) => LoadCaseInfoLists(type,params),
columns,
@@ -289,7 +289,9 @@ const preview = () => {
})
}
const downloadSHP = () => {
- ExportapprovalCaseInfoShapefile(type).then(res => {
+ const form = getForm();
+ const filterValues = form.getFieldsValue();
+ ExportapprovalCaseInfoShapefile(type,filterValues).then(res => {
const elink = document.createElement('a');
elink.download = '待审核矢量数据' + new Date().getTime() + '.zip';
elink.style.display = 'none';
diff --git a/src/views/demo/illegalmining/mainaudit/index.vue b/src/views/demo/illegalmining/mainaudit/index.vue
index d81c6f16..0120c89e 100644
--- a/src/views/demo/illegalmining/mainaudit/index.vue
+++ b/src/views/demo/illegalmining/mainaudit/index.vue
@@ -78,7 +78,7 @@ const openImportModal = ref(false)
const openProgressModal = ref(false)
const modalLoading = ref(false)
-const [registerTable, { reload, expandAll}] = useTable({
+const [registerTable, { reload, expandAll, getForm}] = useTable({
title: '待审核',
api: MainLoadCaseInfoLists,
columns,
@@ -275,7 +275,9 @@ const preview = () => {
})
}
const downloadSHP = () => {
- MainExportapprovalCaseInfoShapefile().then(res => {
+ const form = getForm();
+ const filterValues = form.getFieldsValue();
+ MainExportapprovalCaseInfoShapefile(filterValues).then(res => {
const elink = document.createElement('a');
elink.download = '待审核矢量数据' + new Date().getTime() + '.zip';
elink.style.display = 'none';