From b204de0dc71049b1497c306257de9309442f41a8 Mon Sep 17 00:00:00 2001
From: wangzenghua <1048523306@qq.com>
Date: Wed, 2 Apr 2025 10:13:20 +0100
Subject: [PATCH] unit

---
 .../views/plantingAndBreeding/base/index.vue  | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/sub-government-affairs-service/src/views/plantingAndBreeding/base/index.vue b/sub-government-affairs-service/src/views/plantingAndBreeding/base/index.vue
index ca32cb6..cd95d4b 100644
--- a/sub-government-affairs-service/src/views/plantingAndBreeding/base/index.vue
+++ b/sub-government-affairs-service/src/views/plantingAndBreeding/base/index.vue
@@ -34,20 +34,18 @@
   </div>
 </template>
 <script setup>
-import { ref, reactive, onMounted } from 'vue';
-import { useRouter } from 'vue-router';
+import { ref, reactive } from 'vue';
 import { useApp } from '@/hooks';
 import { useUserStore } from '@/store/modules/user';
 import { CRUD_OPTIONS } from '@/config';
 import { isEmpty, setDicData, debounce } from '@/utils';
-import { CommonDicData } from '@/apis';
+// import { CommonDicData } from '@/apis';
 import { getLandsList } from '@/apis/land';
 import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, UpdateStatus } from '@/apis/plantingAndBreeding/base';
 
 const { VITE_APP_BASE_API } = import.meta.env;
 const app = useApp();
 const UserStore = useUserStore();
-const router = useRouter();
 const crudRef = ref(null);
 const state = reactive({
   loading: false,
@@ -147,8 +145,9 @@ const state = reactive({
         disabled: true,
         labelTip: '请先选择地块！',
         formatter: (row) => {
-          const item = state.unitList.find((v) => v.dictValue == row.unit);
-          return row.area + (!isEmpty(item) ? item.dictLabel : '平方米');
+          // const item = state.unitList.find((v) => v.dictValue == row.unit);
+          // return row.area + (!isEmpty(item) ? item.dictLabel : '平方米');
+          return row.area + (!isEmpty(row.unit) ? row.unit : '平方米');
         },
       },
       {
@@ -243,18 +242,18 @@ const state = reactive({
 });
 
 // 加载
-const getUnit = async () => {
-  CommonDicData('sys_unit_type')
-    .then((res) => {
-      console.log(250, res);
-      if (res.code === 200) {
-        state.unitList = res.data;
-      }
-    })
-    .catch((err) => {
-      app.$message.error(err.msg);
-    });
-};
+// const getUnit = async () => {
+//   CommonDicData('sys_unit_type')
+//     .then((res) => {
+//       console.log(250, res);
+//       if (res.code === 200) {
+//         state.unitList = res.data;
+//       }
+//     })
+//     .catch((err) => {
+//       app.$message.error(err.msg);
+//     });
+// };
 
 const loadData = async () => {
   state.loading = true;
@@ -281,9 +280,9 @@ const loadData = async () => {
 
 loadData();
 
-onMounted(() => {
-  getUnit();
-});
+// onMounted(() => {
+//   getUnit();
+// });
 
 // 页数
 const currentChange = (current) => {