From 82b160daceaf9ab2eddad6a8855d244615a42834 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Thu, 12 Sep 2024 08:57:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=9B=BE=E6=96=91=E5=88=97=E8=A1=A8=E7=AD=9B=E9=80=89=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/global.ts                           | 12 +++
 .../keyissuesI/curbspotcity/MapList/index.vue |  4 +-
 .../keyissuesI/patchsummary/index.vue         |  4 +-
 .../patchsummary/patchsummary.data.ts         | 91 +++++++++---------
 .../curbspotcity/MapList/index.vue            |  4 +-
 .../keyissuesII/patchsummary/index.vue        |  4 +-
 .../patchsummary/patchsummary.data.ts         | 95 +++++++++----------
 7 files changed, 110 insertions(+), 104 deletions(-)

diff --git a/src/utils/global.ts b/src/utils/global.ts
index b1127248..4261c510 100644
--- a/src/utils/global.ts
+++ b/src/utils/global.ts
@@ -33,6 +33,12 @@ export const mapTypeOptions = [
   { label: '违法', value: 1 },
   { label: '其他', value: 2 },
 ];
+export const keyIssuesIIMapTypeOptions = [
+  { label: '合法', value: 0 },
+  { label: '违法', value: 1 },
+  { label: '其他', value: 2 },
+  { label: '自建自用', value: 3 },
+];
 export const illegalTypeOptions = [
   { label: '非农化', value: 0 },
   { label: '非粮化', value: 1 },
@@ -48,6 +54,12 @@ export const mapStatusOptions = [
   { label: '市级驳回', value: '市级驳回' },
   { label: '县级驳回', value: '县级驳回' },
 ];
+export const keyProblemMapStatusOptions = [
+  { label: '待接收', value: '待接收' },
+  { label: '待填报', value: '待填报' },
+  { label: '市级驳回', value: '市级驳回' },
+  { label: '县级驳回', value: '县级驳回' },
+];
 export const auditMapStatusOptions = [
   { label: '市级驳回', value: '市级驳回' },
   { label: '县级驳回', value: '县级驳回' },
diff --git a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/index.vue b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/index.vue
index 2cf775fb..bb15d79b 100644
--- a/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/index.vue
+++ b/src/views/demo/keyproblem/keyissuesI/curbspotcity/MapList/index.vue
@@ -130,7 +130,7 @@
                   v-model:value="props.infoScreenData.mapStatus"
                   @change="(value) => emits('mapListScreenChange',value,'mapStatus')"
                   style="width: 100%" 
-                  :options="mapStatusOptions"></a-checkbox-group>
+                  :options="keyProblemMapStatusOptions"></a-checkbox-group>
                 </div>
             </div>
             <!-- <div style="display:flex;">
@@ -298,7 +298,7 @@ import {
   mapTypeOptions,
   illegalTypeOptions,
   measureOptions,
-  mapStatusOptions,
+  keyProblemMapStatusOptions,
   markTypeOptions,
   patchSourceOptions,
   isOverdueOptions,
diff --git a/src/views/demo/keyproblem/keyissuesI/patchsummary/index.vue b/src/views/demo/keyproblem/keyissuesI/patchsummary/index.vue
index 931369d4..c7ae17a8 100644
--- a/src/views/demo/keyproblem/keyissuesI/patchsummary/index.vue
+++ b/src/views/demo/keyproblem/keyissuesI/patchsummary/index.vue
@@ -13,7 +13,7 @@
             showArrow
             mode="multiple"
             v-model:value="nowStatus"
-            :options="nowStatusOptions"
+            :options="keyProblemMapStatusOptions"
             :max-tag-count="1"
             placeholder="请选择"
             @change="changeStatus"
@@ -108,7 +108,7 @@
   import { BasicForm, useForm } from '@/components/Form';
   import { PageWrapper } from '@/components/Page';
   import dayjs from 'dayjs';
-  import { nowStatusOptions } from '@/utils/global';
+  import { keyProblemMapStatusOptions } from '@/utils/global';
   import { message } from 'ant-design-vue';
 
   const { VITE_GLOB_API_URL } = getAppEnvConfig();
diff --git a/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts b/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts
index ddcf7e8b..c6003524 100644
--- a/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts
+++ b/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts
@@ -4,7 +4,7 @@ import {
   patchSourceOptions,
   yearOptions,
   markTypeOptions,
-  nowStatusOptions,
+  keyProblemMapStatusOptions,
   mapTypeOptions,
 } from '@/utils/global';
 
@@ -119,16 +119,7 @@ export const searchFormSchema: FormSchema[] = [
       options: [],
     },
   },
-  {
-    field: '[startTime, endTime]',
-    label: '下发时间',
-    component: 'RangePicker',
-    colProps: { span: 8 },
-    componentProps: {
-      format: 'YYYY-MM-DD',
-      placeholder: ['开始日期', '结束日期'],
-    },
-  },
+  
   {
     field: 'typename',
     label: '图斑类型',
@@ -166,7 +157,6 @@ export const searchFormSchema: FormSchema[] = [
         valueField: 'id',
         onChange: () => {
           formModel.streetid = '';
-          formModel.communityid = '';
         },
       };
     },
@@ -184,34 +174,31 @@ export const searchFormSchema: FormSchema[] = [
         resultField: 'result',
         labelField: 'name',
         valueField: 'id',
-        onChange: () => {
-          formModel.communityid = '';
-        },
-      };
-    },
-  },
-  {
-    field: 'communityid',
-    label: '村',
-    component: 'ApiSelect',
-    colProps: { span: 4 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: formModel.countyid && formModel.streetid && getChildrenTree,
-        params: { parentId: formModel.streetid },
-        // 接口参数
-        resultField: 'result',
-        labelField: 'name',
-        valueField: 'id',
       };
     },
   },
+  // {
+  //   field: 'communityid',
+  //   label: '村',
+  //   component: 'ApiSelect',
+  //   colProps: { span: 4 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       api: formModel.countyid && formModel.streetid && getChildrenTree,
+  //       params: { parentId: formModel.streetid },
+  //       // 接口参数
+  //       resultField: 'result',
+  //       labelField: 'name',
+  //       valueField: 'id',
+  //     };
+  //   },
+  // },
   {
     field: 'nowStatus',
     label: '当前状态',
     component: 'Select',
     componentProps: {
-      options: nowStatusOptions,
+      options: keyProblemMapStatusOptions,
     },
     colProps: { span: 4 },
     slot: 'dangqianzhuangtai',
@@ -225,18 +212,18 @@ export const searchFormSchema: FormSchema[] = [
       options: mapTypeOptions,
     },
   },
-  {
-    field: 'weifaleixing',
-    label: '违法类型',
-    component: 'Select',
-    colProps: { span: 4 },
-    componentProps: {
-      options: [
-        { label: '非农化违法用地', value: '0' },
-        { label: '非粮化违法用地', value: '1' },
-      ],
-    },
-  },
+  // {
+  //   field: 'weifaleixing',
+  //   label: '违法类型',
+  //   component: 'Select',
+  //   colProps: { span: 4 },
+  //   componentProps: {
+  //     options: [
+  //       { label: '非农化违法用地', value: '0' },
+  //       { label: '非粮化违法用地', value: '1' },
+  //     ],
+  //   },
+  // },
   {
     field: 'measureName',
     label: '整改措施',
@@ -244,8 +231,8 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: {
       options: [
-        { label: '拆除复耕', value: '0' },
-        { label: '补办手续', value: '1' },
+        { label: '拆除', value: '1' },
+        { label: '拆除复耕', value: '2' },
       ],
     },
   },
@@ -275,10 +262,20 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 4 },
   },
+  {
+    field: '[startTime, endTime]',
+    label: '下发时间',
+    component: 'RangePicker',
+    colProps: { span: 5 },
+    componentProps: {
+      format: 'YYYY-MM-DD',
+      placeholder: ['开始日期', '结束日期'],
+    },
+  },
   {
     field: 'caseNo',
     label: '图斑编号',
     component: 'Input',
-    colProps: { span: 20 },
+    colProps: { span: 6 },
   },
 ];
diff --git a/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/index.vue b/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/index.vue
index 7a4c4fdb..553a47fd 100644
--- a/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/index.vue
+++ b/src/views/demo/keyproblem/keyissuesII/curbspotcity/MapList/index.vue
@@ -130,7 +130,7 @@
                   v-model:value="props.infoScreenData.mapStatus"
                   @change="(value) => emits('mapListScreenChange',value,'mapStatus')"
                   style="width: 100%" 
-                  :options="mapStatusOptions"></a-checkbox-group>
+                  :options="keyProblemMapStatusOptions"></a-checkbox-group>
                 </div>
             </div>
             <!-- <div style="display:flex;">
@@ -298,7 +298,7 @@ import {
   mapTypeOptions,
   illegalTypeOptions,
   measureOptions,
-  mapStatusOptions,
+  keyProblemMapStatusOptions,
   markTypeOptions,
   patchSourceOptions,
   isOverdueOptions,
diff --git a/src/views/demo/keyproblem/keyissuesII/patchsummary/index.vue b/src/views/demo/keyproblem/keyissuesII/patchsummary/index.vue
index 30c96438..cec4a424 100644
--- a/src/views/demo/keyproblem/keyissuesII/patchsummary/index.vue
+++ b/src/views/demo/keyproblem/keyissuesII/patchsummary/index.vue
@@ -13,7 +13,7 @@
             showArrow
             mode="multiple"
             v-model:value="nowStatus"
-            :options="nowStatusOptions"
+            :options="keyProblemMapStatusOptions"
             :max-tag-count="1"
             placeholder="请选择"
             @change="changeStatus"
@@ -108,7 +108,7 @@
   import { BasicForm, useForm } from '@/components/Form';
   import { PageWrapper } from '@/components/Page';
   import dayjs from 'dayjs';
-  import { nowStatusOptions } from '@/utils/global';
+  import { keyProblemMapStatusOptions } from '@/utils/global';
   import { message } from 'ant-design-vue';
 
   const { VITE_GLOB_API_URL } = getAppEnvConfig();
diff --git a/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts b/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts
index ddcf7e8b..53e02a5b 100644
--- a/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts
+++ b/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts
@@ -4,8 +4,8 @@ import {
   patchSourceOptions,
   yearOptions,
   markTypeOptions,
-  nowStatusOptions,
-  mapTypeOptions,
+  keyProblemMapStatusOptions,
+  keyIssuesIIMapTypeOptions,
 } from '@/utils/global';
 
 export const columns: BasicColumn[] = [
@@ -119,16 +119,7 @@ export const searchFormSchema: FormSchema[] = [
       options: [],
     },
   },
-  {
-    field: '[startTime, endTime]',
-    label: '下发时间',
-    component: 'RangePicker',
-    colProps: { span: 8 },
-    componentProps: {
-      format: 'YYYY-MM-DD',
-      placeholder: ['开始日期', '结束日期'],
-    },
-  },
+  
   {
     field: 'typename',
     label: '图斑类型',
@@ -166,7 +157,6 @@ export const searchFormSchema: FormSchema[] = [
         valueField: 'id',
         onChange: () => {
           formModel.streetid = '';
-          formModel.communityid = '';
         },
       };
     },
@@ -184,34 +174,31 @@ export const searchFormSchema: FormSchema[] = [
         resultField: 'result',
         labelField: 'name',
         valueField: 'id',
-        onChange: () => {
-          formModel.communityid = '';
-        },
-      };
-    },
-  },
-  {
-    field: 'communityid',
-    label: '村',
-    component: 'ApiSelect',
-    colProps: { span: 4 },
-    componentProps: ({ formModel }) => {
-      return {
-        api: formModel.countyid && formModel.streetid && getChildrenTree,
-        params: { parentId: formModel.streetid },
-        // 接口参数
-        resultField: 'result',
-        labelField: 'name',
-        valueField: 'id',
       };
     },
   },
+  // {
+  //   field: 'communityid',
+  //   label: '村',
+  //   component: 'ApiSelect',
+  //   colProps: { span: 4 },
+  //   componentProps: ({ formModel }) => {
+  //     return {
+  //       api: formModel.countyid && formModel.streetid && getChildrenTree,
+  //       params: { parentId: formModel.streetid },
+  //       // 接口参数
+  //       resultField: 'result',
+  //       labelField: 'name',
+  //       valueField: 'id',
+  //     };
+  //   },
+  // },
   {
     field: 'nowStatus',
     label: '当前状态',
     component: 'Select',
     componentProps: {
-      options: nowStatusOptions,
+      options: [],
     },
     colProps: { span: 4 },
     slot: 'dangqianzhuangtai',
@@ -222,21 +209,21 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Select',
     colProps: { span: 4 },
     componentProps: {
-      options: mapTypeOptions,
-    },
-  },
-  {
-    field: 'weifaleixing',
-    label: '违法类型',
-    component: 'Select',
-    colProps: { span: 4 },
-    componentProps: {
-      options: [
-        { label: '非农化违法用地', value: '0' },
-        { label: '非粮化违法用地', value: '1' },
-      ],
+      options: keyIssuesIIMapTypeOptions,
     },
   },
+  // {
+  //   field: 'weifaleixing',
+  //   label: '违法类型',
+  //   component: 'Select',
+  //   colProps: { span: 4 },
+  //   componentProps: {
+  //     options: [
+  //       { label: '非农化违法用地', value: '0' },
+  //       { label: '非粮化违法用地', value: '1' },
+  //     ],
+  //   },
+  // },
   {
     field: 'measureName',
     label: '整改措施',
@@ -244,8 +231,8 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
     componentProps: {
       options: [
-        { label: '拆除复耕', value: '0' },
-        { label: '补办手续', value: '1' },
+        { label: '拆除', value: '1' },
+        { label: '没收', value: '2' },
       ],
     },
   },
@@ -275,10 +262,20 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
     colProps: { span: 4 },
   },
+  {
+    field: '[startTime, endTime]',
+    label: '下发时间',
+    component: 'RangePicker',
+    colProps: { span: 5 },
+    componentProps: {
+      format: 'YYYY-MM-DD',
+      placeholder: ['开始日期', '结束日期'],
+    },
+  },
   {
     field: 'caseNo',
     label: '图斑编号',
     component: 'Input',
-    colProps: { span: 20 },
+    colProps: { span: 6 },
   },
 ];

From 8b91b5ef55599ba08ec84d9c36499458fd24226c Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Thu, 12 Sep 2024 09:24:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=A1=E6=9F=A5=E5=AE=A1=E8=AE=A1=EF=BC=8C=E8=80=95?=
 =?UTF-8?q?=E5=9C=B0=E9=9D=9E=E7=B2=AE=E5=8C=96=E5=9B=BE=E6=96=91=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=EF=BC=8C=E5=9B=BE=E6=96=91=E5=88=97=E8=A1=A8=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../patchsummary/patchsummary.data.ts         | 31 ++++++++++------
 .../patchsummary/patchsummary.data.ts         | 35 ++++++++++++-------
 .../patchsummary/patchsummary.data.ts         | 31 ++++++++++------
 .../patchsummary/patchsummary.data.ts         | 31 ++++++++++------
 4 files changed, 86 insertions(+), 42 deletions(-)

diff --git a/src/views/demo/degraining/patchsummary/patchsummary.data.ts b/src/views/demo/degraining/patchsummary/patchsummary.data.ts
index 90b7d5d0..2dcf1e6d 100644
--- a/src/views/demo/degraining/patchsummary/patchsummary.data.ts
+++ b/src/views/demo/degraining/patchsummary/patchsummary.data.ts
@@ -1,5 +1,6 @@
 import { BasicColumn, FormSchema } from '@/components/Table';
 import { getChildrenTree } from '@/api/demo/system';
+import { getLoad } from '@/api/sys/sysDataItemDetail';
 import {
   patchSourceOptions,
   yearOptions,
@@ -104,10 +105,17 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'tubanlaiyuan',
     label: '图斑来源',
-    component: 'Select',
+    component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: {
-      options: patchSourceOptions,
+    componentProps: ({ formModel }) => {
+      return {
+        api: getLoad,
+        params: { code: 'gdflhtbly' },
+        // 接口参数
+        resultField: 'result',
+        labelField: 'itemName',
+        valueField: 'itemValue',
+      };
     },
   },
   {
@@ -122,14 +130,17 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'typename',
     label: '图斑类型',
-    component: 'Select',
+    component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: {
-      options: [
-        { label: '农用地', value: '农用地' },
-        { label: '建设用地', value: '建设用地' },
-        { label: '推堆土', value: '推堆土' },
-      ],
+    componentProps: ({ formModel }) => {
+      return {
+        api: getLoad,
+        params: { code: 'gdflhtblx' },
+        // 接口参数
+        resultField: 'result',
+        labelField: 'itemName',
+        valueField: 'itemValue',
+      };
     },
   },
   {
diff --git a/src/views/demo/inspectionaudit/patchsummary/patchsummary.data.ts b/src/views/demo/inspectionaudit/patchsummary/patchsummary.data.ts
index 731df07d..7ef4447b 100644
--- a/src/views/demo/inspectionaudit/patchsummary/patchsummary.data.ts
+++ b/src/views/demo/inspectionaudit/patchsummary/patchsummary.data.ts
@@ -1,5 +1,6 @@
 import { BasicColumn, FormSchema } from '@/components/Table';
 import { getChildrenTree } from '@/api/demo/system';
+import { getLoad } from '@/api/sys/sysDataItemDetail';
 import {
   patchSourceOptions,
   yearOptions,
@@ -104,10 +105,17 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'tubanlaiyuan',
     label: '图斑来源',
-    component: 'Select',
+    component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: {
-      options: patchSourceOptions,
+    componentProps: ({ formModel }) => {
+      return {
+        api: getLoad,
+        params: { code: 'xcsjtbly' },
+        // 接口参数
+        resultField: 'result',
+        labelField: 'itemName',
+        valueField: 'itemValue',
+      };
     },
   },
   {
@@ -122,14 +130,17 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'typename',
     label: '图斑类型',
-    component: 'Select',
+    component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: {
-      options: [
-        { label: '农用地', value: '农用地' },
-        { label: '建设用地', value: '建设用地' },
-        { label: '推堆土', value: '推堆土' },
-      ],
+    componentProps: ({ formModel }) => {
+      return {
+        api: getLoad,
+        params: { code: 'xcsjtblx' },
+        // 接口参数
+        resultField: 'result',
+        labelField: 'itemName',
+        valueField: 'itemValue',
+      };
     },
   },
   {
@@ -243,7 +254,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'originalcaseno',
     label: '标识号',
     component: 'Input',
-    colProps: { span: 4 },
+    colProps: { span: 3 },
   },
   {
     field: '[startTime, endTime]',
@@ -259,6 +270,6 @@ export const searchFormSchema: FormSchema[] = [
     field: 'caseNo',
     label: '图斑编号',
     component: 'Input',
-    colProps: { span: 4 },
+    colProps: { span: 5 },
   },
 ];
diff --git a/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts b/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts
index c6003524..4f5c5251 100644
--- a/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts
+++ b/src/views/demo/keyproblem/keyissuesI/patchsummary/patchsummary.data.ts
@@ -1,5 +1,6 @@
 import { BasicColumn, FormSchema } from '@/components/Table';
 import { getChildrenTree } from '@/api/demo/system';
+import { getLoad } from '@/api/sys/sysDataItemDetail';
 import {
   patchSourceOptions,
   yearOptions,
@@ -104,10 +105,17 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'tubanlaiyuan',
     label: '图斑来源',
-    component: 'Select',
+    component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: {
-      options: patchSourceOptions,
+    componentProps: ({ formModel }) => {
+      return {
+        api: getLoad,
+        params: { code: 'zd1tbly' },
+        // 接口参数
+        resultField: 'result',
+        labelField: 'itemName',
+        valueField: 'itemValue',
+      };
     },
   },
   {
@@ -123,14 +131,17 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'typename',
     label: '图斑类型',
-    component: 'Select',
+    component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: {
-      options: [
-        { label: '农用地', value: '农用地' },
-        { label: '建设用地', value: '建设用地' },
-        { label: '推堆土', value: '推堆土' },
-      ],
+    componentProps: ({ formModel }) => {
+      return {
+        api: getLoad,
+        params: { code: 'zd1tblx' },
+        // 接口参数
+        resultField: 'result',
+        labelField: 'itemName',
+        valueField: 'itemValue',
+      };
     },
   },
   {
diff --git a/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts b/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts
index 53e02a5b..fea6a948 100644
--- a/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts
+++ b/src/views/demo/keyproblem/keyissuesII/patchsummary/patchsummary.data.ts
@@ -1,5 +1,6 @@
 import { BasicColumn, FormSchema } from '@/components/Table';
 import { getChildrenTree } from '@/api/demo/system';
+import { getLoad } from '@/api/sys/sysDataItemDetail';
 import {
   patchSourceOptions,
   yearOptions,
@@ -104,10 +105,17 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'tubanlaiyuan',
     label: '图斑来源',
-    component: 'Select',
+    component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: {
-      options: patchSourceOptions,
+    componentProps: ({ formModel }) => {
+      return {
+        api: getLoad,
+        params: { code: 'zd2tbly' },
+        // 接口参数
+        resultField: 'result',
+        labelField: 'itemName',
+        valueField: 'itemValue',
+      };
     },
   },
   {
@@ -123,14 +131,17 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'typename',
     label: '图斑类型',
-    component: 'Select',
+    component: 'ApiSelect',
     colProps: { span: 4 },
-    componentProps: {
-      options: [
-        { label: '农用地', value: '农用地' },
-        { label: '建设用地', value: '建设用地' },
-        { label: '推堆土', value: '推堆土' },
-      ],
+    componentProps: ({ formModel }) => {
+      return {
+        api: getLoad,
+        params: { code: 'zd2tblx' },
+        // 接口参数
+        resultField: 'result',
+        labelField: 'itemName',
+        valueField: 'itemValue',
+      };
     },
   },
   {

From d8249be27394a1caf939695c10db0863c3544701 Mon Sep 17 00:00:00 2001
From: Zhufu <1176354795@qq.com>
Date: Thu, 12 Sep 2024 09:47:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=87=E6=8D=A2tabs=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/workflow/task/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/demo/workflow/task/index.vue b/src/views/demo/workflow/task/index.vue
index 511971f1..a8dee6d0 100644
--- a/src/views/demo/workflow/task/index.vue
+++ b/src/views/demo/workflow/task/index.vue
@@ -5,6 +5,7 @@
       :tabBarStyle="tabBarStyle"
       v-model:activeKey="componentCode"
       @change="changeKey"
+      :destroyInactiveTabPane="true"
     >
       <template v-for="item in settingList" :key="item.key">
         <TabPane :tab="item.name">