From c908315b796a950988f5434eac2b6774042dcdc5 Mon Sep 17 00:00:00 2001
From: lzc <luo_zhaocong@163.com>
Date: Mon, 10 Mar 2025 09:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/router/index.js                       |   3 +-
 .../src/router/modules/productOperateMain.js  |  25 +
 .../landManage/component/landPartol/index.vue |  15 +-
 .../component/operationRecord/index.vue       |   4 +
 .../component/plantPlan/compoent/stage.vue    | 274 +++++++++++
 .../landManage/component/plantPlan/index.vue  |  27 +-
 .../productOperateMain/collective/index.vue   | 437 +++++++++++++++++
 .../productOperateMain/individual/index.vue   | 455 ++++++++++++++++++
 8 files changed, 1236 insertions(+), 4 deletions(-)
 create mode 100644 sub-government-affairs-service/src/router/modules/productOperateMain.js
 create mode 100644 sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue
 create mode 100644 sub-government-affairs-service/src/views/productOperateMain/collective/index.vue
 create mode 100644 sub-government-affairs-service/src/views/productOperateMain/individual/index.vue

diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js
index 26299d6..0614a38 100644
--- a/sub-government-affairs-service/src/router/index.js
+++ b/sub-government-affairs-service/src/router/index.js
@@ -12,7 +12,7 @@ import resourceRouter from './modules/resource';
 import traceRouter from './modules/trace';
 import landsRoutes from './modules/lands';
 import dictRoutes from './modules/dict';
-import annualplanRoutes from './modules/annualplan';
+import productOperateMainRoutes from './modules/productOperateMain';
 
 export const constantRoutes = [
   {
@@ -46,6 +46,7 @@ export const constantRoutes = [
   ...traceRouter,
   ...landsRoutes,
   ...dictRoutes,
+  ...productOperateMainRoutes,
 ];
 
 /**
diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js
new file mode 100644
index 0000000..6109b27
--- /dev/null
+++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js
@@ -0,0 +1,25 @@
+import Layout from '@/layouts/index.vue';
+
+export default [
+  {
+    path: '/sub-government-affairs-service/productOperateMain',
+    name: 'productOperateMain',
+    component: Layout,
+    redirect: '/sub-government-affairs-service/individual',
+    meta: { title: '生产经营主体', icon: 'icon-test' },
+    children: [
+      {
+        path: '/sub-government-affairs-service/individual',
+        component: () => import('@/views/productOperateMain/individual/index.vue'),
+        name: 'individual',
+        meta: { title: '个体户', icon: 'Document' },
+      },
+      {
+        path: '/sub-government-affairs-service/collective',
+        component: () => import('@/views/productOperateMain/collective/index.vue'),
+        name: 'collective',
+        meta: { title: '村集体', icon: 'Document' },
+      },
+    ],
+  },
+];
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 782b575..7c4c17b 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
@@ -129,6 +129,10 @@ const state = reactive({
     ...CRUD_OPTIONS,
     addBtnText: '新增',
     updateBtnText: '确定',
+    searchSpan: 6,
+    searchGutter: 80,
+    searchMenuPosition: 'center',
+    index: true,
     column: [
       {
         label: '任务编号',
@@ -307,7 +311,6 @@ const state = reactive({
         ],
       },
     ],
-    searchColumn: [],
     actions: [
       {
         name: '登记结果',
@@ -491,3 +494,13 @@ const infoHide = () => {
   infoVisible.value = false;
 };
 </script>
+<style scoped>
+/* 使用 ::v-deep 深度选择器来穿透 scoped 样式 */
+::v-deep .el-table .el-table__row {
+  height: 50px; /* 调整行高，间接控制行间距 */
+}
+
+::v-deep .el-table .el-table__row td {
+  padding: 8px 0; /* 调整单元格内边距，进一步微调行间距 */
+}
+</style>
diff --git a/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue b/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue
index bb48ee8..0abe97d 100644
--- a/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue
@@ -108,6 +108,10 @@ const state = reactive({
   options: {
     ...CRUD_OPTIONS,
     addBtnText: '新增作业',
+    searchLabelWidth: '80px',
+    searchSpan: 6,
+    searchGutter: 80,
+    searchMenuPosition: 'center',
     column: [
       {
         label: '作业日期',
diff --git a/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue b/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue
new file mode 100644
index 0000000..e19b34a
--- /dev/null
+++ b/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue
@@ -0,0 +1,274 @@
+<template>
+  <div style="margin-top: 16px">
+    <el-dialog v-model="isShowVal" title="种植规划" width="1000" center>
+      <avue-crud
+        ref="stateCrudRef"
+        v-model="stageState.form"
+        v-model:search="stageState.query"
+        v-model:page="stageState.pageData"
+        :table-loading="stageState.loading"
+        :data="stageState.data"
+        :option="stageState.options"
+        @refresh-change="stageRefresh"
+        @search-reset="stageSearch"
+        @search-change="stageSearch"
+        @selection-change="stageSelection"
+        @current-change="stageCurrent"
+        @size-change="stageSize"
+        @row-del="stageRowDel"
+        @row-save="stageRowSave"
+        @row-update="stageRowUpdate"
+      >
+        <template #menu-left>
+          <el-button type="primary" icon="Plus" @click="onStateAdd">新增</el-button>
+        </template>
+
+        <template #stage="{ row }">
+          <el-tag size="small">{{ stageObj[row.stage] }}</el-tag>
+        </template>
+
+        <template #menu="scope">
+          <custom-table-operate :actions="stageState.options.actions" :data="scope" />
+        </template>
+      </avue-crud>
+    </el-dialog>
+  </div>
+</template>
+<script setup>
+import { onMounted, reactive, ref, watch } from 'vue';
+import { useApp } from '@/hooks';
+import { CRUD_OPTIONS } from '@/config';
+import { useUserStore } from '@/store/modules/user';
+import { getPlantingStage, savePlantingStage, editPlantingStage, delPlantingStage } from '@/apis/land.js';
+import { isEmpty, imageToBase64, getAssetsFile, downloadFile } from '@/utils';
+
+const props = defineProps({
+  isShow: {
+    type: Boolean,
+    default: false,
+  },
+  rowOriginal: {
+    type: Object,
+    default: () => {
+      return {};
+    },
+  },
+});
+
+const { VITE_APP_BASE_API } = import.meta.env;
+const app = useApp();
+const UserStore = useUserStore();
+const stateCrudRef = ref(null);
+const stageOptions = reactive([
+  { value: '0', label: '苗期' },
+  { value: '1', label: '花果期' },
+  { value: '2', label: '采收期' },
+]);
+
+const workOptions = reactive([
+  { label: '作业计划1', value: '000001' },
+  { label: '作业计划2', value: '000002' },
+]);
+
+const stageObj = reactive({
+  0: '苗期',
+  1: '花果期',
+  2: '采收期',
+});
+
+const isShowVal = ref(false);
+let rowVal = ref({});
+
+onMounted(() => {
+  isShowVal.value = props.isShow;
+  rowVal.value = props.rowOriginal;
+});
+watch(
+  () => (props.isShow, props.rowOriginal),
+  (val) => {
+    isShowVal.value = val.isShow;
+    rowVal.value = props.rowOriginal;
+    console.info('watch', val.isShow);
+    console.info('watch', val.rowOriginal);
+  },
+  { deep: true, immediate: true }
+);
+const stageState = reactive({
+  loading: false,
+  query: {
+    current: 1,
+    size: 10,
+  },
+  form: {},
+  options: {
+    ...CRUD_OPTIONS,
+    addBtn: false,
+    selection: false,
+    column: [
+      {
+        label: '所属阶段',
+        prop: 'stage',
+        type: 'select',
+        search: true,
+        dicData: stageOptions,
+        rules: {
+          required: true,
+          message: '请选择',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '作业计划',
+        prop: 'workId',
+        type: 'select',
+        search: true,
+        dicData: workOptions,
+        rules: {
+          required: true,
+          message: '请选择',
+          trigger: 'blur',
+        },
+      },
+      { label: '作业时间', prop: 'coordinate', addDisplay: false, editDisplay: false },
+      { label: '结束时间', prop: 'createTime', addDisplay: false, editDisplay: false },
+    ],
+    actions: [
+      {
+        name: '编辑',
+        icon: 'edit',
+        event: ({ row }) => stageRowEdit(row),
+      },
+      {
+        type: 'danger',
+        name: '删除',
+        icon: 'delete',
+        event: ({ row }) => stageRowDel(row),
+      },
+    ],
+  },
+  pageData: {
+    total: 0,
+    currentPage: 1,
+    pageSize: 10,
+  },
+  data: [],
+  currentRow: {},
+});
+
+async function getStageList() {
+  stageState.loading = true;
+  getPlantingStage({ ...stageState.query, planId: rowVal.value.currentRow.id })
+    .then((res) => {
+      if (res.code === 200) {
+        const { current, size, total, records } = res.data;
+        stageState.data = records || [];
+        stageState.pageData = {
+          currentPage: current || 1,
+          pageSize: size || 10,
+          total: total,
+        };
+      }
+    })
+    .catch((err) => {
+      app.$message.error(err.msg);
+      stageState.data = [];
+    })
+    .finally(() => {
+      stageState.loading = false;
+    });
+}
+
+const stageSearch = (params, done) => {
+  if (done) done();
+  stageState.query = params;
+  stageState.query.current = 1;
+  getStageList();
+};
+
+const stageSelection = (rows) => {
+  stageState.selection = rows;
+};
+
+const stageCurrent = (current) => {
+  stageState.query.current = current;
+  getStageList();
+};
+
+const stageSize = (size) => {
+  stageState.query.size = size;
+  getStageList();
+};
+
+const stageRowDel = (row, index, done) => {
+  if (isEmpty(row)) return;
+  app
+    .$confirm(`删除后信息将不可查看，确认要删除吗？`, '确定删除', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+    .then(() => {
+      console.info('删除');
+      delPlantingStage({ id: row.id })
+        .then((res) => {
+          if (res.code === 200) {
+            app.$message.success('删除成功！');
+            getStageList();
+            done();
+          }
+        })
+        .catch((err) => {
+          app.$message.error(err.msg);
+        });
+    })
+    .catch(() => {});
+};
+const stageRowEdit = (row) => {
+  stateCrudRef.value.rowEdit(row);
+};
+
+const onStateAdd = () => {
+  if (!rowVal.value.currentRow.id) {
+    app.$message.error('请选择种植规划');
+    return;
+  }
+  stateCrudRef.value.rowAdd();
+};
+
+const stageRowSave = (row, done, loading) => {
+  row.planId = rowVal.value.currentRow.planId;
+  console.info('stageRowSave', row);
+  savePlantingStage({ ...row })
+    .then((res) => {
+      if (res.code === 200) {
+        app.$message.success('添加成功！');
+        done();
+        getStageList();
+      }
+    })
+    .catch((err) => {
+      app.$message.error(err.msg);
+    })
+    .finally(() => {
+      loading();
+    });
+};
+
+const stageRowUpdate = (row, index, done, loading) => {
+  console.info('stageRowUpdate');
+  editPlantingStage(row)
+    .then((res) => {
+      if (res.code === 200) {
+        app.$message.success('更新成功！');
+        done();
+        getStageList();
+      }
+    })
+    .catch((err) => {
+      app.$message.error(err.msg);
+    })
+    .finally(() => {
+      loading();
+    });
+};
+</script>
diff --git a/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue b/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue
index 6d30a75..f5b462a 100644
--- a/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue
@@ -52,7 +52,8 @@
     </avue-crud>
 
     <el-text class="mx-1" size="large">种植阶段详情</el-text>
-    <div style="margin-top: 16px">
+    <stageList :is-show="stageShow" :row="stageRow"></stageList>
+    <!-- <div style="margin-top: 16px">
       <avue-crud
         ref="stateCrudRef"
         v-model="stageState.form"
@@ -83,7 +84,7 @@
           <custom-table-operate :actions="stageState.options.actions" :data="scope" />
         </template>
       </avue-crud>
-    </div>
+    </div> -->
   </div>
 </template>
 <script setup>
@@ -103,6 +104,7 @@ import {
   delPlantingStage,
 } from '@/apis/land.js';
 import { isEmpty, imageToBase64, getAssetsFile, downloadFile } from '@/utils';
+import stageList from '../../component/plantPlan/compoent/stage.vue';
 
 const { VITE_APP_BASE_API } = import.meta.env;
 const app = useApp();
@@ -120,6 +122,9 @@ const workOptions = reactive([
   { label: '作业计划2', value: '000002' },
 ]);
 
+let stageShow = ref(false);
+let stageRow = ref({});
+
 const state = reactive({
   loading: false,
   query: {
@@ -132,6 +137,9 @@ const state = reactive({
     ...CRUD_OPTIONS,
     addBtn: false,
     rowKey: 'landId',
+    searchSpan: 6,
+    searchGutter: 80,
+    searchMenuPosition: 'center',
     column: [
       {
         label: '地块名',
@@ -140,6 +148,8 @@ const state = reactive({
         search: true,
         addDisplay: false,
         editDisplay: false,
+        width: '180px',
+        showOverflowTooltip: true,
         rules: {
           required: true,
           message: '请输入',
@@ -204,6 +214,8 @@ const state = reactive({
         prop: 'planId',
         type: 'select',
         remote: false,
+        width: '160px',
+        showOverflowTooltip: true,
         props: {
           label: 'planName',
           value: 'id',
@@ -224,6 +236,7 @@ const state = reactive({
       {
         label: '种植日期',
         prop: 'planDate',
+        width: '180px',
         rules: {
           required: true,
           message: '请选择',
@@ -244,6 +257,11 @@ const state = reactive({
         icon: 'edit',
         event: ({ row }) => rowEdit(row),
       },
+      {
+        name: '种植规划',
+        icon: 'edit',
+        event: ({ row }) => toStage(row),
+      },
       {
         type: 'danger',
         name: '删除',
@@ -485,6 +503,11 @@ const rowDel = (row, index, done) => {
     .catch(() => {});
 };
 
+const toStage = (row) => {
+  stageRow.value = row;
+  stageShow.value = true;
+};
+
 //导入
 const onImport = () => {};
 // 导出
diff --git a/sub-government-affairs-service/src/views/productOperateMain/collective/index.vue b/sub-government-affairs-service/src/views/productOperateMain/collective/index.vue
new file mode 100644
index 0000000..2cc02b0
--- /dev/null
+++ b/sub-government-affairs-service/src/views/productOperateMain/collective/index.vue
@@ -0,0 +1,437 @@
+<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="state.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 #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 {
+  getOperationRecord,
+  saveOperationRecord,
+  editOperationRecord,
+  delOperationRecord,
+  exportOperationRecord,
+  getAddrCropByLand,
+  importOperationRecord,
+} from '@/apis/land';
+
+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 jobTypeOptions = reactive([
+  { label: '蔬菜', value: '0' },
+  { label: '水果', value: '1' },
+]);
+
+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: 'executor',
+        addDisplay: false,
+        editDisplay: false,
+        search: true,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '主体名称',
+        prop: 'executor',
+        search: true,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '经营产品种类',
+        prop: 'landId',
+        type: 'select',
+        remote: false,
+        search: true,
+        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,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '村集体规模',
+        prop: 'crop',
+        search: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '联系地址',
+        prop: 'villageCode',
+        type: 'cascader',
+        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: 'crop',
+        search: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '负责人身份证号',
+        prop: 'crop',
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '负责人联系电话',
+        prop: 'crop',
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '审核状态',
+        prop: 'crop',
+        addDisplay: false,
+        editDisplay: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '审核意见',
+        prop: 'crop',
+        addDisplay: false,
+        editDisplay: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      { label: '创建时间', prop: 'crop', addDisplay: false, editDisplay: false },
+    ],
+    searchColumn: [
+      { label: '主体代码', prop: 'landName', search: true, width: 200 },
+      { label: '主体名称', prop: 'crop', search: true },
+      {
+        label: '经营产品种类',
+        prop: 'operationType',
+        type: 'select',
+        search: true,
+        dicData: jobTypeOptions,
+      },
+      {
+        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('请先选择要删除的数据');
+  }
+};
+</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
new file mode 100644
index 0000000..5aecae1
--- /dev/null
+++ b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
@@ -0,0 +1,455 @@
+<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="state.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 #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 {
+  getOperationRecord,
+  saveOperationRecord,
+  editOperationRecord,
+  delOperationRecord,
+  exportOperationRecord,
+  getAddrCropByLand,
+  importOperationRecord,
+} from '@/apis/land';
+
+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 jobTypeOptions = reactive([
+  { label: '蔬菜', value: '0' },
+  { label: '水果', value: '1' },
+]);
+
+let timeVal = ref([]);
+
+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: 'executor',
+        addDisplay: false,
+        editDisplay: false,
+        search: true,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '主体名称',
+        prop: 'executor',
+        search: true,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '经营产品种类',
+        prop: 'landId',
+        type: 'select',
+        remote: false,
+        search: true,
+        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,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '户主身份证号',
+        prop: 'crop',
+        search: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '联系地址',
+        prop: 'villageCode',
+        type: 'cascader',
+        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: 'crop',
+        search: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '户主身份证号',
+        prop: 'crop',
+        search: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '联系电话',
+        prop: 'crop',
+        search: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '审核状态',
+        prop: 'crop',
+        addDisplay: false,
+        editDisplay: false,
+        search: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      {
+        label: '审核意见',
+        prop: 'crop',
+        addDisplay: false,
+        editDisplay: false,
+        rules: {
+          required: true,
+          message: '请输入',
+          trigger: 'blur',
+        },
+      },
+      { label: '创建时间', prop: 'crop', addDisplay: false, editDisplay: false, search: false },
+      {
+        label: '创建日期',
+        prop: 'operationDate',
+        type: 'daterange',
+        format: 'YYYY-MM-DD',
+        valueFormat: 'YYYY-MM-DD',
+        width: 200,
+        search: true,
+      },
+    ],
+    searchColumn: [
+      { label: '主体代码', prop: 'landName', search: true },
+      { label: '主体名称', prop: 'crop', search: true },
+      {
+        label: '经营产品种类',
+        prop: 'operationType',
+        type: 'select',
+        search: true,
+        dicData: jobTypeOptions,
+      },
+      {
+        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('请先选择要删除的数据');
+  }
+};
+</script>