diff --git a/main/.env.development b/main/.env.development
index 6e8881e..8fed54f 100644
--- a/main/.env.development
+++ b/main/.env.development
@@ -16,5 +16,5 @@ VITE_APP_UPLOAD_API = '/uploadApis'
 VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
 VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
 # 内网接口地址
-# VITE_APP_BASE_URL = 'http://192.168.18.74:8080'
-# VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080'
+# VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+# VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development
index 1b4ea19..2d00994 100644
--- a/sub-government-affairs-service/.env.development
+++ b/sub-government-affairs-service/.env.development
@@ -13,5 +13,5 @@ VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
 VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
 
 # 内网接口地址
-# VITE_APP_BASE_URL = 'http://192.168.18.74:8080'
-# VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080'
+# VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+# VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
diff --git a/sub-government-affairs-service/src/apis/businessEntity/index.js b/sub-government-affairs-service/src/apis/businessEntity/index.js
index eb2d682..b06ea45 100644
--- a/sub-government-affairs-service/src/apis/businessEntity/index.js
+++ b/sub-government-affairs-service/src/apis/businessEntity/index.js
@@ -2,48 +2,58 @@
 import request from '@/utils/axios';
 
 /**
- * 生产经营主体 - 新增
- * @param {Object} data 经营主体数据
- */
-export function saveBusinessSubject(data) {
-  return request({
-    url: '/product-business/business/businessSave',
-    method: 'post',
-    data,
-  });
-}
-
-/**
- * 生产经营主体 - 编辑
- * @param {Object} data 经营主体数据
- */
-export function editBusinessSubject(data) {
-  return request({
-    url: '/product-business/business/businessEdit',
-    method: 'put',
-    data,
-  });
-}
-
-/**
- * 生产经营主体 - 分页查询
+ * 生产经营主体农户 - 列表查询
  * @param {Object} params 查询参数
  */
-export function fetchBusinessSubjectList(params) {
+export function getFarmerList(params) {
   return request({
-    url: '/product-business/business/businessPage',
+    url: '/product-business/business/farmer/businessPage',
     method: 'get',
     params,
   });
 }
 
 /**
- * 生产经营主体 - 详情查询
+ * 生产经营主体农户 - 新增
+ * @param {Object} data 经营主体数据
+ */
+export function saveFarmerList(data) {
+  return request({
+    url: '/product-business/business/farmer/businessSave',
+    method: 'post',
+    data,
+  });
+}
+
+/**
+ * 生产经营主体农户 - 编辑
+ * @param {Object} data 经营主体数据
+ */
+export function editFarmer(data) {
+  return request({
+    url: '/product-business/business/farmer/businessEdit',
+    method: 'put',
+    data,
+  });
+}
+/**
+ * 生产经营主体农户 - 审批
+ * @param {Object} data 审批数据
+ */
+export function approveFarmer(data) {
+  return request({
+    url: '/product-business/business/farmer/businessApproval',
+    method: 'put',
+    data,
+  });
+}
+/**
+ * 生产经营主体农户 - 详情查询
  * @param {string} id 主体ID
  */
 export function fetchBusinessSubjectInfo(id) {
   return request({
-    url: `/product-business/business/businessInfo/${id}`,
+    url: `/product-business/business/farmer/businessInfo/${id}`,
     method: 'get',
   });
 }
diff --git a/sub-government-affairs-service/src/components/AreaCascader/index.vue b/sub-government-affairs-service/src/components/AreaCascader/index.vue
index 8e498bb..1920dfa 100644
--- a/sub-government-affairs-service/src/components/AreaCascader/index.vue
+++ b/sub-government-affairs-service/src/components/AreaCascader/index.vue
@@ -42,24 +42,9 @@
 </template>
 
 <script setup>
-/**
- * @description 区域选择组件
- * 该组件用于选择行政区域和对应的网格，支持级联选择和动态加载网格列表。
- * 组件接受以下 props：
- * - regionCode: 当前选中的区域编码
- * - gridId: 当前选中的网格ID
- * - label: 组件标签，默认为 '所属区域-网格：'
- * - placeholder: 组件占位符，默认为 '请选择区域'
- * - width: 组件宽度，默认为 500px
- * - showSeparator: 是否显示分隔符，默认为 false
- * - separator: 分隔符，默认为 '-'
- * - splitRows: 是否分行显示，默认为 false
- * * 组件会在 mounted 时加载行政区域数据，并根据选中的区域动态加载对应的网格列表。
- * * 组件会在选中区域或网格时触发 update:regionCode 和 update:gridId 事件，用于更新外部绑定的值。
- */
 import { ref, watch, onMounted, computed } from 'vue';
 import { ElCascader, ElSelect, ElOption } from 'element-plus';
-import axios from 'axios';
+import request from '@/utils/axios';
 import { useUserStore } from '@/store/modules/user';
 
 const props = defineProps({
@@ -75,10 +60,14 @@ const props = defineProps({
     type: String,
     default: '行政区域-网格：',
   },
-  placeholder: {
+  areaPlaceholder: {
     type: String,
     default: '请选择区域',
   },
+  gridPlaceholder: {
+    type: String,
+    default: '请选择网格',
+  },
   width: {
     type: [Number, String],
     default: 500,
@@ -111,12 +100,13 @@ const selectedGridId = ref(props.gridId);
 // 获取行政区域数据
 const fetchAreaData = async () => {
   try {
-    const res = await axios.get(`${import.meta.env.VITE_APP_BASE_API}/system/area/region?areaCode=530000`, {
-      headers: {
-        authorization: userStore.token,
+    // 使用 request 发起请求，将查询参数放在 params 中
+    const res = await request.get('/system/area/region', {
+      params: {
+        areaCode: '530000',
       },
     });
-    areaOptions.value = res.data?.data ?? [];
+    areaOptions.value = res.data ?? [];
   } catch (err) {
     console.error('区域数据加载失败', err);
   }
@@ -126,12 +116,13 @@ const fetchAreaData = async () => {
 const fetchGridList = async (regionCode) => {
   if (!regionCode) return;
   try {
-    const res = await axios.get(`${import.meta.env.VITE_APP_BASE_API}/land-resource/gridManage/page?regionCode=${regionCode}`, {
-      headers: {
-        authorization: userStore.token,
+    // 使用 request 发起请求，将查询参数放在 params 中
+    const res = await request.get('/land-resource/gridManage/page', {
+      params: {
+        regionCode: regionCode,
       },
     });
-    gridOptions.value = res.data?.data?.records ?? [];
+    gridOptions.value = res.data?.records ?? [];
   } catch (err) {
     console.error('网格数据加载失败', err);
   }
diff --git a/sub-government-affairs-service/src/components/AreaSelect/index.vue b/sub-government-affairs-service/src/components/AreaSelect/index.vue
new file mode 100644
index 0000000..3af5001
--- /dev/null
+++ b/sub-government-affairs-service/src/components/AreaSelect/index.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="area-select-container" :style="{ width: width + 'px' }">
+    <div v-if="label" class="area-select-label">{{ label }}</div>
+    <el-cascader v-model="selectedAreaPath" :options="areaOptions" :props="cascaderProps" :placeholder="placeholder" style="flex: 1" clearable />
+  </div>
+</template>
+
+<script setup>
+import { ref, watch, onMounted, computed } from 'vue';
+import request from '@/utils/axios';
+import { useUserStore } from '@/store/modules/user';
+
+const props = defineProps({
+  modelValue: {
+    type: Array,
+    default: () => [],
+  },
+  label: {
+    type: String,
+    default: '所属行政区域：',
+  },
+  placeholder: {
+    type: String,
+    default: '请选择行政区域',
+  },
+  width: {
+    type: [Number, String],
+    default: 500,
+  },
+});
+
+const emit = defineEmits(['update:modelValue']);
+
+const userStore = useUserStore();
+
+const areaOptions = ref([]);
+const selectedAreaPath = ref([...props.modelValue]);
+
+// 自定义字段映射
+const cascaderProps = computed(() => ({
+  label: 'areaName',
+  value: 'areaCode',
+  children: 'areaChildVOS',
+  emitPath: true,
+  expandTrigger: 'hover',
+}));
+
+const fetchAreaData = async () => {
+  try {
+    const res = await request.get('/system/area/region', {
+      params: {
+        areaCode: '530000',
+      },
+    });
+    areaOptions.value = res.data ?? [];
+  } catch (err) {
+    console.error('加载行政区域失败', err);
+  }
+};
+
+// 外部更新 => 内部同步
+watch(
+  () => props.modelValue,
+  (val) => {
+    selectedAreaPath.value = [...val];
+  }
+);
+
+// 内部更新 => 外部同步
+watch(selectedAreaPath, (val) => {
+  emit('update:modelValue', val);
+});
+
+onMounted(() => {
+  fetchAreaData();
+});
+</script>
+
+<style scoped>
+.area-select-container {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.area-select-label {
+  font-size: 14px;
+  color: #606266;
+  width: 120px;
+  line-height: 32px;
+  text-align: right;
+}
+</style>
diff --git a/sub-government-affairs-service/src/components/UrlSelect/index.vue b/sub-government-affairs-service/src/components/UrlSelect/index.vue
index 30688a1..1aedec8 100644
--- a/sub-government-affairs-service/src/components/UrlSelect/index.vue
+++ b/sub-government-affairs-service/src/components/UrlSelect/index.vue
@@ -79,22 +79,17 @@ const options = ref([]);
 
 // -------------- ⑤ 请求数据的函数  --------------
 async function fetchOptions() {
-  console.log('fetchOptions :>> ', props.url, props.params);
+  // console.log('fetchOptions :>> ', props.url, props.params);
   if (!props.url) return;
-  try {
-    const res = await request.get(props.url, { params: props.params });
-    // 假设后端返回格式: { code: 200, data: { records: [ {...}, {...} ] } }
-    // 也可能是直接 data: [{...}, {...}]
-    const records = res.data.records;
-    if (Array.isArray(records)) {
-      options.value = records;
-      //   console.log('option', options.value);
-    } else {
-      options.value = [];
-      console.log('UrlSelect：接口返回数据格式不是数组，无法解析成 options');
-    }
-  } catch (err) {
-    console.error('UrlSelect：拉取选项失败', err);
+  const res = await request.get(props.url, { params: props.params });
+
+  const records = res.data.records;
+  if (Array.isArray(records)) {
+    options.value = records;
+    //   console.log('option', options.value);
+  } else {
+    options.value = [];
+    console.log('UrlSelect：接口返回数据格式不是数组，无法解析成 options');
   }
 }
 
diff --git a/sub-government-affairs-service/src/utils/axios.js b/sub-government-affairs-service/src/utils/axios.js
index 1e2e70f..a6611ac 100644
--- a/sub-government-affairs-service/src/utils/axios.js
+++ b/sub-government-affairs-service/src/utils/axios.js
@@ -22,8 +22,11 @@ const errorHandler = async (error) => {
   const { response, code, message } = error;
   const UserStore = useUserStore();
   // 1. 处理超时错误
-  if (code === 'ECONNABORTED' || message.includes('timeout')) {
-    ElNotification.error('请求超时，请检查网络或稍后重试');
+  if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
+    ElNotification.error({
+      message: '请求超时',
+      description: '请检查网络或稍后重试',
+    });
     return Promise.reject({ code: 'TIMEOUT', message: '请求超时' });
   }
   // 2. 处理HTTP状态码错误
@@ -116,13 +119,7 @@ publicAxios.interceptors.response.use(
     throw new Error(response.data.msg);
   },
   (error) => {
-    // 1. 直接处理超时错误（避免进入 errorHandler 重复提示）
-    if (error.code === 'ECONNABORTED' || error.message.includes('timeout')) {
-      ElNotification.error('请求超时，请稍后重试');
-      return Promise.reject({ code: 'TIMEOUT', message: '请求超时' });
-    }
-
-    // 2. 其他错误交给 errorHandler 处理（如 401 跳登录页）
+    // 处理错误
     return errorHandler(error);
   }
 );
diff --git a/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue b/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue
index 8413adf..6d9e854 100644
--- a/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue
@@ -137,179 +137,34 @@ const state = reactive({
       {
         label: '任务编号',
         prop: 'taskCode',
-        fixed: true,
-        search: true,
-        editDisplay: false,
-        addDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
       },
       {
         label: '任务名称',
         prop: 'taskName',
-        search: true,
-        width: '240px',
-        showOverflowTooltip: true,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
       },
       {
         label: '任务成员',
-        search: true,
         prop: 'taskMembers',
-        disabled: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
       },
       {
         label: '巡查类型',
         prop: 'inspectionType',
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
       },
       {
         label: '巡查对象',
         prop: 'inspectionTarget',
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
       },
       {
         label: '注意事项',
         prop: 'notes',
-        type: 'textarea',
-        minRows: 2, // 设置最小行数
-        maxRows: 5, // 设置最大行数
-        editDisplay: false,
-        rows: 1,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
       },
       {
         label: '是否违法',
         prop: 'isIllegal',
-        editDisplay: false,
-        addDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
       },
       {
         label: '状态',
         prop: 'inspectionStatus',
-        editDisplay: false,
-        addDisplay: false,
-      },
-    ],
-    group: [
-      {
-        label: '任务信息>',
-        prop: 'caseInfo',
-        addDisplay: false,
-        column: [
-          {
-            label: '任务编号',
-            prop: 'taskCode',
-            render: ({ row }) => {
-              return h('span', {}, row.taskCode);
-            },
-          },
-          {
-            label: '任务名称',
-            prop: 'taskName',
-            render: ({ row }) => {
-              return h('span', {}, row.taskCode);
-            },
-          },
-          {
-            label: '任务成员',
-            prop: 'taskMembers',
-            render: ({ row }) => {
-              return h('span', {}, row.taskCode);
-            },
-          },
-          {
-            label: '巡查类型',
-            prop: 'inspectionType',
-            render: ({ row }) => {
-              return h('span', {}, row.taskCode);
-            },
-          },
-          {
-            label: '巡查对象',
-            prop: 'inspectionTarget',
-            render: ({ row }) => {
-              return h('span', {}, row.taskCode);
-            },
-          },
-          {
-            label: '注意事项',
-            prop: 'notes',
-            render: ({ row }) => {
-              return h('span', {}, row.taskCode);
-            },
-          },
-        ],
-      },
-      {
-        label: '巡查信息登记>',
-        prop: 'caseInfo',
-        addDisplay: false,
-        column: [
-          {
-            label: '是否违法',
-            prop: 'isIllegal',
-            span: 24,
-            display: true,
-            type: 'radio',
-            editDisplay: true,
-            disabled: isDisabled,
-            dicData: [
-              {
-                label: '是',
-                value: '1',
-              },
-              {
-                label: '否',
-                value: '0',
-              },
-            ],
-          },
-          {
-            label: '巡查情况',
-            prop: 'inspectionSituation',
-            type: 'textarea',
-            disabled: isDisabled,
-            span: 24,
-            minRows: 3, // 设置最小行数
-            maxRows: 5, // 设置最大行数
-            display: true,
-            editDisplay: true,
-          },
-        ],
       },
     ],
     actions: [
diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue
index afcf590..b9cdb79 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue
@@ -1,736 +1,9 @@
 <template>
-  <div class="custom-page">
-    <avue-crud
-      ref="crudRef"
-      v-model="state.form"
-      v-model:search="state.query"
-      v-model:page="state.pageData"
-      :table-loading="state.loading"
-      :data="data"
-      :option="state.options"
-      @refresh-change="refreshChange"
-      @search-reset="searchChange"
-      @search-change="searchChange"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @row-save="rowSave"
-      @row-update="rowUpdate"
-      @row-del="rowDel"
-    >
-      <template #menu-left>
-        <!-- <el-button type="primary" icon="Upload" @click="onImport">导入</el-button> -->
-        <el-button type="danger" icon="Delete" @click="onBatchDel">批量删除</el-button>
-      </template>
-
-      <template #license-form="{ row, column, value }">
-        <uploadImg :img-url="licenseImg" name="license" @file-change="fileChange"></uploadImg>
-      </template>
-      <template #permit-form="{ row, column, value }">
-        <uploadImg :img-url="permitImg" name="permit" @file-change="fileChange"></uploadImg>
-      </template>
-
-      <template #menu="scope">
-        <custom-table-operate :actions="state.options.actions" :data="scope" />
-      </template>
-    </avue-crud>
-  </div>
+  <div></div>
 </template>
+
 <script setup>
-import { reactive, ref, h } from 'vue';
-import { useApp } from '@/hooks';
-import { CRUD_OPTIONS } from '@/config';
-import { isEmpty, downloadFile } from '@/utils';
-import { useUserStore } from '@/store/modules/user';
-import {
-  getOperationRecord,
-  saveOperationRecord,
-  editOperationRecord,
-  delOperationRecord,
-  exportOperationRecord,
-  getAddrCropByLand,
-  importOperationRecord,
-} from '@/apis/land';
-import uploadImg from '../components/uploadImg.vue';
-
-const { VITE_APP_BASE_API } = import.meta.env;
-const app = useApp();
-const UserStore = useUserStore();
-const crudRef = ref(null);
-const handleLandChange = async (value, form, done) => {
-  if (!value || !value.item || !value.item.id) return; // 如果没有选择任何地块，则直接返回
-  let val = {};
-  getAddrCropByLand(value.item?.id || '')
-    .then((res) => {
-      if (res.code === 200) {
-        val = res.data || {};
-      }
-    })
-    .catch((err) => {
-      val = {};
-    })
-    .finally(() => {});
-  state.form.crop = val?.crop || value.item?.crop;
-  state.form.address = val?.county + val?.town + val?.village || value.item?.address;
-};
-
-const productTypeOptions = reactive([
-  { label: '蔬菜', value: '0' },
-  { label: '水果', value: '1' },
-  { label: '畜产品', value: '2' },
-  { label: '水产品', value: '3' },
-  { label: '谷物', value: '4' },
-  { label: '农资', value: '5' },
-  { label: '种源', value: '6' },
-  { label: '农产品加工', value: '7' },
-  { label: '其他', value: '8' },
-]);
-
-const bTypeOptions = reactive([
-  { label: '农户', value: '0' },
-  // { label: '种植', value: '1' },
-  { label: '合作社', value: '2' },
-]);
-
-let timeVal = ref([]);
-const licenseImg = ref('');
-const permitImg = ref('');
-const data = reactive([
-  {
-    crop1: '100001',
-    crop2: '耿马佑氏种植专业合作社',
-    crop3: '蔬菜',
-    crop4: '>20人',
-    crop5: '云南省临沧市耿马县耿马镇城区甘东村允楞芒抗山',
-    crop6: '何仙义',
-    crop7: '18008834114',
-    crop8: '93530926MA6K3M3K5U',
-    crop9: '图片',
-    crop10: '无固定期限',
-    crop11: '已通过',
-    crop12: '暂无',
-    crop13: '2025-03-01',
-  },
-  {
-    crop1: '100002',
-    crop2: '耿马金田园种植专业合作社',
-    crop3: '蔬菜',
-    crop4: '>20人',
-    crop5: '云南省临沧市耿马县四排山公路6公里处',
-    crop6: '董福良',
-    crop7: '13578302599',
-    crop8: '93530926MA6N6C4N8U',
-    crop9: '图片',
-    crop10: '无固定期限',
-    crop11: '已通过',
-    crop12: '暂无',
-    crop13: '2025-01-01',
-  },
-  {
-    crop1: '100003',
-    crop2: '耿马原生茶叶种植专业合作社',
-    crop3: '蔬菜',
-    crop4: '>20人',
-    crop5: '云南省临沧市耿马县四排山公路20公里处',
-    crop6: '李伟荣',
-    crop7: '13529623147',
-    crop8: '935309260752901376',
-    crop9: '图片',
-    crop10: '无固定期限',
-    crop11: '已通过',
-    crop12: '暂无',
-    crop13: '2025-02-11',
-  },
-  {
-    crop1: '100004',
-    crop2: '耿马华侨金果源农业专业合作社',
-    crop3: '蔬菜',
-    crop4: '>20人',
-    crop5: '云南省临沧市耿马县华侨管理区第五居民小组',
-    crop6: '严共洪',
-    crop7: '13987011022',
-    crop8: '93530926MA6L3A7F8T',
-    crop9: '图片',
-    crop10: '无固定期限',
-    crop11: '已通过',
-    crop12: '暂无',
-    crop13: '2025-03-01',
-  },
-  {
-    crop1: '100005',
-    crop2: '耿马尖山沿边魔芋种植农民专业合作社',
-    crop3: '蔬菜',
-    crop4: '>20人',
-    crop5: '云南省临沧市耿马傣族佤族自治县孟定镇尖山村沿线9公里处',
-    crop6: '商德伟',
-    crop7: '13888526321',
-    crop8: '93530926MA6KR6E41C',
-    crop9: '图片',
-    crop10: '无固定期限',
-    crop11: '已通过',
-    crop12: '暂无',
-    crop13: '2025-04-25',
-  },
-]);
-
-const state = reactive({
-  loading: false,
-  query: {
-    current: 1,
-    size: 10,
-  },
-  form: {},
-  selection: [],
-  options: {
-    ...CRUD_OPTIONS,
-    addBtnText: '添加',
-    searchLabelWidth: '120px',
-    searchSpan: 8,
-    searchGutter: 100,
-    searchMenuPosition: 'center',
-    column: [
-      {
-        label: '主体代码',
-        prop: 'crop1',
-        addDisplay: false,
-        editDisplay: false,
-        search: true,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '主体名称',
-        prop: 'crop2',
-        search: true,
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '经营产品种类',
-        prop: 'crop3',
-        type: 'select',
-        remote: false,
-        search: true,
-        addDisplay: false,
-        editDisplay: false,
-        props: {
-          label: 'landName',
-          value: 'id',
-        },
-        dicHeaders: {
-          authorization: UserStore.token,
-        },
-        dicUrl: `${VITE_APP_BASE_API}/land-resource/landManage/page?current=1&size=9999&draftsSaveType=0&landName=&gridName=&owner=`,
-        dicFormatter: (res) => res.data.records ?? [],
-        rules: [
-          {
-            required: true,
-            message: '请选择地块',
-            trigger: 'blur',
-          },
-        ],
-        change: handleLandChange,
-      },
-      // {
-      //   label: '主要经营产品',
-      //   showOverflowTooltip: true,
-      //   search: false,
-      //   addDisplay: false,
-      //   editDisplay: false,
-      //   rules: {
-      //     required: true,
-      //     message: '请输入',
-      //     trigger: 'blur',
-      //   },
-      // },
-      {
-        label: '合作社规模',
-        prop: 'crop4',
-        search: false,
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      // {
-      //   label: '网格区域',
-      //   prop: 'cities',
-      //   type: 'cascader',
-      //   hide: true,
-      //   addDisplay: true,
-      //   editDisplay: true,
-      //   viewDisplay: false,
-      //   // multiple: true,
-      //   // checkStrictly: true,
-      //   // collapseTags: true,
-      //   // emitPath: false,
-      //   // checkDescendants: false,
-      //   props: {
-      //     label: 'areaName',
-      //     value: 'areaCode',
-      //     children: 'areaChildVOS',
-      //   },
-      //   dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`,
-      //   dicHeaders: {
-      //     authorization: UserStore.token,
-      //   },
-      //   dicFormatter: (res) => res.data ?? [],
-      //   rules: {
-      //     required: true,
-      //     message: '请选择',
-      //     trigger: 'blur',
-      //   },
-      // },
-      {
-        label: '合作社地址',
-        prop: 'crop5',
-        type: 'cascader',
-        addDisplay: false,
-        editDisplay: false,
-        checkStrictly: false,
-        search: false,
-        props: {
-          label: 'areaName',
-          value: 'areaCode',
-          children: 'areaChildVOS',
-        },
-        dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`,
-        dicHeaders: {
-          authorization: UserStore.token,
-        },
-        dicFormatter: (res) => res.data ?? [],
-        rules: [
-          {
-            required: true,
-            message: '请选择',
-            trigger: 'blur',
-          },
-        ],
-      },
-      {
-        label: '负责人',
-        prop: 'crop6',
-        search: false,
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '负责人电话',
-        prop: 'crop7',
-        search: false,
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '企业信用代码',
-        prop: 'crop8',
-        search: false,
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      // {
-      //   label: '经营许可证',
-      //   prop: 'crop9',
-      //   search: false,
-      //   addDisplay: false,
-      //   editDisplay: false,
-      //   rules: {
-      //     required: true,
-      //     message: '请输入',
-      //     trigger: 'blur',
-      //   },
-      // },
-      {
-        label: '经营有效期',
-        prop: 'crop10',
-        search: false,
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '审核状态',
-        prop: 'crop11',
-        addDisplay: false,
-        editDisplay: false,
-        search: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '审核意见',
-        prop: 'crop12',
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      { label: '创建时间', prop: 'crop13', addDisplay: false, editDisplay: false, search: false },
-    ],
-    group: [
-      {
-        label: '基本信息>',
-        prop: 'caseInfo',
-        column: [
-          {
-            label: '主体名称',
-            prop: 'businessName',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-          },
-          {
-            label: '合作社类型',
-            prop: 'bType',
-            type: 'select',
-            dicData: bTypeOptions,
-            rules: { required: true, message: '请选择', trigger: 'blur' },
-          },
-          {
-            label: '经营产品种类',
-            type: 'select',
-            dicData: productTypeOptions,
-            rules: { required: true, message: '请选择', trigger: 'blur' },
-          },
-          {
-            label: '主要产品',
-            prop: 'primaryProduct',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
-          },
-          {
-            label: '合作社规模',
-            prop: 'inspectionType',
-            rules: { required: false, message: '请选择', trigger: 'blur' },
-          },
-          {
-            label: '负责人',
-            prop: 'inspectionTarget',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
-          },
-          {
-            label: '负责人电话',
-            prop: 'inspectionTarget',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
-          },
-          {
-            label: '合作社地址',
-            prop: 'villageCode',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-            type: 'cascader',
-            props: {
-              label: 'areaName',
-              value: 'areaCode',
-              children: 'areaChildVOS',
-            },
-            dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`,
-            dicHeaders: {
-              authorization: UserStore.token,
-            },
-            dicFormatter: (res) => res.data ?? [],
-          },
-          {
-            label: '详细地址',
-            prop: 'notes',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-          },
-        ],
-      },
-      {
-        label: '营业执照>',
-        prop: 'caseInfo',
-        column: [
-          {
-            label: '统一社会信用代码',
-            prop: 'notes',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-          },
-          {
-            label: '营业执照',
-            prop: 'license',
-          },
-          {
-            label: '有效期至',
-            prop: 'operationDate',
-            type: 'date',
-            format: 'YYYY-MM-DD',
-            valueFormat: 'YYYY-MM-DD',
-            width: 200,
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-          },
-          {
-            label: '经营项目',
-            prop: 'inspectionSituation',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-          },
-        ],
-      },
-      {
-        label: '经营许可证>',
-        prop: 'caseInfo',
-        column: [
-          {
-            label: '经营许可证编号',
-            prop: 'operationType',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
-          },
-          {
-            label: '经营许可证',
-            prop: 'permit',
-            rules: { required: false, message: '请选择', trigger: 'blur' },
-          },
-          {
-            label: '有效期至',
-            prop: 'operationDate',
-            type: 'date',
-            format: 'YYYY-MM-DD',
-            valueFormat: 'YYYY-MM-DD',
-            width: 200,
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-          },
-        ],
-      },
-    ],
-    searchColumn: [
-      { label: '主体代码', prop: 'landName', search: true },
-      { label: '主体名称', prop: 'crop', search: true },
-      {
-        label: '经营产品种类',
-        prop: 'operationType',
-        type: 'select',
-        search: true,
-        dicData: productTypeOptions,
-      },
-      {
-        label: '创建日期',
-        prop: 'operationDate',
-        type: 'daterange',
-        format: 'YYYY-MM-DD',
-        valueFormat: 'YYYY-MM-DD',
-        width: 200,
-        search: true,
-      },
-    ],
-    actions: [
-      {
-        name: '详情',
-        icon: 'View',
-        event: ({ row }) => doDetail(row),
-      },
-      {
-        name: '编辑',
-        icon: 'edit',
-        event: ({ row }) => rowEdit(row),
-      },
-      {
-        type: 'danger',
-        name: '删除',
-        icon: 'delete',
-        event: ({ row }) => rowDel(row),
-      },
-    ],
-  },
-  pageData: {
-    total: 0,
-    currentPage: 1,
-    pageSize: 10,
-  },
-  data: [],
-  currentRow: {},
-});
-
-// 加载
-const loadData = () => {
-  // state.loading = true;
-  // getOperationRecord(state.query)
-  //   .then((res) => {
-  //     if (res.code === 200) {
-  //       const { current, size, total, records } = res.data;
-  //       state.data = records;
-  //       state.pageData = {
-  //         currentPage: current || 1,
-  //         pageSize: size || 10,
-  //         total: total,
-  //       };
-  //     }
-  //   })
-  //   .catch((err) => {
-  //     app.$message.error(err.msg);
-  //     state.data = [];
-  //   })
-  //   .finally(() => {
-  //     state.loading = false;
-  //   });
-};
-
-loadData();
-
-// 页数
-const currentChange = (current) => {
-  state.query.current = current;
-  loadData();
-};
-
-// 条数
-const sizeChange = (size) => {
-  state.query.size = size;
-  loadData();
-};
-
-// 搜索
-const searchChange = (params, done) => {
-  if (done) done();
-  state.query = params;
-  state.query.current = 1;
-  loadData();
-};
-
-// 刷新
-const refreshChange = () => {
-  loadData();
-  app.$message.success('刷新成功');
-};
-
-// 选择
-const selectionChange = (rows) => {
-  state.selection = rows;
-};
-
-const handleIds = () => {
-  let datalist = state.selection.map((m) => {
-    return { landId: m.landId, landName: m.landName };
-  });
-
-  let selectIdlist = uniqueObjects(datalist, 'landId');
-  let selectIdsVal = selectIdlist.map((n) => {
-    return n.landId;
-  });
-
-  return selectIdsVal.toString() || '';
-};
-
-function uniqueObjects(arr, key) {
-  return arr.reduce((acc, current) => {
-    const duplicate = acc.find((element) => element[key] === current[key]);
-    if (!duplicate) {
-      acc.push(current);
-    }
-    return acc;
-  }, []);
-}
-// 新增
-const rowSave = (row, done, loading) => {
-  // console.info('新增', row);
-  saveOperationRecord(row)
-    .then((res) => {
-      if (res.code === 200) {
-        app.$message.success('添加成功！');
-        done();
-        loadData();
-      }
-    })
-    .catch((err) => {
-      app.$message.error(err.msg);
-    })
-    .finally(() => {
-      loading();
-    });
-};
-
-// 编辑
-const rowEdit = (row) => {
-  console.info('编辑', row);
-  crudRef.value.rowEdit(row);
-};
-
-const doDetail = (row) => {
-  crudRef.value.rowView(row);
-};
-const rowUpdate = (row, index, done, loading) => {
-  console.info('更新');
-  editOperationRecord(row)
-    .then((res) => {
-      if (res.code === 200) {
-        app.$message.success('更新成功！');
-        done();
-        loadData();
-      }
-    })
-    .catch((err) => {
-      app.$message.error(err.msg);
-    })
-    .finally(() => {
-      loading();
-    });
-};
-
-// 删除
-const rowDel = (row, index, done) => {
-  if (isEmpty(row)) return;
-  app
-    .$confirm(`删除后信息将不可查看，确认要删除吗？`, '确定删除', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    })
-    .then(() => {
-      console.info('删除', row.recordId);
-      delOperationRecord(row.recordId || '')
-        .then((res) => {
-          if (res.code === 200) {
-            app.$message.success('删除成功！');
-            loadData();
-            done();
-          }
-        })
-        .catch((err) => {
-          app.$message.error(err.msg);
-        });
-    })
-    .catch(() => {});
-};
-
-const onBatchDel = () => {
-  let ids = handleIds();
-  if (!ids.length || ids.length <= 0) {
-    return app.$message.error('请先选择要删除的数据');
-  }
-};
-
-const fileChange = (name, list) => {
-  console.info('父组件', list);
-};
+import { ref, watch, onMounted, computed } from 'vue';
 </script>
+
+<style scoped lang="scss"></style>
diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/oldindex.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/oldindex.vue
new file mode 100644
index 0000000..90e9ba1
--- /dev/null
+++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/oldindex.vue
@@ -0,0 +1,712 @@
+<template>
+  <div class="custom-page">
+    <avue-crud ref="crudRef" v-model:page="pageData" :data="filteredData" :option="crudOptions" :table-loading="loading">
+      <template #menu-left>
+        <!-- <el-button type="primary" icon="Upload" @click="onImport">导入</el-button> -->
+        <el-button type="danger" icon="Delete" @click="onBatchDel">批量删除</el-button>
+      </template>
+
+      <template #menu="scope">
+        <custom-table-operate :actions="state.options.actions" :data="scope" />
+      </template>
+    </avue-crud>
+  </div>
+</template>
+<script setup>
+import { reactive, ref, h } from 'vue';
+import { useApp } from '@/hooks';
+import { CRUD_OPTIONS } from '@/config';
+import { isEmpty, downloadFile } from '@/utils';
+import { useUserStore } from '@/store/modules/user';
+import {
+  getOperationRecord,
+  saveOperationRecord,
+  editOperationRecord,
+  delOperationRecord,
+  exportOperationRecord,
+  getAddrCropByLand,
+  importOperationRecord,
+} from '@/apis/land';
+import uploadImg from '../components/uploadImg.vue';
+
+const { VITE_APP_BASE_API } = import.meta.env;
+const app = useApp();
+const UserStore = useUserStore();
+const crudRef = ref(null);
+const handleLandChange = async (value, form, done) => {
+  if (!value || !value.item || !value.item.id) return; // 如果没有选择任何地块，则直接返回
+  let val = {};
+  getAddrCropByLand(value.item?.id || '')
+    .then((res) => {
+      if (res.code === 200) {
+        val = res.data || {};
+      }
+    })
+    .catch((err) => {
+      val = {};
+    })
+    .finally(() => {});
+  state.form.crop = val?.crop || value.item?.crop;
+  state.form.address = val?.county + val?.town + val?.village || value.item?.address;
+};
+
+const productTypeOptions = reactive([
+  { label: '蔬菜', value: '0' },
+  { label: '水果', value: '1' },
+  { label: '畜产品', value: '2' },
+  { label: '水产品', value: '3' },
+  { label: '谷物', value: '4' },
+  { label: '农资', value: '5' },
+  { label: '种源', value: '6' },
+  { label: '农产品加工', value: '7' },
+  { label: '其他', value: '8' },
+]);
+
+const bTypeOptions = reactive([
+  { label: '农户', value: '0' },
+  // { label: '种植', value: '1' },
+  { label: '合作社', value: '2' },
+]);
+
+let timeVal = ref([]);
+const licenseImg = ref('');
+const permitImg = ref('');
+const data = reactive([
+  {
+    crop1: '100001',
+    crop2: '耿马佑氏种植专业合作社',
+    crop3: '蔬菜',
+    crop4: '>20人',
+    crop5: '云南省临沧市耿马县耿马镇城区甘东村允楞芒抗山',
+    crop6: '何仙义',
+    crop7: '18008834114',
+    crop8: '93530926MA6K3M3K5U',
+    crop9: '图片',
+    crop10: '无固定期限',
+    crop11: '已通过',
+    crop12: '暂无',
+    crop13: '2025-03-01',
+  },
+  {
+    crop1: '100002',
+    crop2: '耿马金田园种植专业合作社',
+    crop3: '蔬菜',
+    crop4: '>20人',
+    crop5: '云南省临沧市耿马县四排山公路6公里处',
+    crop6: '董福良',
+    crop7: '13578302599',
+    crop8: '93530926MA6N6C4N8U',
+    crop9: '图片',
+    crop10: '无固定期限',
+    crop11: '已通过',
+    crop12: '暂无',
+    crop13: '2025-01-01',
+  },
+  {
+    crop1: '100003',
+    crop2: '耿马原生茶叶种植专业合作社',
+    crop3: '蔬菜',
+    crop4: '>20人',
+    crop5: '云南省临沧市耿马县四排山公路20公里处',
+    crop6: '李伟荣',
+    crop7: '13529623147',
+    crop8: '935309260752901376',
+    crop9: '图片',
+    crop10: '无固定期限',
+    crop11: '已通过',
+    crop12: '暂无',
+    crop13: '2025-02-11',
+  },
+  {
+    crop1: '100004',
+    crop2: '耿马华侨金果源农业专业合作社',
+    crop3: '蔬菜',
+    crop4: '>20人',
+    crop5: '云南省临沧市耿马县华侨管理区第五居民小组',
+    crop6: '严共洪',
+    crop7: '13987011022',
+    crop8: '93530926MA6L3A7F8T',
+    crop9: '图片',
+    crop10: '无固定期限',
+    crop11: '已通过',
+    crop12: '暂无',
+    crop13: '2025-03-01',
+  },
+  {
+    crop1: '100005',
+    crop2: '耿马尖山沿边魔芋种植农民专业合作社',
+    crop3: '蔬菜',
+    crop4: '>20人',
+    crop5: '云南省临沧市耿马傣族佤族自治县孟定镇尖山村沿线9公里处',
+    crop6: '商德伟',
+    crop7: '13888526321',
+    crop8: '93530926MA6KR6E41C',
+    crop9: '图片',
+    crop10: '无固定期限',
+    crop11: '已通过',
+    crop12: '暂无',
+    crop13: '2025-04-25',
+  },
+]);
+
+const state = reactive({
+  loading: false,
+  query: {
+    current: 1,
+    size: 10,
+  },
+  form: {},
+  selection: [],
+  options: {
+    ...CRUD_OPTIONS,
+    addBtnText: '添加',
+    searchLabelWidth: '120px',
+    searchSpan: 8,
+    searchGutter: 100,
+    searchMenuPosition: 'center',
+    column: [
+      {
+        label: '主体代码',
+        prop: 'crop1',
+        addDisplay: false,
+        editDisplay: false,
+        search: true,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '主体名称',
+        prop: 'crop2',
+        search: true,
+        addDisplay: false,
+        editDisplay: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '经营产品种类',
+        prop: 'crop3',
+        type: 'select',
+        remote: false,
+        search: true,
+        addDisplay: false,
+        editDisplay: false,
+        props: {
+          label: 'landName',
+          value: 'id',
+        },
+        dicHeaders: {
+          authorization: UserStore.token,
+        },
+        dicUrl: `${VITE_APP_BASE_API}/land-resource/landManage/page?current=1&size=9999&draftsSaveType=0&landName=&gridName=&owner=`,
+        dicFormatter: (res) => res.data.records ?? [],
+        rules: [
+          {
+            required: true,
+            message: '请选择地块',
+            trigger: 'blur',
+          },
+        ],
+        change: handleLandChange,
+      },
+      // {
+      //   label: '主要经营产品',
+      //   showOverflowTooltip: true,
+      //   search: false,
+      //   addDisplay: false,
+      //   editDisplay: false,
+      //   rules: {
+      //     required: true,
+      //     message: '请输入',
+      //     trigger: 'blur',
+      //   },
+      // },
+      {
+        label: '合作社规模',
+        prop: 'crop4',
+        search: false,
+        addDisplay: false,
+        editDisplay: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      // {
+      //   label: '网格区域',
+      //   prop: 'cities',
+      //   type: 'cascader',
+      //   hide: true,
+      //   addDisplay: true,
+      //   editDisplay: true,
+      //   viewDisplay: false,
+      //   // multiple: true,
+      //   // checkStrictly: true,
+      //   // collapseTags: true,
+      //   // emitPath: false,
+      //   // checkDescendants: false,
+      //   props: {
+      //     label: 'areaName',
+      //     value: 'areaCode',
+      //     children: 'areaChildVOS',
+      //   },
+      //   dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`,
+      //   dicHeaders: {
+      //     authorization: UserStore.token,
+      //   },
+      //   dicFormatter: (res) => res.data ?? [],
+      //   rules: {
+      //     required: true,
+      //     message: '请选择',
+      //     trigger: 'blur',
+      //   },
+      // },
+      {
+        label: '合作社地址',
+        prop: 'crop5',
+        type: 'cascader',
+        addDisplay: false,
+        editDisplay: false,
+        checkStrictly: false,
+        search: false,
+        props: {
+          label: 'areaName',
+          value: 'areaCode',
+          children: 'areaChildVOS',
+        },
+        dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`,
+        dicHeaders: {
+          authorization: UserStore.token,
+        },
+        dicFormatter: (res) => res.data ?? [],
+        rules: [
+          {
+            required: true,
+            message: '请选择',
+            trigger: 'blur',
+          },
+        ],
+      },
+      {
+        label: '负责人',
+        prop: 'crop6',
+        search: false,
+        addDisplay: false,
+        editDisplay: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '负责人电话',
+        prop: 'crop7',
+        search: false,
+        addDisplay: false,
+        editDisplay: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '企业信用代码',
+        prop: 'crop8',
+        search: false,
+        addDisplay: false,
+        editDisplay: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      // {
+      //   label: '经营许可证',
+      //   prop: 'crop9',
+      //   search: false,
+      //   addDisplay: false,
+      //   editDisplay: false,
+      //   rules: {
+      //     required: true,
+      //     message: '请输入',
+      //     trigger: 'blur',
+      //   },
+      // },
+      {
+        label: '经营有效期',
+        prop: 'crop10',
+        search: false,
+        addDisplay: false,
+        editDisplay: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '审核状态',
+        prop: 'crop11',
+        addDisplay: false,
+        editDisplay: false,
+        search: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '审核意见',
+        prop: 'crop12',
+        addDisplay: false,
+        editDisplay: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      { label: '创建时间', prop: 'crop13', addDisplay: false, editDisplay: false, search: false },
+    ],
+    group: [
+      {
+        label: '基本信息>',
+        prop: 'caseInfo',
+        column: [
+          {
+            label: '主体名称',
+            prop: 'businessName',
+            rules: { required: true, message: '请输入', trigger: 'blur' },
+          },
+          {
+            label: '合作社类型',
+            prop: 'bType',
+            type: 'select',
+            dicData: bTypeOptions,
+            rules: { required: true, message: '请选择', trigger: 'blur' },
+          },
+          {
+            label: '经营产品种类',
+            type: 'select',
+            dicData: productTypeOptions,
+            rules: { required: true, message: '请选择', trigger: 'blur' },
+          },
+          {
+            label: '主要产品',
+            prop: 'primaryProduct',
+            rules: { required: false, message: '请输入', trigger: 'blur' },
+          },
+          {
+            label: '合作社规模',
+            prop: 'inspectionType',
+            rules: { required: false, message: '请选择', trigger: 'blur' },
+          },
+          {
+            label: '负责人',
+            prop: 'inspectionTarget',
+            rules: { required: false, message: '请输入', trigger: 'blur' },
+          },
+          {
+            label: '负责人电话',
+            prop: 'inspectionTarget',
+            rules: { required: false, message: '请输入', trigger: 'blur' },
+          },
+          {
+            label: '合作社地址',
+            prop: 'villageCode',
+            rules: { required: true, message: '请输入', trigger: 'blur' },
+            type: 'cascader',
+            props: {
+              label: 'areaName',
+              value: 'areaCode',
+              children: 'areaChildVOS',
+            },
+            dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`,
+            dicHeaders: {
+              authorization: UserStore.token,
+            },
+            dicFormatter: (res) => res.data ?? [],
+          },
+          {
+            label: '详细地址',
+            prop: 'notes',
+            rules: { required: true, message: '请输入', trigger: 'blur' },
+          },
+        ],
+      },
+      {
+        label: '营业执照>',
+        prop: 'caseInfo',
+        column: [
+          {
+            label: '统一社会信用代码',
+            prop: 'notes',
+            rules: { required: true, message: '请输入', trigger: 'blur' },
+          },
+          {
+            label: '营业执照',
+            prop: 'license',
+          },
+          {
+            label: '有效期至',
+            prop: 'operationDate',
+            type: 'date',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
+            width: 200,
+            rules: { required: true, message: '请输入', trigger: 'blur' },
+          },
+          {
+            label: '经营项目',
+            prop: 'inspectionSituation',
+            rules: { required: true, message: '请输入', trigger: 'blur' },
+          },
+        ],
+      },
+      {
+        label: '经营许可证>',
+        prop: 'caseInfo',
+        column: [
+          {
+            label: '经营许可证编号',
+            prop: 'operationType',
+            rules: { required: false, message: '请输入', trigger: 'blur' },
+          },
+          {
+            label: '经营许可证',
+            prop: 'permit',
+            rules: { required: false, message: '请选择', trigger: 'blur' },
+          },
+          {
+            label: '有效期至',
+            prop: 'operationDate',
+            type: 'date',
+            format: 'YYYY-MM-DD',
+            valueFormat: 'YYYY-MM-DD',
+            width: 200,
+            rules: { required: true, message: '请输入', trigger: 'blur' },
+          },
+        ],
+      },
+    ],
+    searchColumn: [
+      { label: '主体代码', prop: 'landName', search: true },
+      { label: '主体名称', prop: 'crop', search: true },
+      {
+        label: '经营产品种类',
+        prop: 'operationType',
+        type: 'select',
+        search: true,
+        dicData: productTypeOptions,
+      },
+      {
+        label: '创建日期',
+        prop: 'operationDate',
+        type: 'daterange',
+        format: 'YYYY-MM-DD',
+        valueFormat: 'YYYY-MM-DD',
+        width: 200,
+        search: true,
+      },
+    ],
+    actions: [
+      {
+        name: '详情',
+        icon: 'View',
+        event: ({ row }) => doDetail(row),
+      },
+      {
+        name: '编辑',
+        icon: 'edit',
+        event: ({ row }) => rowEdit(row),
+      },
+      {
+        type: 'danger',
+        name: '删除',
+        icon: 'delete',
+        event: ({ row }) => rowDel(row),
+      },
+    ],
+  },
+  pageData: {
+    total: 0,
+    currentPage: 1,
+    pageSize: 10,
+  },
+  data: [],
+  currentRow: {},
+});
+
+// 加载
+const loadData = () => {
+  // state.loading = true;
+  // getOperationRecord(state.query)
+  //   .then((res) => {
+  //     if (res.code === 200) {
+  //       const { current, size, total, records } = res.data;
+  //       state.data = records;
+  //       state.pageData = {
+  //         currentPage: current || 1,
+  //         pageSize: size || 10,
+  //         total: total,
+  //       };
+  //     }
+  //   })
+  //   .catch((err) => {
+  //     app.$message.error(err.msg);
+  //     state.data = [];
+  //   })
+  //   .finally(() => {
+  //     state.loading = false;
+  //   });
+};
+
+loadData();
+
+// 页数
+const currentChange = (current) => {
+  state.query.current = current;
+  loadData();
+};
+
+// 条数
+const sizeChange = (size) => {
+  state.query.size = size;
+  loadData();
+};
+
+// 搜索
+const searchChange = (params, done) => {
+  if (done) done();
+  state.query = params;
+  state.query.current = 1;
+  loadData();
+};
+
+// 刷新
+const refreshChange = () => {
+  loadData();
+  app.$message.success('刷新成功');
+};
+
+// 选择
+const selectionChange = (rows) => {
+  state.selection = rows;
+};
+
+const handleIds = () => {
+  let datalist = state.selection.map((m) => {
+    return { landId: m.landId, landName: m.landName };
+  });
+
+  let selectIdlist = uniqueObjects(datalist, 'landId');
+  let selectIdsVal = selectIdlist.map((n) => {
+    return n.landId;
+  });
+
+  return selectIdsVal.toString() || '';
+};
+
+function uniqueObjects(arr, key) {
+  return arr.reduce((acc, current) => {
+    const duplicate = acc.find((element) => element[key] === current[key]);
+    if (!duplicate) {
+      acc.push(current);
+    }
+    return acc;
+  }, []);
+}
+// 新增
+const rowSave = (row, done, loading) => {
+  // console.info('新增', row);
+  saveOperationRecord(row)
+    .then((res) => {
+      if (res.code === 200) {
+        app.$message.success('添加成功！');
+        done();
+        loadData();
+      }
+    })
+    .catch((err) => {
+      app.$message.error(err.msg);
+    })
+    .finally(() => {
+      loading();
+    });
+};
+
+// 编辑
+const rowEdit = (row) => {
+  console.info('编辑', row);
+  crudRef.value.rowEdit(row);
+};
+
+const doDetail = (row) => {
+  crudRef.value.rowView(row);
+};
+const rowUpdate = (row, index, done, loading) => {
+  console.info('更新');
+  editOperationRecord(row)
+    .then((res) => {
+      if (res.code === 200) {
+        app.$message.success('更新成功！');
+        done();
+        loadData();
+      }
+    })
+    .catch((err) => {
+      app.$message.error(err.msg);
+    })
+    .finally(() => {
+      loading();
+    });
+};
+
+// 删除
+const rowDel = (row, index, done) => {
+  if (isEmpty(row)) return;
+  app
+    .$confirm(`删除后信息将不可查看，确认要删除吗？`, '确定删除', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      console.info('删除', row.recordId);
+      delOperationRecord(row.recordId || '')
+        .then((res) => {
+          if (res.code === 200) {
+            app.$message.success('删除成功！');
+            loadData();
+            done();
+          }
+        })
+        .catch((err) => {
+          app.$message.error(err.msg);
+        });
+    })
+    .catch(() => {});
+};
+
+const onBatchDel = () => {
+  let ids = handleIds();
+  if (!ids.length || ids.length <= 0) {
+    return app.$message.error('请先选择要删除的数据');
+  }
+};
+
+const fileChange = (name, list) => {
+  console.info('父组件', list);
+};
+</script>
diff --git a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
index a46ebde..0c30127 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
@@ -1,254 +1,510 @@
 <template>
   <div class="custom-page">
-    <avue-crud
-      ref="crudRef"
-      v-model="state.form"
-      v-model:page="state.pageData"
-      :table-loading="state.loading"
-      :data="state.data"
-      :option="state.options"
-      @refresh-change="refreshChange"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @row-save="rowSave"
-      @row-update="rowUpdate"
-      @row-del="rowDel"
-    >
-      <template #menu-left>
-        <!-- <el-button type="primary" icon="Upload" @click="onImport">导入</el-button> -->
-        <!-- <el-button type="danger" icon="Delete" @click="onBatchDel">批量删除</el-button> -->
+    <!-- 关键词搜索 -->
+    <el-form :inline="true" :model="searchForm" class="search-bar">
+      <el-form-item label="关键词">
+        <el-input v-model="searchForm.name" placeholder="请输入关键词" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 四个固定 Tabs -->
+    <el-tabs v-model="activeTab" @tab-click="handleTabChange">
+      <el-tab-pane label="待提交" name="0" />
+      <el-tab-pane label="待审核" name="1" />
+      <el-tab-pane label="已通过" name="2" />
+      <el-tab-pane label="已驳回" name="3" />
+    </el-tabs>
+
+    <!-- 表格 -->
+    <avue-crud ref="crudRef" v-model:page="pageData" :data="filteredData" :option="crudOptions" :table-loading="loading">
+      <template v-if="activeTab === '0'" #menu-left>
+        <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button>
       </template>
-
-      <!-- <template #operationDate-search>
-        <el-date-picker v-model="timeVal" type="daterange" style="width: 230px" start-placeholder="开始" end-placeholder="结束" />
-      </template> -->
-
       <template #menu="scope">
-        <custom-table-operate :actions="state.options.actions" :data="scope" />
+        <custom-table-operate :actions="getActions(scope.row)" :data="scope" />
       </template>
     </avue-crud>
+
+    <!-- 新增弹窗 -->
+    <el-dialog v-model="dialogVisible" title="新增" width="80%">
+      <el-form :model="formData" label-width="120px" class="custom-form">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="姓名" prop="name">
+              <el-input v-model="formData.name" placeholder="请输入姓名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="证件类型" prop="idType">
+              <el-select v-model="formData.idType" placeholder="请选择证件类型">
+                <el-option label="身份证" value="1" />
+                <el-option label="护照" value="2" />
+                <el-option label="港澳身份证" value="3" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="证件号码" prop="idCard">
+              <el-input v-model="formData.idCard" placeholder="请输入证件号码" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="性别" prop="sex">
+              <el-radio-group v-model="formData.sex">
+                <el-radio label="1">男</el-radio>
+                <el-radio label="0">女</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="年龄" prop="age">
+              <el-input v-model="formData.age" placeholder="请输入年龄" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input v-model="formData.phone" placeholder="请输入联系方式" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="居住地行政区划" prop="address">
+              <area-select v-model="formData.address" label="" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="具体地址" prop="detailAddress">
+              <el-input v-model="formData.detailAddress" placeholder="请输入具体地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="种植面积" prop="plantingArea">
+              <el-input v-model="formData.plantingArea" placeholder="请输入种植面积" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="种植作物" prop="planCrop">
+              <!-- <el-select v-model="formData.planCrop" placeholder="种植作物" style="width: 380px" :clearable="true">
+                <el-option v-for="item in cropsOptions" :key="item.id" :label="item.cropsName" :value="item.id" />
+              </el-select> -->
+              <url-select
+                v-model="formData.planCrop"
+                url="/land-resource/crops/page"
+                :params="{ status: '0' }"
+                label-key="cropsName"
+                value-key="id"
+                placeholder="请选择种植作物"
+                style="width: 380px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="handleSave">保存</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
+
 <script setup>
-import { reactive, ref } from 'vue';
-import { useApp } from '@/hooks';
+import { ref, computed, reactive, onMounted, watch } from 'vue';
+import { ElMessageBox, ElMessage } from 'element-plus';
 import { CRUD_OPTIONS } from '@/config';
-import { isEmpty, downloadFile } from '@/utils';
-import { useUserStore } from '@/store/modules/user';
+import { getFarmerList, saveFarmerList, approveFarmer } from '@/apis/businessEntity';
+import { pageCropsList } from '@/apis/landResourceManagement/cropsManagement/index.js';
 
-import {
-  fetchBusinessSubjectList,
-  saveBusinessSubject,
-  editBusinessSubject,
-  deleteBusinessSubject,
-  fetchBusinessSubjectInfo,
-} from '@/apis/businessEntity';
+// ---------------------------------------------------------------------
+// 1. 模拟“当前用户角色”
+//    可选值：'superadmin'（超级管理员）、'auditor'（审核员）、'submitter'（提交人）
+// ---------------------------------------------------------------------
+const role = ref('submitter'); // 开发时可手动切换为 'superadmin' / 'auditor' / 'submitter'
 
-const { VITE_APP_BASE_API } = import.meta.env;
-const app = useApp();
-const UserStore = useUserStore();
-const crudRef = ref(null);
+// 角色判断的计算属性
+const isSuperAdmin = computed(() => role.value === 'superadmin');
+const isAuditor = computed(() => role.value === 'auditor');
 
-const state = reactive({
-  loading: false,
-  query: { current: 1, size: 10, businessType: 0 },
-  form: {},
-  selection: [],
-  pageData: { currentPage: 1, pageSize: 10, total: 0 },
-  data: [],
-  options: {
-    ...CRUD_OPTIONS,
-    addBtnText: '添加',
-    column: [
-      { label: '主体代码', prop: 'id' },
-      { label: '主体名称', prop: 'businessName' },
-      {
-        label: '经营产品种类',
-        prop: 'productType',
-        type: 'select',
-        dicData: [
-          { label: '蔬菜', value: '0' },
-          { label: '水果', value: '1' },
-          { label: '畜产品', value: '2' },
-          { label: '水产品', value: '3' },
-          { label: '谷物', value: '4' },
-          { label: '农资', value: '5' },
-          { label: '种源', value: '6' },
-          { label: '农产品加工', value: '7' },
-          { label: '其他', value: '8' },
-        ],
-      },
-      { label: '主要经营产品', prop: 'primaryProduct' },
-      { label: '户主身份证号', prop: 'idCard' },
-      {
-        label: '联系地址',
-        prop: 'address',
-        type: 'cascader',
-        props: { label: 'areaName', value: 'areaCode', children: 'areaChildVOS' },
-        dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`,
-        dicHeaders: { authorization: UserStore.token },
-      },
-      { label: '详细地址', prop: 'detailAddress' },
-      { label: '联系电话', prop: 'phone' },
-      {
-        label: '审核状态',
-        prop: 'status',
-        type: 'select',
-        dicData: [
-          { label: '未审核', value: 0 },
-          { label: '通过', value: 1 },
-          { label: '拒绝', value: 2 },
-        ],
-      },
-      { label: '审核意见', prop: 'reviewSuggestion' },
-      { label: '创建时间', prop: 'createTime', type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss' },
-    ],
-    actions: [
-      { name: '详情', event: ({ row }) => viewRow(row) },
-      { name: '编辑', event: ({ row }) => editRow(row) },
-      { type: 'danger', name: '删除', event: ({ row }) => deleteRow(row) },
-    ],
-  },
+// ---------------------------------------------------------------------
+// 2. Tab 与数据的状态控制
+// ---------------------------------------------------------------------
+const activeTab = ref('0');
+// 搜索表单模型
+const searchForm = ref({
+  name: '',
+  idCard: '',
+  phone: '',
+  status: '',
+  userId: '',
+});
+const loading = ref(false);
+const crudRef = ref();
+// 分页数据
+const pageData = ref({
+  currentPage: 1,
+  pageSize: 10,
+  total: 0,
+});
+// 模拟的原始数据列表（通常从后端接口拿到）
+const allData = ref([]);
+
+// 新增弹窗显示状态
+const dialogVisible = ref(false);
+// 新增表单数据
+const formData = ref({
+  name: '',
+  idType: '1',
+  idCard: '',
+  sex: '1',
+  age: '',
+  phone: '',
+  provinceCode: '', // 省
+  cityCode: '', // 市
+  countyCode: '', // 区县
+  townCode: '', // 镇
+  villageCode: '', // 村
+  address: [],
+  detailAddress: '',
+  plantingArea: '',
+  planCrop: '',
 });
 
-// 加载
-const loadData = () => {
-  state.loading = true;
-  fetchBusinessSubjectList(state.query)
-    .then((res) => {
-      if (res.code === 200) {
-        const { current, size, total, records } = res.data;
-        state.data = records;
-        state.pageData = {
-          currentPage: current || 1,
-          pageSize: size || 10,
-          total: total,
-        };
-      }
-    })
-    .catch((err) => {
-      app.$message.error(err.msg);
-      state.data = [];
-    })
-    .finally(() => {
-      state.loading = false;
-    });
-};
+// 根据当前选中 tab + 关键词来过滤数据
+const filteredData = computed(() => {
+  return allData.value.filter((row) => {
+    // 只展示当前状态的数据
+    if (String(row.status) !== activeTab.value) return false;
 
-loadData();
-
-const editRow = (row) => {
-  fetchBusinessSubjectInfo(row.id).then((res) => {
-    crudRef.value.rowEdit(res.data);
-  });
-};
-
-const viewRow = (row) => {
-  fetchBusinessSubjectInfo(row.id).then((res) => {
-    crudRef.value.rowView(res.data);
-  });
-};
-
-const deleteRow = (row) => {
-  app
-    .$confirm('确认删除？', '删除', { type: 'warning' })
-    .then(() =>
-      deleteBusinessSubject(row.id).then(() => {
-        app.$message.success('删除成功');
-        loadData();
-      })
-    )
-    .catch(() => {});
-};
-
-// 页数
-const currentChange = (current) => {
-  state.query.current = current;
-  loadData();
-};
-
-// 条数
-const sizeChange = (size) => {
-  state.query.size = size;
-  loadData();
-};
-
-// 搜索
-const searchChange = (params, done) => {
-  if (done) done();
-  state.query = params;
-  state.query.current = 1;
-  loadData();
-};
-
-// 刷新
-const refreshChange = () => {
-  loadData();
-  app.$message.success('刷新成功');
-};
-
-// 选择
-const selectionChange = (rows) => {
-  state.selection = rows;
-};
-
-const handleIds = () => {
-  let datalist = state.selection.map((m) => {
-    return { landId: m.landId, landName: m.landName };
-  });
-
-  let selectIdlist = uniqueObjects(datalist, 'landId');
-  let selectIdsVal = selectIdlist.map((n) => {
-    return n.landId;
-  });
-
-  return selectIdsVal.toString() || '';
-};
-
-function uniqueObjects(arr, key) {
-  return arr.reduce((acc, current) => {
-    const duplicate = acc.find((element) => element[key] === current[key]);
-    if (!duplicate) {
-      acc.push(current);
+    // 如果有关键词，则姓名/证件号/联系方式 任意包含即显示
+    const kw = searchForm.value.name.trim();
+    if (kw) {
+      return row.name.includes(kw) || row.idCard.includes(kw) || row.phone.includes(kw);
     }
-    return acc;
-  }, []);
+    return true;
+  });
+});
+// ==============================
+// CRUD 配置
+// ==============================
+const crudOptions = reactive({
+  ...CRUD_OPTIONS,
+  addBtn: false,
+  searchBtn: false,
+  emptyBtn: false,
+  refreshBtn: false,
+  column: [
+    { label: '姓名', prop: 'name' },
+    { label: '证件类型', prop: 'idType' },
+    { label: '证件号码', prop: 'idCard' },
+    {
+      label: '性别',
+      prop: 'sex',
+      formatter: (row, column, cellValue) => {
+        return cellValue === '1' ? '男' : cellValue === '0' ? '女' : '';
+      },
+    },
+    { label: '年龄', prop: 'age' },
+    { label: '联系方式', prop: 'phone' },
+    { label: '居住地行政区划', prop: 'address' },
+    { label: '种植作物', prop: 'planCrop' },
+    { label: '创建时间', prop: 'createTime' },
+    { label: '更新时间', prop: 'updateTime' },
+  ],
+});
+
+// ---------------------------------------------------------------------
+// 3. 各种操作方法占位（请根据实际 API/逻辑改写）
+// ---------------------------------------------------------------------
+async function getData() {
+  loading.value = true;
+  try {
+    const params = {
+      ...searchForm.value,
+      status: activeTab.value,
+      current: pageData.value.currentPage,
+      size: pageData.value.pageSize,
+    };
+    const response = await getFarmerList(params);
+    if (response.code === 200 && response.data) {
+      allData.value = response.data.records;
+      console.log('获取数据成功:', allData.value);
+      pageData.value = {
+        currentPage: response.data.current,
+        pageSize: response.data.size,
+        total: response.data.total,
+      };
+    } else {
+      ElMessage.error(response.msg || '获取数据失败');
+    }
+  } catch (error) {
+    ElMessage.error('获取数据失败，请稍后重试');
+  } finally {
+    loading.value = false;
+  }
 }
-// 新增
-const rowSave = (row, done, loading) => {
-  saveBusinessSubject(row)
-    .then(() => {
-      app.$message.success('添加成功');
-      done();
-      loadData();
-    })
-    .catch((e) => app.$message.error(e.msg))
-    .finally(() => loading());
-};
-
-const rowUpdate = (row, index, done, loading) => {
-  console.info('更新');
-  editBusinessSubject(row)
-    .then((res) => {
-      if (res.code === 200) {
-        app.$message.success('更新成功！');
-        done();
-        loadData();
-      }
-    })
-    .catch((err) => {
-      app.$message.error(err.msg);
-    })
-    .finally(() => {
-      loading();
-    });
-};
-
-const onBatchDel = () => {
-  let ids = handleIds();
-  if (!ids.length || ids.length <= 0) {
-    return app.$message.error('请先选择要删除的数据');
+// 存储种植作物列表
+const cropsOptions = ref([]);
+// 初始化种植作物列表
+const fetchCropsList = async () => {
+  try {
+    // 调用 pageCropsList 获取种植作物分页列表
+    const res = await pageCropsList({ status: '0' });
+    if (res.code === 200) {
+      console.log('res :>> ', res.data.records);
+      cropsOptions.value = res.data.records;
+      console.log('object :>> ', cropsOptions.value);
+    }
+  } catch (error) {
+    console.error('获取种植作物列表失败:', error);
   }
 };
+function handleSearch() {
+  // 这里直接触发 filteredData 重新计算即可
+  // 如果是后端分页，则要带上 activeTab + keyword 去请求
+  console.log('搜索关键词：', searchForm.value.keyword);
+  getData();
+}
+function handleReset() {
+  searchForm.value.keyword = '';
+  handleSearch();
+}
+function handleTabChange(tab) {
+  handleSearch();
+}
+// 新增
+const handleAdd = () => {
+  dialogVisible.value = true;
+  // 打开弹窗时重置表单数据
+  // formData.value = {
+  //   name: '',
+  //   idType: '1',
+  //   idCard: '',
+  //   sex: '1',
+  //   age: '',
+  //   phone: '',
+  //   address: [],
+  //   detailAddress: '',
+  //   plantingArea: '',
+  //   planCrop: '',
+  // };
+};
+// 根据address解构行政区划数据
+const watchAddress = watch(
+  () => formData.value.address,
+  (newValue) => {
+    if (newValue.length <= 3) {
+      formData.value.provinceCode = '530000';
+      formData.value.cityCode = '530900';
+      formData.value.countyCode = newValue[0];
+      formData.value.townCode = newValue[1];
+      formData.value.villageCode = newValue[2];
+    }
+  }
+);
+
+// 保存新增数据saveFarmerList
+const handleSave = async () => {
+  await saveFarmerList(formData.value)
+    .then((response) => {
+      if (response.code === 200) {
+        ElMessage.success('新增成功');
+        dialogVisible.value = false;
+        getData(); // 重新获取数据
+      }
+    })
+    .catch(() => {
+      ElMessage.error('新增失败，请稍后重试');
+    });
+};
+
+// 查看
+function handleView(row) {
+  console.log('查看', row);
+  ElMessageBox.alert(`查看 ID=${row.id} 的详情`, '查看');
+}
+
+// 编辑（修改/填写）
+function handleEdit(row) {
+  console.log('编辑', row);
+  ElMessageBox.alert(`编辑 ID=${row.id}`, '编辑');
+}
+
+// 提交审核（待提交 → 待审核）
+function handleSubmit(row) {
+  ElMessageBox.confirm('确定提交审核吗？', '提交审核').then(() => {
+    const params = {
+      id: row.id,
+      status: '1',
+      reason: row.reason || '',
+    };
+    approveFarmer(params)
+      .then(() => {
+        console.log(`ID=${row.id} 提交审核`);
+        row.rejectReason = ''; // 清空驳回原因
+        getData(); // 重新获取数据
+      })
+      .catch(() => {
+        ElMessage.error('提交审核失败，请稍后重试');
+      });
+  });
+}
+
+// 重新提交（被驳回 → 待审核）
+function handleResubmit(row) {
+  ElMessageBox.confirm('确认重新提交吗？', '重新提交').then(() => {
+    row.status = '1';
+    row.rejectReason = '';
+    console.log(`ID=${row.id} 重新提交`);
+    ElMessage.success('已重新提交，状态已变为“待审核”');
+  });
+}
+
+// 撤销（待审核 → 待提交），超级管理员和提交人拥有撤销
+function handleWithdraw(row) {
+  ElMessageBox.confirm('确认撤销本次审核吗？', '撤销').then(() => {
+    row.status = '0';
+    console.log(`ID=${row.id} 撤销到“待提交”`);
+    ElMessage.success('已撤销，状态已变为“待提交”');
+  });
+}
+
+// 审核通过（待审核 → 已通过）
+function handleApprove(row) {
+  ElMessageBox.confirm('确认通过？', '审核通过').then(() => {
+    row.status = '2';
+    console.log(`ID=${row.id} 审核通过`);
+    ElMessage.success('已通过');
+  });
+}
+
+// 审核驳回（待审核 → 已驳回），需要填写驳回原因
+function handleReject(row) {
+  ElMessageBox.prompt('请输入驳回原因', '审核驳回', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+  })
+    .then(({ value }) => {
+      if (!value.trim()) {
+        ElMessage.error('驳回原因不能为空');
+        return;
+      }
+      row.status = '3';
+      row.rejectReason = value.trim();
+      console.log(`ID=${row.id} 驳回，原因：${value.trim()}`);
+      ElMessage.success('已驳回');
+    })
+    .catch(() => {
+      // 取消时不做任何事
+    });
+}
+
+// 查看/弹窗 驳回原因
+function showRejectReason(row) {
+  ElMessageBox.alert(row.rejectReason || '无驳回原因', '驳回原因');
+}
+
+// 删除
+function handleDelete(row) {
+  ElMessageBox.confirm('确定删除该条记录？', '删除提示').then(() => {
+    const idx = allData.value.findIndex((r) => r.id === row.id);
+    if (idx !== -1) {
+      allData.value.splice(idx, 1);
+    }
+    console.log(`ID=${row.id} 已删除`);
+    ElMessage.success('已删除');
+  });
+}
+
+// 定义操作映射
+const ACTION_MAP = {
+  view: { name: '查看', icon: 'view', handler: handleView },
+  edit: { name: '编辑', icon: 'edit', handler: handleEdit },
+  submit: { name: '提交审核', icon: 'submit', handler: handleSubmit },
+  delete: { type: 'danger', name: '删除', icon: 'delete', handler: handleDelete },
+  approve: { name: '通过', icon: 'approve', handler: handleApprove },
+  reject: { name: '驳回', icon: 'reject', handler: handleReject },
+  withdraw: { name: '撤销', icon: 'withdraw', handler: handleWithdraw },
+  resubmit: { name: '重新提交', icon: 'resubmit', handler: handleResubmit },
+  reason: { name: '驳回原因', icon: 'reason', handler: showRejectReason },
+  modify: { name: '修改', icon: 'edit', handler: handleEdit },
+};
+
+// 定义角色和状态对应的操作配置
+const ROLE_STATUS_ACTIONS = {
+  superadmin: {
+    0: ['view', 'edit', 'submit', 'delete'],
+    1: ['view', 'approve', 'reject', 'withdraw', 'delete'],
+    2: ['view', 'modify', 'delete'],
+    3: ['view', 'edit', 'reason', 'resubmit', 'delete'],
+  },
+  auditor: {
+    0: [],
+    1: ['view', 'approve', 'reject'],
+    2: ['view', 'delete'],
+    3: ['view', 'reason', 'delete'],
+  },
+  submitter: {
+    0: ['view', 'edit', 'submit', 'delete'],
+    1: ['view', 'withdraw', 'delete'],
+    2: ['view', 'modify', 'delete'],
+    3: ['view', 'edit', 'reason', 'resubmit', 'delete'],
+  },
+};
+
+// 根据角色和状态动态生成操作按钮
+function getActions(row) {
+  const currentRole = role.value;
+  const status = row.status;
+  const actionKeys = ROLE_STATUS_ACTIONS[currentRole]?.[status] || [];
+
+  return actionKeys.map((key) => {
+    const action = ACTION_MAP[key];
+    return {
+      ...action,
+      event: () => action.handler(row),
+    };
+  });
+}
+
+// ---------------------------------------------------------------------
+// 4. 示例：页面加载时可以从后端获取 allData
+// ---------------------------------------------------------------------
+onMounted(() => {
+  getData();
+  fetchCropsList(); // 初始化种植作物列表
+});
 </script>
+
+<style scoped lang="scss">
+// :deep(.avue-crud__header) {
+//   display: none;
+// }
+.custom-page {
+  padding: 20px;
+  height: calc(100vh - 150px);
+  overflow-y: auto;
+
+  .search-bar {
+    margin-bottom: 20px;
+  }
+}
+
+.custom-form {
+  padding: 20px;
+
+  .el-form-item {
+    margin-bottom: 22px;
+  }
+}
+</style>
diff --git a/sub-government-affairs-service/src/views/productOperateMain/individual/new.vue b/sub-government-affairs-service/src/views/productOperateMain/individual/new.vue
deleted file mode 100644
index 605261e..0000000
--- a/sub-government-affairs-service/src/views/productOperateMain/individual/new.vue
+++ /dev/null
@@ -1,344 +0,0 @@
-<template>
-  <div class="custom-page">
-    <!-- 关键词搜索 -->
-    <el-form :inline="true" :model="searchForm" class="search-bar">
-      <el-form-item label="关键词">
-        <el-input v-model="searchForm.keyword" placeholder="请输入关键词" clearable />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="handleSearch">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 四个固定 Tabs -->
-    <el-tabs v-model="activeTab" @tab-click="handleTabChange">
-      <el-tab-pane label="待提交" name="draft" />
-      <el-tab-pane label="待审核" name="pending" />
-      <el-tab-pane label="已通过" name="approved" />
-      <el-tab-pane label="被驳回" name="rejected" />
-    </el-tabs>
-
-    <!-- 表格 -->
-    <el-table :data="filteredData" stripe style="width: 100%">
-      <el-table-column prop="name" label="姓名" />
-      <el-table-column prop="idType" label="证件类型" />
-      <el-table-column prop="idNumber" label="证件号码" />
-      <el-table-column prop="gender" label="性别" />
-      <el-table-column prop="age" label="年龄" />
-      <el-table-column prop="contact" label="联系方式" />
-      <el-table-column prop="address" label="居住地行政区划" />
-      <el-table-column prop="crop" label="种植作物" />
-      <el-table-column prop="source" label="数据来源" />
-      <el-table-column prop="createdAt" label="信息录入时间" />
-      <el-table-column prop="updatedAt" label="信息更新时间" />
-      <el-table-column label="操作" fixed="right" width="360">
-        <template #default="{ row }">
-          <!-- “查看”按钮：超级管理员／审核员／提交人 任何状态都可看 -->
-          <el-button type="text" @click="handleView(row)">查看</el-button>
-
-          <!-- 如果是“超级管理员”，四种状态都显示对应的操作 -->
-          <template v-if="isSuperAdmin">
-            <template v-if="row.status === 'draft'">
-              <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="text" @click="handleSubmit(row)">提交审核</el-button>
-              <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            </template>
-            <template v-else-if="row.status === 'pending'">
-              <el-button type="text" @click="handleApprove(row)">通过</el-button>
-              <el-button type="text" @click="handleReject(row)">驳回</el-button>
-              <el-button type="text" @click="handleWithdraw(row)">撤销</el-button>
-              <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            </template>
-            <template v-else-if="row.status === 'approved'">
-              <el-button type="text" @click="handleEdit(row)">修改</el-button>
-              <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            </template>
-            <template v-else-if="row.status === 'rejected'">
-              <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="text" @click="showRejectReason(row)">驳回原因</el-button>
-              <el-button type="text" @click="handleResubmit(row)">重新提交</el-button>
-              <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            </template>
-          </template>
-
-          <!-- 如果是“审核员”，只有待审核/已通过/被驳回三种状态有操作，待提交无操作 -->
-          <template v-else-if="isAuditor">
-            <template v-if="row.status === 'pending'">
-              <el-button type="text" @click="handleApprove(row)">通过</el-button>
-              <el-button type="text" @click="handleReject(row)">驳回</el-button>
-            </template>
-            <template v-else-if="row.status === 'approved'">
-              <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            </template>
-            <template v-else-if="row.status === 'rejected'">
-              <el-button type="text" @click="showRejectReason(row)">驳回原因</el-button>
-              <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            </template>
-            <!-- 待提交状态 -->
-            <!-- 审核员对“待提交”行 无任何按钮 -->
-          </template>
-
-          <!-- 如果是“提交人”，对四种状态分别渲染 -->
-          <template v-else>
-            <template v-if="row.status === 'draft'">
-              <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="text" @click="handleSubmit(row)">提交审核</el-button>
-              <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            </template>
-            <template v-else-if="row.status === 'pending'">
-              <el-button type="text" @click="handleWithdraw(row)">撤销</el-button>
-              <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            </template>
-            <template v-else-if="row.status === 'approved'">
-              <el-button type="text" @click="handleEdit(row)">修改</el-button>
-              <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            </template>
-            <template v-else-if="row.status === 'rejected'">
-              <el-button type="text" @click="handleEdit(row)">编辑</el-button>
-              <el-button type="text" @click="showRejectReason(row)">驳回原因</el-button>
-              <el-button type="text" @click="handleResubmit(row)">重新提交</el-button>
-              <el-button type="text" @click="handleDelete(row)">删除</el-button>
-            </template>
-          </template>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script setup>
-import { ref, computed, onMounted } from 'vue';
-import { ElMessageBox, ElMessage } from 'element-plus';
-
-// ---------------------------------------------------------------------
-// 1. 模拟“当前用户角色”
-//    可选值：'superadmin'（超级管理员）、'auditor'（审核员）、'submitter'（提交人）
-// ---------------------------------------------------------------------
-const role = ref('submitter'); // 开发时可手动切换为 'superadmin' / 'auditor' / 'submitter'
-
-// 角色判断的计算属性
-const isSuperAdmin = computed(() => role.value === 'superadmin');
-const isAuditor = computed(() => role.value === 'auditor');
-
-// ---------------------------------------------------------------------
-// 2. Tab 与数据的状态控制
-// ---------------------------------------------------------------------
-const activeTab = ref('draft'); // 默认选中“待提交”
-// 搜索表单模型
-const searchForm = ref({ keyword: '' });
-
-// 模拟的原始数据列表（通常从后端接口拿到）
-const allData = ref([
-  {
-    id: 1,
-    name: '张三',
-    idType: '身份证',
-    idNumber: '110101199001011234',
-    gender: '男',
-    age: 30,
-    contact: '13800001234',
-    address: '云南省玉溪市',
-    crop: '水稻',
-    source: '平台录入',
-    createdAt: '2025-05-20 10:00:00',
-    updatedAt: '2025-05-22 14:30:00',
-    status: 'draft', // draft: 待提交；pending: 待审核；approved: 已通过；rejected: 被驳回
-    rejectReason: '',
-  },
-  {
-    id: 2,
-    name: '李四',
-    idType: '护照',
-    idNumber: 'P12345678',
-    gender: '女',
-    age: 28,
-    contact: '13900005678',
-    address: '云南省昆明市',
-    crop: '玉米',
-    source: '第三方导入',
-    createdAt: '2025-04-15 09:20:00',
-    updatedAt: '2025-05-01 11:45:00',
-    status: 'pending',
-    rejectReason: '',
-  },
-  {
-    id: 3,
-    name: '王五',
-    idType: '身份证',
-    idNumber: '110101198505053456',
-    gender: '男',
-    age: 39,
-    contact: '13700009876',
-    address: '云南省大理市',
-    crop: '小麦',
-    source: '平台录入',
-    createdAt: '2025-03-10 15:10:00',
-    updatedAt: '2025-03-10 15:10:00',
-    status: 'approved',
-    rejectReason: '',
-  },
-  {
-    id: 4,
-    name: '赵六',
-    idType: '身份证',
-    idNumber: '110101197502073210',
-    gender: '女',
-    age: 45,
-    contact: '13500004567',
-    address: '云南省保山市',
-    crop: '烟草',
-    source: '第三方导入',
-    createdAt: '2025-02-01 08:30:00',
-    updatedAt: '2025-02-15 12:00:00',
-    status: 'rejected',
-    rejectReason: '种植作物信息不完整',
-  },
-  // … 可以继续补充更多模拟数据
-]);
-
-// 根据当前选中 tab + 关键词来过滤数据
-const filteredData = computed(() => {
-  return allData.value.filter((row) => {
-    // 只展示当前状态的数据
-    if (row.status !== activeTab.value) return false;
-
-    // 如果有关键词，则姓名/证件号/联系方式 任意包含即显示
-    const kw = searchForm.value.keyword.trim();
-    if (kw) {
-      return row.name.includes(kw) || row.idNumber.includes(kw) || row.contact.includes(kw);
-    }
-    return true;
-  });
-});
-
-// ---------------------------------------------------------------------
-// 3. 各种操作方法占位（请根据实际 API/逻辑改写）
-// ---------------------------------------------------------------------
-function handleSearch() {
-  // 这里直接触发 filteredData 重新计算即可
-  // 如果是后端分页，则要带上 activeTab + keyword 去请求
-  console.log('搜索关键词：', searchForm.value.keyword);
-}
-function handleReset() {
-  searchForm.value.keyword = '';
-  handleSearch();
-}
-function handleTabChange(tab) {
-  activeTab.value = tab.name;
-  handleSearch();
-}
-
-// 查看
-function handleView(row) {
-  console.log('查看', row);
-  ElMessageBox.alert(`查看 ID=${row.id} 的详情`, '查看');
-}
-
-// 编辑（修改/填写）
-function handleEdit(row) {
-  console.log('编辑', row);
-  ElMessageBox.alert(`编辑 ID=${row.id}`, '编辑');
-}
-
-// 提交审核（待提交 → 待审核）
-function handleSubmit(row) {
-  ElMessageBox.confirm('确定提交审核吗？', '提交审核').then(() => {
-    // 这里可以调用接口：update status -> pending
-    row.status = 'pending';
-    console.log(`ID=${row.id} 提交审核`);
-    ElMessage.success('提交成功，状态已变为“待审核”');
-  });
-}
-
-// 重新提交（被驳回 → 待审核）
-function handleResubmit(row) {
-  ElMessageBox.confirm('确认重新提交吗？', '重新提交').then(() => {
-    // 调接口：update status -> pending
-    row.status = 'pending';
-    row.rejectReason = '';
-    console.log(`ID=${row.id} 重新提交`);
-    ElMessage.success('已重新提交，状态已变为“待审核”');
-  });
-}
-
-// 撤销（待审核 → 待提交），超级管理员和提交人拥有撤销
-function handleWithdraw(row) {
-  ElMessageBox.confirm('确认撤销本次审核吗？', '撤销').then(() => {
-    // 调接口：update status -> draft
-    row.status = 'draft';
-    console.log(`ID=${row.id} 撤销到“待提交”`);
-    ElMessage.success('已撤销，状态已变为“待提交”');
-  });
-}
-
-// 审核通过（待审核 → 已通过）
-function handleApprove(row) {
-  ElMessageBox.confirm('确认通过？', '审核通过').then(() => {
-    // 调接口：update status -> approved
-    row.status = 'approved';
-    console.log(`ID=${row.id} 审核通过`);
-    ElMessage.success('已通过');
-  });
-}
-
-// 审核驳回（待审核 → 被驳回），需要填写驳回原因
-function handleReject(row) {
-  ElMessageBox.prompt('请输入驳回原因', '审核驳回', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-  })
-    .then(({ value }) => {
-      if (!value.trim()) {
-        ElMessage.error('驳回原因不能为空');
-        return;
-      }
-      // 调接口：update status -> rejected + rejectReason
-      row.status = 'rejected';
-      row.rejectReason = value.trim();
-      console.log(`ID=${row.id} 驳回，原因：${value.trim()}`);
-      ElMessage.success('已驳回');
-    })
-    .catch(() => {
-      // 取消时不做任何事
-    });
-}
-
-// 查看/弹窗 驳回原因
-function showRejectReason(row) {
-  ElMessageBox.alert(row.rejectReason || '无驳回原因', '驳回原因');
-}
-
-// 删除
-function handleDelete(row) {
-  ElMessageBox.confirm('确定删除该条记录？', '删除提示').then(() => {
-    // 调接口：删除记录 或者 update 本地 allData
-    const idx = allData.value.findIndex((r) => r.id === row.id);
-    if (idx !== -1) {
-      allData.value.splice(idx, 1);
-    }
-    console.log(`ID=${row.id} 已删除`);
-    ElMessage.success('已删除');
-  });
-}
-
-// ---------------------------------------------------------------------
-// 4. 示例：页面加载时可以从后端获取 allData
-// ---------------------------------------------------------------------
-onMounted(() => {
-  // 如果需要从接口拉数据，则写在这里，比如：
-  // fetch('/api/records').then(resp => { allData.value = resp.data })
-});
-</script>
-
-<style scoped lang="scss">
-.custom-page {
-  padding: 20px;
-  height: calc(100vh - 150px);
-  overflow-y: auto;
-
-  .search-bar {
-    margin-bottom: 20px;
-  }
-}
-</style>
diff --git a/sub-government-affairs-service/src/views/productOperateMain/individual/old1index.vue b/sub-government-affairs-service/src/views/productOperateMain/individual/old1index.vue
new file mode 100644
index 0000000..a46ebde
--- /dev/null
+++ b/sub-government-affairs-service/src/views/productOperateMain/individual/old1index.vue
@@ -0,0 +1,254 @@
+<template>
+  <div class="custom-page">
+    <avue-crud
+      ref="crudRef"
+      v-model="state.form"
+      v-model:page="state.pageData"
+      :table-loading="state.loading"
+      :data="state.data"
+      :option="state.options"
+      @refresh-change="refreshChange"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @row-save="rowSave"
+      @row-update="rowUpdate"
+      @row-del="rowDel"
+    >
+      <template #menu-left>
+        <!-- <el-button type="primary" icon="Upload" @click="onImport">导入</el-button> -->
+        <!-- <el-button type="danger" icon="Delete" @click="onBatchDel">批量删除</el-button> -->
+      </template>
+
+      <!-- <template #operationDate-search>
+        <el-date-picker v-model="timeVal" type="daterange" style="width: 230px" start-placeholder="开始" end-placeholder="结束" />
+      </template> -->
+
+      <template #menu="scope">
+        <custom-table-operate :actions="state.options.actions" :data="scope" />
+      </template>
+    </avue-crud>
+  </div>
+</template>
+<script setup>
+import { reactive, ref } from 'vue';
+import { useApp } from '@/hooks';
+import { CRUD_OPTIONS } from '@/config';
+import { isEmpty, downloadFile } from '@/utils';
+import { useUserStore } from '@/store/modules/user';
+
+import {
+  fetchBusinessSubjectList,
+  saveBusinessSubject,
+  editBusinessSubject,
+  deleteBusinessSubject,
+  fetchBusinessSubjectInfo,
+} from '@/apis/businessEntity';
+
+const { VITE_APP_BASE_API } = import.meta.env;
+const app = useApp();
+const UserStore = useUserStore();
+const crudRef = ref(null);
+
+const state = reactive({
+  loading: false,
+  query: { current: 1, size: 10, businessType: 0 },
+  form: {},
+  selection: [],
+  pageData: { currentPage: 1, pageSize: 10, total: 0 },
+  data: [],
+  options: {
+    ...CRUD_OPTIONS,
+    addBtnText: '添加',
+    column: [
+      { label: '主体代码', prop: 'id' },
+      { label: '主体名称', prop: 'businessName' },
+      {
+        label: '经营产品种类',
+        prop: 'productType',
+        type: 'select',
+        dicData: [
+          { label: '蔬菜', value: '0' },
+          { label: '水果', value: '1' },
+          { label: '畜产品', value: '2' },
+          { label: '水产品', value: '3' },
+          { label: '谷物', value: '4' },
+          { label: '农资', value: '5' },
+          { label: '种源', value: '6' },
+          { label: '农产品加工', value: '7' },
+          { label: '其他', value: '8' },
+        ],
+      },
+      { label: '主要经营产品', prop: 'primaryProduct' },
+      { label: '户主身份证号', prop: 'idCard' },
+      {
+        label: '联系地址',
+        prop: 'address',
+        type: 'cascader',
+        props: { label: 'areaName', value: 'areaCode', children: 'areaChildVOS' },
+        dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`,
+        dicHeaders: { authorization: UserStore.token },
+      },
+      { label: '详细地址', prop: 'detailAddress' },
+      { label: '联系电话', prop: 'phone' },
+      {
+        label: '审核状态',
+        prop: 'status',
+        type: 'select',
+        dicData: [
+          { label: '未审核', value: 0 },
+          { label: '通过', value: 1 },
+          { label: '拒绝', value: 2 },
+        ],
+      },
+      { label: '审核意见', prop: 'reviewSuggestion' },
+      { label: '创建时间', prop: 'createTime', type: 'datetime', format: 'YYYY-MM-DD HH:mm:ss' },
+    ],
+    actions: [
+      { name: '详情', event: ({ row }) => viewRow(row) },
+      { name: '编辑', event: ({ row }) => editRow(row) },
+      { type: 'danger', name: '删除', event: ({ row }) => deleteRow(row) },
+    ],
+  },
+});
+
+// 加载
+const loadData = () => {
+  state.loading = true;
+  fetchBusinessSubjectList(state.query)
+    .then((res) => {
+      if (res.code === 200) {
+        const { current, size, total, records } = res.data;
+        state.data = records;
+        state.pageData = {
+          currentPage: current || 1,
+          pageSize: size || 10,
+          total: total,
+        };
+      }
+    })
+    .catch((err) => {
+      app.$message.error(err.msg);
+      state.data = [];
+    })
+    .finally(() => {
+      state.loading = false;
+    });
+};
+
+loadData();
+
+const editRow = (row) => {
+  fetchBusinessSubjectInfo(row.id).then((res) => {
+    crudRef.value.rowEdit(res.data);
+  });
+};
+
+const viewRow = (row) => {
+  fetchBusinessSubjectInfo(row.id).then((res) => {
+    crudRef.value.rowView(res.data);
+  });
+};
+
+const deleteRow = (row) => {
+  app
+    .$confirm('确认删除？', '删除', { type: 'warning' })
+    .then(() =>
+      deleteBusinessSubject(row.id).then(() => {
+        app.$message.success('删除成功');
+        loadData();
+      })
+    )
+    .catch(() => {});
+};
+
+// 页数
+const currentChange = (current) => {
+  state.query.current = current;
+  loadData();
+};
+
+// 条数
+const sizeChange = (size) => {
+  state.query.size = size;
+  loadData();
+};
+
+// 搜索
+const searchChange = (params, done) => {
+  if (done) done();
+  state.query = params;
+  state.query.current = 1;
+  loadData();
+};
+
+// 刷新
+const refreshChange = () => {
+  loadData();
+  app.$message.success('刷新成功');
+};
+
+// 选择
+const selectionChange = (rows) => {
+  state.selection = rows;
+};
+
+const handleIds = () => {
+  let datalist = state.selection.map((m) => {
+    return { landId: m.landId, landName: m.landName };
+  });
+
+  let selectIdlist = uniqueObjects(datalist, 'landId');
+  let selectIdsVal = selectIdlist.map((n) => {
+    return n.landId;
+  });
+
+  return selectIdsVal.toString() || '';
+};
+
+function uniqueObjects(arr, key) {
+  return arr.reduce((acc, current) => {
+    const duplicate = acc.find((element) => element[key] === current[key]);
+    if (!duplicate) {
+      acc.push(current);
+    }
+    return acc;
+  }, []);
+}
+// 新增
+const rowSave = (row, done, loading) => {
+  saveBusinessSubject(row)
+    .then(() => {
+      app.$message.success('添加成功');
+      done();
+      loadData();
+    })
+    .catch((e) => app.$message.error(e.msg))
+    .finally(() => loading());
+};
+
+const rowUpdate = (row, index, done, loading) => {
+  console.info('更新');
+  editBusinessSubject(row)
+    .then((res) => {
+      if (res.code === 200) {
+        app.$message.success('更新成功！');
+        done();
+        loadData();
+      }
+    })
+    .catch((err) => {
+      app.$message.error(err.msg);
+    })
+    .finally(() => {
+      loading();
+    });
+};
+
+const onBatchDel = () => {
+  let ids = handleIds();
+  if (!ids.length || ids.length <= 0) {
+    return app.$message.error('请先选择要删除的数据');
+  }
+};
+</script>
diff --git a/sub-government-affairs-service/src/views/resource/grid/GridMember.vue b/sub-government-affairs-service/src/views/resource/grid/GridMember.vue
index 2b4c0c4..0fa20cb 100644
--- a/sub-government-affairs-service/src/views/resource/grid/GridMember.vue
+++ b/sub-government-affairs-service/src/views/resource/grid/GridMember.vue
@@ -13,7 +13,6 @@
       @selection-change="selectionChange"
       @current-change="currentChange"
       @size-change="sizeChange"
-      @row-update="rowUpdate"
       @row-del="rowDel"
     >
       <template #menu-left>
diff --git a/sub-government-affairs-service/src/views/trace/record/seed/index.vue b/sub-government-affairs-service/src/views/trace/record/seed/index.vue
index 7e8c93c..717e0ef 100644
--- a/sub-government-affairs-service/src/views/trace/record/seed/index.vue
+++ b/sub-government-affairs-service/src/views/trace/record/seed/index.vue
@@ -35,8 +35,8 @@ import Mock from 'mockjs';
 const res = [
   {
     id: '100001',
-    name: '小麦',
-    shop: '万好芽种公司',
+    name: '云蔗05-51',
+    shop: '云南云蔗科技开发有限公司',
     buyTime: '2025-01-20 20:32:24',
     avalibleTime: '2026-01-20 20:32:24',
     createdTime: '2025-01-20 20:32:24',
@@ -44,15 +44,15 @@ const res = [
   {
     id: '100002',
     name: '南瓜',
-    shop: '丰隆种源公司',
+    shop: '云南高原特色农业种子公司',
     buyTime: '2025-01-15 14:20:21',
     avalibleTime: '2026-01-15 14:20:21',
     createdTime: '2025-01-15 14:20:21',
   },
   {
     id: '100003',
-    name: '玉米',
-    shop: '万好芽种公司',
+    name: '滇辣',
+    shop: '云南宏斌绿色食品集团',
     buyTime: '2025-01-12 17:25:32',
     avalibleTime: '2026-01-12 17:25:32',
     createdTime: '2025-01-12 17:25:32',
diff --git a/sub-government-affairs-service/sub-government-affairs-service.zip b/sub-government-affairs-service/sub-government-affairs-service.zip
deleted file mode 100644
index c7bc60b..0000000
Binary files a/sub-government-affairs-service/sub-government-affairs-service.zip and /dev/null differ