From 7ad9541e85ad49406d4f8effeafed9e19fc786fb Mon Sep 17 00:00:00 2001
From: zhufu <17863654727@163.com>
Date: Thu, 30 Oct 2025 15:24:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=B1=E5=8D=A0=E8=80=95=E5=9C=B0=E5=BB=BA?=
 =?UTF-8?q?=E6=88=BF=E7=BA=BF=E7=B4=A2=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C=E6=96=87=E5=AD=97=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/farmland/ShowInfoModal/index.vue     |  8 +-------
 src/components/farmland/SplitPolygonModal/index.vue |  8 +-------
 src/components/farmland/util.ts                     |  6 ++++++
 src/views/demo/farmland/patchsummary/index.vue      | 10 +++++++++-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/components/farmland/ShowInfoModal/index.vue b/src/components/farmland/ShowInfoModal/index.vue
index 10565f76..b36083ef 100644
--- a/src/components/farmland/ShowInfoModal/index.vue
+++ b/src/components/farmland/ShowInfoModal/index.vue
@@ -208,7 +208,7 @@
     resultOptions,
     qitaUseTOOptions,
   } from '@/utils/global';
-  import { getYongtufenleiSpan } from '@/components/farmland/util'
+  import { getYongtufenleiSpan, yesOrNoOptions } from '@/components/farmland/util'
 
   const { createMessage } = useMessage();
   const { VITE_GLOB_INFO_IMAGE_URL } = getAppEnvConfig();
@@ -436,12 +436,6 @@ const handleCancelPreviewFile = ()=>{
       return false;
     }
   };
-  const yesOrNoOptions = (value) => {
-    if(value == null){
-      return ''
-    }
-    return value == '1'? '是': '否'
-  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/farmland/SplitPolygonModal/index.vue b/src/components/farmland/SplitPolygonModal/index.vue
index 073b9fda..ae58748a 100644
--- a/src/components/farmland/SplitPolygonModal/index.vue
+++ b/src/components/farmland/SplitPolygonModal/index.vue
@@ -432,7 +432,7 @@
     resultOptions,
     qitaUseTOOptions,
   } from '@/utils/global';
-  import { getYongtufenleiSpan } from '@/components/farmland/util'
+  import { getYongtufenleiSpan, yesOrNoOptions } from '@/components/farmland/util'
   import { getLoadDroneCaseInfoDetail } from '@/api/farmland/index.ts';
   import ShowInfoModal from '@/components/farmland/ShowInfoModal/index.vue';
   import { dataProcessing ,dataProcessingCount} from '@/views/demo/tiankongdi/util.ts';
@@ -1158,12 +1158,6 @@ import { itemProps } from '@/components/Menu/src/props';
     }
     return true;
   };
-  const yesOrNoOptions = (value) => {
-    if(value == null){
-      return ''
-    }
-    return value == '1'? '是': '否'
-  }
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/farmland/util.ts b/src/components/farmland/util.ts
index 59848106..2e929f15 100644
--- a/src/components/farmland/util.ts
+++ b/src/components/farmland/util.ts
@@ -58,4 +58,10 @@ export const getYongtufenleiSpan = (value) => {
     return item.value == value
   })
   return record?.label
+}
+export const yesOrNoOptions = (value) => {
+  if(value == null){
+    return ''
+  }
+  return value == '1'? '是': '否'
 }
\ No newline at end of file
diff --git a/src/views/demo/farmland/patchsummary/index.vue b/src/views/demo/farmland/patchsummary/index.vue
index 0e9247cb..5de57a5a 100644
--- a/src/views/demo/farmland/patchsummary/index.vue
+++ b/src/views/demo/farmland/patchsummary/index.vue
@@ -48,9 +48,16 @@
           <PermissionBtn @btn-event="onBtnClicked" />
         </template>
         <template #bodyCell="{ column, record }">
-          <template v-if="['area', 'gengdiarea', 'nongyongdiarea'].includes(column.key)">
+          <template v-if="['area', 'gengdiarea', 'yongjiujibennongtian_area', 'sandiaojsyd_area', 'sandiaonyd_area', 
+            'sandiaogd_area', 'jsyd_area_2022', 'nyd_area_2022', 'gd_area_2022', 'taoheyn_area'].includes(column.key)">
             {{ dataProcessingCount(record[column.key]) }}
           </template>
+          <template v-if="['is_zhanyongsthx', 'is_zhanyongzdqy', 'is_chufa', 'is_chuzhiwancheng'].includes(column.key)">
+            {{ yesOrNoOptions(record[column.key]) }}
+          </template>
+          <template v-if="['yongtufenlei'].includes(column.key)">
+            {{ getYongtufenleiSpan(record[column.key]) }}
+          </template>
           <template v-if="column.key === 'action'">
             <TableAction
               :actions="[
@@ -110,6 +117,7 @@
   import dayjs from 'dayjs';
   import { message } from 'ant-design-vue';
   import { xcsjNowStatusOptions } from '@/utils/global';
+  import { getYongtufenleiSpan, yesOrNoOptions } from '@/components/farmland/util'
 
   const { VITE_GLOB_API_URL } = getAppEnvConfig();