From 30fdd2100ce6c2f978f9f793504b2a6ed76b074f Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Sun, 27 Apr 2025 14:48:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BB=8F=E8=90=A5?=
 =?UTF-8?q?=E4=B8=BB=E4=BD=93=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/apis/productOperateMain.js            |   2 +-
 .../inputSuppliesManage/common/Attrs.vue      |   2 +-
 .../landManage/component/plantPlan/index.vue  |   1 +
 .../businessEntity/index.vue                  | 363 +++++-----
 .../views/productOperateMain/examine/list.vue | 645 +++++++++++-------
 .../productOperateMain/examine/record.vue     | 230 +++----
 .../views/productOperateMain/home/index.vue   |   8 +-
 7 files changed, 687 insertions(+), 564 deletions(-)

diff --git a/sub-government-affairs-service/src/apis/productOperateMain.js b/sub-government-affairs-service/src/apis/productOperateMain.js
index b217256..0eb6692 100644
--- a/sub-government-affairs-service/src/apis/productOperateMain.js
+++ b/sub-government-affairs-service/src/apis/productOperateMain.js
@@ -18,7 +18,7 @@ export function saveBuiness(data = {}) {
 
 export function editBuiness(data = {}) {
   return request('/product-business/business/businessEdit', {
-    method: 'POST',
+    method: 'PUT',
     data,
   });
 }
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/common/Attrs.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/common/Attrs.vue
index 592afa5..a8c2bca 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/common/Attrs.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/common/Attrs.vue
@@ -13,7 +13,7 @@
       <el-icon class="custom-form__uploader__icon"><Plus /></el-icon>
     </el-upload>
     <div v-for="(item, i) in attrs_" :key="`attr_${item.uid}`" class="attrs_content__item">
-      <img :src="item.url" :alt="item.name" @click="handlePreview(i)" />
+      <img :src="item.url" @click="handlePreview(i)" />
       <el-icon v-if="props.type != 'view'" class="clear_btn" @click.stop="handleClearAttr(item.uid)"><CircleCloseFilled /></el-icon>
     </div>
     <el-image-viewer v-if="previewShow" :url-list="srcList" :initial-index="index" @close="previewShow = false" />
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 d9f469c..b5d3164 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
@@ -110,6 +110,7 @@ const state = reactive({
     searchSpan: 6,
     searchGutter: 80,
     searchMenuPosition: 'center',
+    selection: true,
     column: [
       {
         label: '地块名',
diff --git a/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue b/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
index 51c56f2..1cfe5a5 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
@@ -31,6 +31,13 @@
         <!-- <el-button type="primary" icon="Upload" @click="onImport">导入</el-button> -->
         <el-button type="danger" icon="Delete" @click="onBatchDel">批量删除</el-button>
       </template>
+      <template #businessLicense-form="{ column, value, type }">
+        <Attrs v-model:attrs="attrs" :type="type" :limit="1" />
+      </template>
+      <template #businessPermitUrl-form="{ column, value, type }">
+        <Attrs v-model:attrs="permitUrl" :type="type" :limit="1" />
+      </template>
+
       <template #status="{ row }">
         <el-tag v-if="row.status == '0'" type="warning" size="small">待审核</el-tag>
         <el-tag v-if="row.status == '1'" type="success" size="small">通过</el-tag>
@@ -43,20 +50,20 @@
   </div>
 </template>
 <script setup>
-import { computed, reactive, ref } from 'vue';
+import { computed, reactive, ref, watch } from 'vue';
 import { useApp } from '@/hooks';
 import { CRUD_OPTIONS, pageData } from '@/config';
 import { isEmpty, downloadFile } from '@/utils';
 import { useUserStore } from '@/store/modules/user';
 
 import { getBuinessList, saveBuiness, editBuiness, delBuiness } from '@/apis/productOperateMain';
+import Attrs from '@/views/inputSuppliesManage/common/Attrs.vue';
 
 const { VITE_APP_BASE_API } = import.meta.env;
 const app = useApp();
 const UserStore = useUserStore();
 const crudRef = ref(null);
 
-let timeVal = ref([]);
 const searchCondition = ref({
   businessType: null,
   businessId: '',
@@ -67,20 +74,71 @@ const searchCondition = ref({
 });
 
 // :0->个体,1->村集体,2->合作社,3->企业
-const column0 = [];
 
-const column1 = [];
+let columnHide = reactive({
+  addDisplay: false,
+  editDisplay: false,
+  viewDisplay: false,
+});
 
-const column2 = [];
+let typeVal = ref(0);
 
-const column3 = [];
+let businessType = reactive({
+  label: '主体类型',
+  prop: 'businessType',
+  type: 'radio',
+  className: 'el-col-md-24',
+  props: {
+    label: 'dictLabel',
+    value: 'dictValue',
+  },
+  dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
+  dicQuery: {
+    dictType: 'sys_business_type',
+    current: 1,
+    size: 10,
+  },
+  dicHeaders: {
+    authorization: UserStore.token,
+  },
+  dicFormatter: (res) => {
+    return (res.data.records ?? []).map((item) => ({
+      ...item,
+      dictValue: Number(item.dictValue),
+    }));
+  },
+});
 
+const attrs = ref([]);
+const permitUrl = ref([]);
+
+const bTypeChange = (val) => {
+  beforeOpen(val);
+};
+
+const searchDateChange = (val) => {
+  // console.info('searchDateChange', val);
+  searchCondition.value.createStartTime = val[0] || '';
+  searchCondition.value.createEndTime = val[1] || '';
+};
+
+const filterByLevel = (data, maxLevel = 3) => {
+  return data
+    .filter((item) => item.level <= maxLevel) // 筛选当前层符合条件的节点
+    .map((item) => ({
+      ...item,
+      areaChildVOS: item.areaChildVOS
+        ? filterByLevel(item.areaChildVOS, maxLevel) // 递归处理子节点
+        : [],
+    }));
+};
 const state = reactive({
   loading: false,
   form: {},
   selection: [],
   options: {
     ...CRUD_OPTIONS,
+    selection: true,
     addBtnText: '添加',
     searchLabelWidth: '150px',
     searchGutter: 100,
@@ -88,26 +146,11 @@ const state = reactive({
     searchMenuPosition: 'center',
     column: [
       {
-        label: '主体类型',
-        prop: 'businessType',
-        type: 'radio',
-        search: true,
-        width: '80px',
-        ellipsis: true,
+        ...businessType,
+        ...columnHide,
         showOverflowTooltip: true,
-        addDisplay: false,
-        editDisplay: false,
         span: 24,
-        props: {
-          label: 'dictLabel',
-          value: 'dictValue',
-        },
-        dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list?dictType=sys_business_type&current=1&size=10`,
-        dicHeaders: {
-          authorization: UserStore.token,
-        },
-        dicFormatter: (res) => res.data.records ?? [],
-        rules: { required: true, message: '请选择', trigger: 'blur' },
+        type: 'select',
       },
       {
         label: '主体代码',
@@ -115,10 +158,9 @@ const state = reactive({
         width: '120px',
         ellipsis: true,
         showOverflowTooltip: true,
-        addDisplay: false,
-        editDisplay: false,
+        ...columnHide,
         search: true,
-        rules: { required: true, message: '请输入', trigger: 'blur' },
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '主体名称',
@@ -126,10 +168,9 @@ const state = reactive({
         width: '160px',
         ellipsis: true,
         showOverflowTooltip: true,
-        addDisplay: false,
-        editDisplay: false,
+        ...columnHide,
         search: true,
-        rules: { required: true, message: '请输入', trigger: 'blur' },
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '经营产品种类',
@@ -138,8 +179,7 @@ const state = reactive({
         width: '120px',
         remote: false,
         search: true,
-        addDisplay: false,
-        editDisplay: false,
+        ...columnHide,
         props: {
           label: 'dictLabel',
           value: 'dictValue',
@@ -162,13 +202,8 @@ const state = reactive({
         width: '120px',
         showOverflowTooltip: true,
         search: false,
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '统一信用代码/证件号码',
@@ -176,9 +211,8 @@ const state = reactive({
         search: false,
         width: '200px',
         labelWidth: '160px',
-        addDisplay: false,
-        editDisplay: false,
-        rules: { required: true, message: '请输入', trigger: 'blur' },
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '规模',
@@ -186,9 +220,8 @@ const state = reactive({
         search: false,
         width: '200px',
         labelWidth: '160px',
-        addDisplay: false,
-        editDisplay: false,
-        rules: { required: true, message: '请输入', trigger: 'blur' },
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '负责人',
@@ -196,9 +229,8 @@ const state = reactive({
         search: false,
         width: '200px',
         labelWidth: '160px',
-        addDisplay: false,
-        editDisplay: false,
-        rules: { required: true, message: '请输入', trigger: 'blur' },
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '联系地址',
@@ -208,8 +240,7 @@ const state = reactive({
         width: '200px',
         ellipsis: true,
         showOverflowTooltip: true,
-        addDisplay: false,
-        editDisplay: false,
+        ...columnHide,
         search: true,
         props: {
           label: 'areaName',
@@ -220,7 +251,7 @@ const state = reactive({
         dicHeaders: {
           authorization: UserStore.token,
         },
-        dicFormatter: (res) => res.data ?? [],
+        dicFormatter: (res) => filterByLevel(res.data ?? []),
         rules: [{ required: true, message: '请选择', trigger: 'blur' }],
       },
       {
@@ -229,73 +260,46 @@ const state = reactive({
         search: false,
         ellipsis: true,
         showOverflowTooltip: true,
-        addDisplay: false,
-        editDisplay: false,
-        rules: { required: true, message: '请输入', trigger: 'blur' },
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '联系电话',
         prop: 'phone',
         width: '160px',
         search: false,
-        addDisplay: false,
-        editDisplay: false,
-        rules: { required: true, message: '请输入', trigger: 'blur' },
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '审核状态',
         prop: 'status',
         width: '80px',
-        addDisplay: false,
-        editDisplay: false,
+        ...columnHide,
         search: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '审核意见',
-        prop: 'remark',
+        prop: 'reviewSuggestion',
         addDisplay: false,
         editDisplay: false,
         width: '200px',
         ellipsis: true,
         showOverflowTooltip: true,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
-      { label: '创建时间', prop: 'createTime', addDisplay: false, editDisplay: false, search: false },
+      { label: '创建时间', prop: 'createTime', ...columnHide, width: '160px', search: false },
     ],
     searchColumn: [
       {
-        label: '主体类型',
-        prop: 'businessType',
-        type: 'radio',
-        className: 'el-col-md-24',
+        ...businessType,
         button: true,
-        props: {
-          label: 'dictLabel',
-          value: 'dictValue',
-        },
-        dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
-        dicQuery: {
-          dictType: 'sys_business_type',
-          current: 1,
-          size: 10,
-        },
-        dicHeaders: {
-          authorization: UserStore.token,
-        },
-        dicFormatter: (res) => res.data.records ?? [],
         searchSpan: 24,
       },
-      { label: '主体代码', prop: 'businessId', search: true },
-      { label: '主体名称', prop: 'crop', search: true },
+      { label: '主体代码', prop: 'id', search: true },
+      { label: '主体名称', prop: 'businessName', search: true },
       {
         label: '经营产品种类',
         prop: 'productType',
@@ -324,6 +328,7 @@ const state = reactive({
         valueFormat: 'YYYY-MM-DD',
         width: 200,
         search: true,
+        change: (val) => searchDateChange(val.value),
       },
     ],
     group: [
@@ -331,34 +336,14 @@ const state = reactive({
         label: '基本信息>',
         prop: 'caseInfo',
         column: [
-          {
-            label: '主体代码',
-            prop: 'taskCode',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-          },
           {
             label: '主体名称',
-            prop: 'taskCode',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            prop: 'businessName',
+            rules: [{ required: true, message: '请输入', trigger: 'blur' }],
           },
           {
-            label: '主体类型',
-            prop: 'businessType',
-            type: 'radio',
-            width: '80px',
-            ellipsis: true,
-            showOverflowTooltip: true,
-            span: 24,
-            props: {
-              label: 'dictLabel',
-              value: 'dictValue',
-            },
-            dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list?dictType=sys_business_type&current=1&size=10`,
-            dicHeaders: {
-              authorization: UserStore.token,
-            },
-            dicFormatter: (res) => res.data.records ?? [],
-            rules: { required: true, message: '请选择', trigger: 'blur' },
+            ...businessType,
+            change: (val) => bTypeChange(val.value),
           },
           {
             label: '经营产品种类',
@@ -381,23 +366,28 @@ const state = reactive({
           },
           {
             label: '主要产品',
-            prop: 'product',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
+            prop: 'primaryProduct',
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '规模',
             prop: 'villageCount',
-            rules: { required: false, message: '请选择', trigger: 'blur' },
+            rules: [{ required: false, message: '请选择', trigger: 'blur' }],
+          },
+          {
+            label: '户主身份证号',
+            prop: 'idCard',
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '负责人',
             prop: 'headName',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '负责人电话',
             prop: 'phone',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '联系地址',
@@ -407,8 +397,6 @@ const state = reactive({
             width: '200px',
             ellipsis: true,
             showOverflowTooltip: true,
-            addDisplay: false,
-            editDisplay: false,
             search: true,
             props: {
               label: 'areaName',
@@ -419,101 +407,109 @@ const state = reactive({
             dicHeaders: {
               authorization: UserStore.token,
             },
-            dicFormatter: (res) => res.data ?? [],
+            dicFormatter: (res) => filterByLevel(res.data ?? []),
             rules: [{ required: true, message: '请选择', trigger: 'blur' }],
           },
           {
             label: '详细地址',
             prop: 'detailAddress',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            rules: [{ required: true, message: '请输入', trigger: 'blur' }],
           },
         ],
       },
       {
         label: '营业执照>',
-        prop: 'caseInfo',
+        prop: 'license1',
+        display: typeVal.value == 2 || typeVal.value == 3 ? true : false,
         column: [
           {
             label: '统一社会信用代码',
-            prop: 'notes',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            prop: 'unifiedSocialCreditCode',
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '营业执照',
-            prop: 'license',
+            prop: 'businessLicense',
+            hide: true,
+            formslot: true,
+            span: 24,
+            rules: { required: false, message: '请输入', trigger: 'blur' },
           },
           {
             label: '有效期至',
-            prop: 'operationDate',
+            prop: 'businessLicenseExpiryDate',
             type: 'date',
             format: 'YYYY-MM-DD',
             valueFormat: 'YYYY-MM-DD',
             width: 200,
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '经营项目',
-            prop: 'inspectionSituation',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            prop: 'businessProject',
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
         ],
       },
       {
         label: '经营许可证>',
-        prop: 'caseInfo',
+        prop: 'license2',
+        display: typeVal.value == 2 || typeVal.value == 3 ? true : false,
         column: [
           {
             label: '经营许可证编号',
-            prop: 'operationType',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
+            prop: 'businessPermitNumber',
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '经营许可证',
-            prop: 'permit',
-            rules: { required: false, message: '请选择', trigger: 'blur' },
+            prop: 'businessPermitUrl',
+            hide: true,
+            formslot: true,
+            span: 24,
+            rules: [{ required: false, message: '请选择', trigger: 'blur' }],
           },
           {
             label: '有效期至',
-            prop: 'operationDate',
+            prop: 'businessPermitExpiryDate',
             type: 'date',
             format: 'YYYY-MM-DD',
             valueFormat: 'YYYY-MM-DD',
             width: 200,
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
         ],
       },
       {
-        label: '审核操作>',
-        prop: 'caseInfo',
+        label: '审核信息>',
+        prop: 'caseInfo3',
+        addDisplay: false,
         column: [
           {
             label: '是否通过',
-            prop: 'isIllegal',
+            prop: 'status',
             span: 24,
             display: true,
             type: 'radio',
             editDisplay: true,
             addDisplay: false,
+            editDisabled: true,
+            viewDisabled: true,
             dicData: [
-              {
-                label: '是',
-                value: '1',
-              },
-              {
-                label: '否',
-                value: '0',
-              },
+              { label: '是', value: '1' },
+              { label: '否', value: '0' },
             ],
           },
           {
             label: '审核意见',
-            prop: 'note',
+            prop: 'reviewSuggestion',
             type: 'textarea',
             span: 24,
             minRows: 3, // 设置最小行数
             maxRows: 5, // 设置最大行数
             overHidden: true,
+            editDisabled: true,
+            viewDisabled: true,
             width: 200,
           },
         ],
@@ -542,16 +538,48 @@ const state = reactive({
   currentRow: {},
 });
 
+const beforeOpen = (val) => {
+  state.options.group[1].display = state.options.group[2].display = val == 2 || val == 3 ? true : false;
+  setDisplay('villageCount', state.options.group[0].column, val == 2 || val == 3 ? true : false);
+  setDisplay('idCard', state.options.group[0].column, val == 0 ? true : false);
+  // console.info('state.options.group[0].column', state.options.group[0].column);
+};
+
+const setDisplay = (field, target, val) => {
+  let index = target.findIndex((m) => {
+    return m.prop == field;
+  });
+  console.info('setDisplay', field);
+  if (index > -1) {
+    target[index].display = val;
+    console.info('target[index].display', target[index].display);
+  }
+};
+
+watch(
+  () => searchCondition,
+  (newVal) => {
+    // console.info('searchCondition', searchCondition);
+    let val = newVal.businessType;
+    beforeOpen(val);
+  },
+  { immediate: true, deep: true }
+);
 // 加载
 const loadData = (resetPage) => {
   resetPage === 1 && (pageData.value.currentPage = 1);
   state.loading = true;
+  let searchParmer = {
+    ...searchCondition.value,
+  };
+
+  delete searchParmer.operationDate;
   let params = Object.assign(
     {
       current: pageData.value.currentPage,
       size: pageData.value.size,
     },
-    searchCondition.value
+    searchParmer
   );
   getBuinessList(params)
     .then((res) => {
@@ -601,16 +629,18 @@ function uniqueObjects(arr, key) {
 }
 // 新增
 const rowSave = (row, done, loading) => {
-  // console.info('新增', row);
-  let codeList = row.addressCode.split(',');
+  let codeList = row.addressCode;
   let params = {
     ...row,
     provinceCode: codeList[0] || '',
     cityCode: codeList[1] || '',
     countyCode: codeList[2] || '',
     townCode: codeList[3] || '',
+    businessLicense: getImgUrl(attrs.value),
+    businessPermitUrl: getImgUrl(permitUrl.value),
   };
   delete params.addressCode;
+
   saveBuiness(params)
     .then((res) => {
       if (res.code === 200) {
@@ -629,17 +659,32 @@ const rowSave = (row, done, loading) => {
 
 // 编辑
 const rowEdit = (row) => {
-  // row.addressCode = row.provinceCode + ',' + row.cityCode + ',' + row.countyCode + ',' + row.townCode;
-  // console.info('编辑', row);
+  row.addressCode = [row.provinceCode, row.cityCode, row.countyCode, row.townCode];
+  attrs.value = [row.businessLicense] || [];
+  permitUrl.value = [row.businessPermitUrl] || [];
+  beforeOpen(row.businessType);
   crudRef.value.rowEdit(row);
 };
 
 const doDetail = (row) => {
+  row.addressCode = [row.provinceCode, row.cityCode, row.countyCode, row.townCode];
+  attrs.value = [row.businessLicense] || [];
+  permitUrl.value = [row.businessPermitUrl] || [];
+  beforeOpen(row.businessType);
   crudRef.value.rowView(row);
 };
+const getImgUrl = (data) => {
+  let url = '';
+  if (data && data.length) {
+    url = data.map((m) => {
+      return m.url;
+    });
+  }
+  return url.toString();
+};
 const rowUpdate = (row, index, done, loading) => {
-  console.info('更新');
-  let codeList = row.addressCode.split(',');
+  // console.info('更新', row.addressCode);
+  let codeList = row.addressCode;
   let params = {
     ...row,
     provinceCode: codeList[0] || '',
@@ -680,7 +725,7 @@ const rowDel = (row, index, done) => {
           if (res.code === 200) {
             app.$message.success('删除成功！');
             loadData();
-            done();
+            // done();
           }
         })
         .catch((err) => {
diff --git a/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue b/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue
index 53cccba..6f7774e 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue
@@ -8,20 +8,37 @@
       :table-loading="state.loading"
       :data="state.data"
       :option="state.options"
-      @refresh-change="refreshChange"
-      @search-reset="searchChange"
-      @search-change="searchChange"
+      @refresh-change="loadData"
+      @search-reset="
+        () => {
+          loadData(1);
+        }
+      "
+      @search-change="
+        (form, done) => {
+          loadData(1);
+          done();
+        }
+      "
       @selection-change="selectionChange"
       @current-change="currentChange"
       @size-change="sizeChange"
-      @row-save="rowSave"
       @row-update="rowUpdate"
-      @row-del="rowDel"
     >
       <template #menu-left>
         <el-button type="success" icon="download" @click="onExport">导出</el-button>
       </template>
-
+      <template #businessLicense-form="{ column, value, type }">
+        <Attrs v-model:attrs="attrs" :type="'view'" :limit="1" />
+      </template>
+      <template #businessPermitUrl-form="{ column, value, type }">
+        <Attrs v-model:attrs="permitUrl" :type="'view'" :limit="1" />
+      </template>
+      <template #status="{ row }">
+        <el-tag v-if="row.status == '0'" type="warning" size="small">待审核</el-tag>
+        <el-tag v-if="row.status == '1'" type="success" size="small">通过</el-tag>
+        <el-tag v-if="row.status == '2'" type="danger" size="small">拒绝</el-tag>
+      </template>
       <template #menu="scope">
         <custom-table-operate :actions="state.options.actions" :data="scope" />
       </template>
@@ -34,33 +51,25 @@ 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 { getBuinesCheckList, doBusinessCheck, exportBusinessCheck } from '@/apis/productOperateMain';
+import Attrs from '@/views/inputSuppliesManage/common/Attrs.vue';
 
 const { VITE_APP_BASE_API } = import.meta.env;
 const app = useApp();
 const UserStore = useUserStore();
 const crudRef = ref(null);
 
-const jobTypeOptions = reactive([
-  { label: '蔬菜', value: '0' },
-  { label: '水果', value: '1' },
-]);
+let typeVal = ref(null);
+let columnHide = reactive({
+  addDisplay: false,
+  editDisplay: false,
+  viewDisplay: false,
+});
 
-const bTypeOptions = reactive([
-  { label: '个体', value: '0' },
-  { label: '村集体', value: '1' },
-  { label: '合作社', value: '2' },
-  { label: '企业', value: '3' },
-]);
+let groupDisabled = reactive({
+  editDisabled: true,
+  viewDisabled: true,
+});
 
 const auditStatusOptions = reactive([
   { label: '待审核', value: '0' },
@@ -68,31 +77,63 @@ const auditStatusOptions = reactive([
   { label: '已拒绝', value: '2' },
 ]);
 
-const productTypeOptions = reactive([
-  { label: '蔬菜', value: '0' },
-  { label: '水果', value: '1' },
-]);
+const attrs = ref([]);
+const permitUrl = ref([]);
 
-let bTypeVal = ref('0');
-const baseColumn = reactive([]);
-const individualBase = [
-  { label: '身份证号', prop: 'crop' },
-  { label: '联系电话', prop: 'crop' },
-  { label: '联系地址', prop: 'crop' },
-];
+const filterByLevel = (data, maxLevel = 3) => {
+  return data
+    .filter((item) => item.level <= maxLevel) // 筛选当前层符合条件的节点
+    .map((item) => ({
+      ...item,
+      areaChildVOS: item.areaChildVOS
+        ? filterByLevel(item.areaChildVOS, maxLevel) // 递归处理子节点
+        : [],
+    }));
+};
 
-const collectiveBase = [
-  { label: '负责人', prop: 'crop' },
-  { label: '负责人电话', prop: 'crop' },
-  { label: '联系地址', prop: 'crop' },
-];
+const beforeOpen = (val) => {
+  state.options.group[1].display = state.options.group[2].display = val == 2 || val == 3 ? true : false;
+  setDisplay('villageCount', state.options.group[0].column, val == 2 || val == 3 ? true : false);
+  setDisplay('idCard', state.options.group[0].column, val == 0 ? true : false);
+  // console.info('state.options.group[0].column', state.options.group[0].column);
+};
 
-const enterpriseBase = [
-  { label: '企业规模', prop: 'crop' },
-  { label: '负责人', prop: 'crop' },
-  { label: '负责人电话', prop: 'crop' },
-  { label: '公司地址', prop: 'crop' },
-];
+const setDisplay = (field, target, val) => {
+  let index = target.findIndex((m) => {
+    return m.prop == field;
+  });
+  console.info('setDisplay', field);
+  if (index > -1) {
+    target[index].display = val;
+    console.info('target[index].display', target[index].display);
+  }
+};
+
+let businessType = reactive({
+  label: '主体类型',
+  prop: 'businessType',
+  type: 'radio',
+  className: 'el-col-md-24',
+  props: {
+    label: 'dictLabel',
+    value: 'dictValue',
+  },
+  dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
+  dicQuery: {
+    dictType: 'sys_business_type',
+    current: 1,
+    size: 10,
+  },
+  dicHeaders: {
+    authorization: UserStore.token,
+  },
+  dicFormatter: (res) => {
+    return (res.data.records ?? []).map((item) => ({
+      ...item,
+      dictValue: Number(item.dictValue),
+    }));
+  },
+});
 
 const state = reactive({
   loading: false,
@@ -110,107 +151,154 @@ const state = reactive({
     searchSpan: 8,
     searchGutter: 100,
     searchMenuPosition: 'center',
+    updateBtnText: '审核',
     column: [
+      {
+        ...businessType,
+        ...columnHide,
+        showOverflowTooltip: true,
+        span: 24,
+        type: 'select',
+      },
       {
         label: '主体代码',
-        prop: 'executor',
-        addDisplay: false,
-        editDisplay: false,
+        prop: 'id',
+        width: '120px',
+        ellipsis: true,
+        showOverflowTooltip: true,
+        ...columnHide,
         search: true,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '主体名称',
-        prop: 'executor',
+        prop: 'businessName',
+        width: '160px',
+        ellipsis: true,
+        showOverflowTooltip: true,
+        ...columnHide,
         search: true,
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '主体类型',
-        prop: 'BType',
-        type: 'select',
-        remote: false,
-        search: true,
-        addDisplay: false,
-        editDisplay: false,
-        props: {
-          label: 'landName',
-          value: 'id',
-        },
-        dicData: bTypeOptions,
-        // 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',
-          },
-        ],
-      },
-      {
-        label: '经营许可证有效期',
-        prop: 'operationDate',
-        type: 'date',
-        format: 'YYYY-MM-DD',
-        valueFormat: 'YYYY-MM-DD',
-        width: 200,
-        search: true,
-        addDisplay: false,
-        editDisplay: false,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '经营产品种类',
-        showOverflowTooltip: true,
-        search: false,
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
+        prop: 'productType',
+        type: 'select',
+        width: '120px',
+        remote: false,
+        search: true,
+        ...columnHide,
+        props: {
+          label: 'dictLabel',
+          value: 'dictValue',
         },
+        dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
+        dicQuery: {
+          dictType: 'sys_business_product_type',
+          current: 1,
+          size: 100,
+        },
+        dicHeaders: {
+          authorization: UserStore.token,
+        },
+        dicFormatter: (res) => res.data.records ?? [],
+        rules: [{ required: true, message: '请选择', trigger: 'blur' }],
       },
       {
-        label: '主要产品',
-        prop: 'crop',
+        label: '主要经营产品',
+        prop: 'primaryProduct',
+        width: '120px',
+        showOverflowTooltip: true,
         search: false,
-        addDisplay: false,
-        editDisplay: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
+      },
+      {
+        label: '统一信用代码/证件号码',
+        prop: 'idCard',
+        search: false,
+        width: '200px',
+        labelWidth: '160px',
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
+      },
+      {
+        label: '规模',
+        prop: 'villageCount',
+        search: false,
+        width: '200px',
+        labelWidth: '160px',
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
+      },
+      {
+        label: '负责人',
+        prop: 'headName',
+        search: false,
+        width: '200px',
+        labelWidth: '160px',
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
+      },
+      {
+        label: '联系地址',
+        prop: 'addressCode',
+        type: 'cascader',
+        checkStrictly: false,
+        width: '200px',
+        ellipsis: true,
+        showOverflowTooltip: true,
+        ...columnHide,
+        search: true,
+        props: {
+          label: 'areaName',
+          value: 'areaCode',
+          children: 'areaChildVOS',
         },
+        dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`,
+        dicHeaders: {
+          authorization: UserStore.token,
+        },
+        dicFormatter: (res) => filterByLevel(res.data ?? []),
+        rules: [{ required: true, message: '请选择', trigger: 'blur' }],
+      },
+      {
+        label: '详细地址',
+        prop: 'detailAddress',
+        search: false,
+        ellipsis: true,
+        showOverflowTooltip: true,
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
+      },
+      {
+        label: '联系电话',
+        prop: 'phone',
+        width: '160px',
+        search: false,
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '审核状态',
-        prop: 'crop',
-        addDisplay: false,
-        editDisplay: false,
+        prop: 'status',
+        width: '80px',
+        ...columnHide,
         search: false,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
       {
         label: '审核意见',
-        prop: 'crop',
+        prop: 'reviewSuggestion',
         addDisplay: false,
         editDisplay: false,
+        width: '200px',
+        ellipsis: true,
+        showOverflowTooltip: true,
+        ...columnHide,
+        rules: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
-      { label: '审核时间', prop: 'crop', addDisplay: false, editDisplay: false, search: false },
-      { label: '创建时间', prop: 'crop', addDisplay: false, editDisplay: false, search: false },
+      { label: '创建时间', prop: 'createTime', ...columnHide, width: '160px', search: false },
     ],
     searchColumn: [
       { label: '主体代码', prop: 'landName', search: true },
@@ -227,7 +315,25 @@ const state = reactive({
         prop: 'operationType',
         type: 'select',
         search: true,
-        dicData: bTypeOptions,
+        props: {
+          label: 'dictLabel',
+          value: 'dictValue',
+        },
+        dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
+        dicQuery: {
+          dictType: 'sys_business_type',
+          current: 1,
+          size: 10,
+        },
+        dicHeaders: {
+          authorization: UserStore.token,
+        },
+        dicFormatter: (res) => {
+          return (res.data.records ?? []).map((item) => ({
+            ...item,
+            dictValue: Number(item.dictValue),
+          }));
+        },
       },
       {
         label: '创建日期',
@@ -244,54 +350,76 @@ const state = reactive({
         label: '基本信息>',
         prop: 'caseInfo',
         column: [
-          {
-            label: '主体代码',
-            prop: 'taskCode',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-          },
           {
             label: '主体名称',
-            prop: 'taskCode',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            prop: 'businessName',
+            ...groupDisabled,
+            rules: [{ required: true, message: '请输入', trigger: 'blur' }],
           },
           {
-            label: '主体类型',
-            prop: 'bType',
-            type: 'select',
-            dicData: bTypeOptions,
-            rules: { required: true, message: '请选择', trigger: 'blur' },
+            ...businessType,
+            ...groupDisabled,
           },
           {
             label: '经营产品种类',
+            prop: 'productType',
             type: 'select',
-            dicData: productTypeOptions,
-            rules: { required: true, message: '请选择', trigger: 'blur' },
+            ...groupDisabled,
+            props: {
+              label: 'dictLabel',
+              value: 'dictValue',
+            },
+            dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
+            dicQuery: {
+              dictType: 'sys_business_product_type',
+              current: 1,
+              size: 100,
+            },
+            dicHeaders: {
+              authorization: UserStore.token,
+            },
+            dicFormatter: (res) => res.data.records ?? [],
           },
           {
             label: '主要产品',
-            prop: 'product',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
+            prop: 'primaryProduct',
+            ...groupDisabled,
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
-            label: '合作社规模',
-            prop: 'inspectionType',
-            rules: { required: false, message: '请选择', trigger: 'blur' },
+            label: '规模',
+            prop: 'villageCount',
+            ...groupDisabled,
+            rules: [{ required: false, message: '请选择', trigger: 'blur' }],
+          },
+          {
+            label: '户主身份证号',
+            prop: 'idCard',
+            ...groupDisabled,
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '负责人',
-            prop: 'inspectionTarget',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
+            prop: 'headName',
+            ...groupDisabled,
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '负责人电话',
-            prop: 'inspectionTarget',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
+            prop: 'phone',
+            ...groupDisabled,
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '联系地址',
-            prop: 'inspectionTarget',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-            type: 'select',
+            prop: 'addressCode',
+            ...groupDisabled,
+            type: 'cascader',
+            checkStrictly: false,
+            width: '200px',
+            ellipsis: true,
+            showOverflowTooltip: true,
+            search: true,
             props: {
               label: 'areaName',
               value: 'areaCode',
@@ -301,95 +429,108 @@ const state = reactive({
             dicHeaders: {
               authorization: UserStore.token,
             },
-            dicFormatter: (res) => res.data ?? [],
+            dicFormatter: (res) => filterByLevel(res.data ?? []),
+            rules: [{ required: true, message: '请选择', trigger: 'blur' }],
           },
           {
             label: '详细地址',
-            prop: 'notes',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            prop: 'detailAddress',
+            ...groupDisabled,
+            rules: [{ required: true, message: '请输入', trigger: 'blur' }],
           },
         ],
       },
       {
         label: '营业执照>',
-        prop: 'caseInfo',
+        prop: 'license1',
+        display: typeVal.value == 2 || typeVal.value == 3 ? true : false,
         column: [
           {
             label: '统一社会信用代码',
-            prop: 'notes',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            prop: 'unifiedSocialCreditCode',
+            ...groupDisabled,
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '营业执照',
-            prop: 'license',
+            prop: 'businessLicense',
+            hide: true,
+            formslot: true,
+            ...groupDisabled,
+            span: 24,
+            rules: { required: false, message: '请输入', trigger: 'blur' },
           },
           {
             label: '有效期至',
-            prop: 'operationDate',
+            prop: 'businessLicenseExpiryDate',
             type: 'date',
             format: 'YYYY-MM-DD',
             valueFormat: 'YYYY-MM-DD',
+            ...groupDisabled,
             width: 200,
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '经营项目',
-            prop: 'inspectionSituation',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            prop: 'businessProject',
+            ...groupDisabled,
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
         ],
       },
       {
         label: '经营许可证>',
-        prop: 'caseInfo',
+        prop: 'license2',
+        display: typeVal.value == 2 || typeVal.value == 3 ? true : false,
         column: [
           {
             label: '经营许可证编号',
-            prop: 'operationType',
-            rules: { required: false, message: '请输入', trigger: 'blur' },
+            prop: 'businessPermitNumber',
+            ...groupDisabled,
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
           {
             label: '经营许可证',
-            prop: 'permit',
-            rules: { required: false, message: '请选择', trigger: 'blur' },
+            prop: 'businessPermitUrl',
+            hide: true,
+            formslot: true,
+            ...groupDisabled,
+            span: 24,
+            rules: [{ required: false, message: '请选择', trigger: 'blur' }],
           },
           {
             label: '有效期至',
-            prop: 'operationDate',
+            prop: 'businessPermitExpiryDate',
             type: 'date',
             format: 'YYYY-MM-DD',
             valueFormat: 'YYYY-MM-DD',
+            ...groupDisabled,
             width: 200,
-            rules: { required: true, message: '请输入', trigger: 'blur' },
+            rules: [{ required: false, message: '请输入', trigger: 'blur' }],
           },
         ],
       },
       {
-        label: '审核操作>',
-        prop: 'caseInfo',
+        label: '审核信息>',
+        prop: 'caseInfo3',
+        addDisplay: false,
         column: [
           {
             label: '是否通过',
-            prop: 'isIllegal',
+            prop: 'status',
             span: 24,
             display: true,
             type: 'radio',
             editDisplay: true,
             addDisplay: false,
             dicData: [
-              {
-                label: '是',
-                value: '1',
-              },
-              {
-                label: '否',
-                value: '0',
-              },
+              { label: '是', value: '1' },
+              { label: '否', value: '0' },
             ],
           },
           {
             label: '审核意见',
-            prop: 'note',
+            prop: 'reviewSuggestion',
             type: 'textarea',
             span: 24,
             minRows: 3, // 设置最小行数
@@ -419,26 +560,26 @@ const state = reactive({
 
 // 加载
 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;
-  //     });
+  state.loading = true;
+  getBuinesCheckList(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();
@@ -496,13 +637,50 @@ function uniqueObjects(arr, key) {
     return acc;
   }, []);
 }
-// 新增
-const rowSave = (row, done, loading) => {
-  // console.info('新增', row);
-  saveOperationRecord(row)
+
+const onExport = () => {
+  if (isEmpty(state.data)) {
+    app.$message.error('当前暂时没有可供导出的数据！');
+    return;
+  }
+  state.loading = true;
+  const fileName = '经营主体审核列表';
+  exportBusinessCheck(state.query)
+    .then((res) => {
+      if (res.status === 200) {
+        downloadFile(res.data, `${fileName}.xlsx`, 'blob');
+        app.$message.success('导出成功！');
+      }
+    })
+    .catch((err) => {
+      app.$message.error('导出失败！');
+    })
+    .finally(() => {
+      state.loading = false;
+    });
+};
+
+const doExam = (row) => {
+  row.addressCode = [row.provinceCode, row.cityCode, row.countyCode, row.townCode];
+  attrs.value = [row.businessLicense] || [];
+  permitUrl.value = [row.businessPermitUrl] || [];
+  beforeOpen(row.businessType);
+  crudRef.value && crudRef.value.rowEdit(row);
+};
+
+const rowUpdate = (row, index, done, loading) => {
+  let params = {
+    checkId: row.checkId || '',
+    businessId: row.id || '',
+    status: row.status,
+    reviewSuggestion: row.reviewSuggestion,
+  };
+
+  console.info('审核params', params);
+  doBusinessCheck(params)
     .then((res) => {
       if (res.code === 200) {
-        app.$message.success('添加成功！');
+        app.$message.success('审核成功！');
         done();
         loadData();
       }
@@ -514,63 +692,4 @@ const rowSave = (row, done, loading) => {
       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 onExport = () => {
-  //   if (isEmpty(state.data)) {
-  //     app.$message.error('当前暂时没有可供导出的数据！');
-  //     return;
-  //   }
-  //   state.loading = true;
-  //   const fileName = '网格明细表';
-  //   ExportEntity(state.query)
-  //     .then((res) => {
-  //       if (res.status === 200) {
-  //         downloadFile(res.data, `${fileName}.xlsx`, 'blob');
-  //         app.$message.success('导出成功！');
-  //       }
-  //     })
-  //     .catch((err) => {
-  //       app.$message.error('导出失败！');
-  //     })
-  //     .finally(() => {
-  //       state.loading = false;
-  // });
-};
-
-const doExam = (row) => {
-  crudRef.value && crudRef.value.rowEdit(row);
-};
 </script>
diff --git a/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue b/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue
index a40d632..00283e7 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue
@@ -35,15 +35,6 @@ 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 { getBuinesCheckRecord, exportBusinessCheckRecord } from '@/apis/productOperateMain';
 
 const { VITE_APP_BASE_API } = import.meta.env;
@@ -51,11 +42,6 @@ const app = useApp();
 const UserStore = useUserStore();
 const crudRef = ref(null);
 
-const jobTypeOptions = reactive([
-  { label: '蔬菜', value: '0' },
-  { label: '水果', value: '1' },
-]);
-
 const bTypeOptions = reactive([
   { label: '个体', value: '0' },
   { label: '村集体', value: '1' },
@@ -74,27 +60,6 @@ const productTypeOptions = reactive([
   { label: '水果', value: '1' },
 ]);
 
-let bTypeVal = ref('0');
-const baseColumn = reactive([]);
-const individualBase = [
-  { label: '身份证号', prop: 'crop' },
-  { label: '联系电话', prop: 'crop' },
-  { label: '联系地址', prop: 'crop' },
-];
-
-const collectiveBase = [
-  { label: '负责人', prop: 'crop' },
-  { label: '负责人电话', prop: 'crop' },
-  { label: '联系地址', prop: 'crop' },
-];
-
-const enterpriseBase = [
-  { label: '企业规模', prop: 'crop' },
-  { label: '负责人', prop: 'crop' },
-  { label: '负责人电话', prop: 'crop' },
-  { label: '公司地址', prop: 'crop' },
-];
-
 const state = reactive({
   loading: false,
   query: {
@@ -111,6 +76,7 @@ const state = reactive({
     searchSpan: 8,
     searchGutter: 100,
     searchMenuPosition: 'center',
+    menu: false,
     column: [
       {
         label: '主体类型',
@@ -152,91 +118,91 @@ const state = reactive({
         search: true,
         rules: { required: true, message: '请输入', trigger: 'blur' },
       },
-      {
-        label: '经营产品种类',
-        prop: 'productType',
-        type: 'select',
-        width: '120px',
-        remote: false,
-        search: true,
-        props: {
-          label: 'dictLabel',
-          value: 'dictValue',
-        },
-        dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
-        dicQuery: {
-          dictType: 'sys_business_product_type',
-          current: 1,
-          size: 100,
-        },
-        dicHeaders: {
-          authorization: UserStore.token,
-        },
-        dicFormatter: (res) => res.data.records ?? [],
-        rules: [{ required: true, message: '请选择', trigger: 'blur' }],
-      },
-      {
-        label: '主要经营产品',
-        prop: 'primaryProduct',
-        width: '120px',
-        showOverflowTooltip: true,
-        search: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '统一信用代码/证件号码',
-        prop: 'idCard',
-        search: false,
-        width: '200px',
-        labelWidth: '160px',
-        rules: { required: true, message: '请输入', trigger: 'blur' },
-      },
-      {
-        label: '联系地址',
-        prop: 'addressCode',
-        type: 'cascader',
-        checkStrictly: false,
-        width: '200px',
-        ellipsis: true,
-        showOverflowTooltip: true,
-        addDisplay: true,
-        editDisplay: true,
-        search: true,
-        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: 'detailAddress',
-        search: false,
-        ellipsis: true,
-        showOverflowTooltip: true,
-        rules: { required: true, message: '请输入', trigger: 'blur' },
-      },
-      {
-        label: '联系电话',
-        prop: 'phone',
-        width: '160px',
-        search: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
+      // {
+      //   label: '经营产品种类',
+      //   prop: 'productType',
+      //   type: 'select',
+      //   width: '120px',
+      //   remote: false,
+      //   search: true,
+      //   props: {
+      //     label: 'dictLabel',
+      //     value: 'dictValue',
+      //   },
+      //   dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
+      //   dicQuery: {
+      //     dictType: 'sys_business_product_type',
+      //     current: 1,
+      //     size: 100,
+      //   },
+      //   dicHeaders: {
+      //     authorization: UserStore.token,
+      //   },
+      //   dicFormatter: (res) => res.data.records ?? [],
+      //   rules: [{ required: true, message: '请选择', trigger: 'blur' }],
+      // },
+      // {
+      //   label: '主要经营产品',
+      //   prop: 'primaryProduct',
+      //   width: '120px',
+      //   showOverflowTooltip: true,
+      //   search: false,
+      //   rules: {
+      //     required: true,
+      //     message: '请输入',
+      //     trigger: 'blur',
+      //   },
+      // },
+      // {
+      //   label: '统一信用代码/证件号码',
+      //   prop: 'idCard',
+      //   search: false,
+      //   width: '200px',
+      //   labelWidth: '160px',
+      //   rules: { required: true, message: '请输入', trigger: 'blur' },
+      // },
+      // {
+      //   label: '联系地址',
+      //   prop: 'addressCode',
+      //   type: 'cascader',
+      //   checkStrictly: false,
+      //   width: '200px',
+      //   ellipsis: true,
+      //   showOverflowTooltip: true,
+      //   addDisplay: true,
+      //   editDisplay: true,
+      //   search: true,
+      //   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: 'detailAddress',
+      //   search: false,
+      //   ellipsis: true,
+      //   showOverflowTooltip: true,
+      //   rules: { required: true, message: '请输入', trigger: 'blur' },
+      // },
+      // {
+      //   label: '联系电话',
+      //   prop: 'phone',
+      //   width: '160px',
+      //   search: false,
+      //   rules: {
+      //     required: true,
+      //     message: '请输入',
+      //     trigger: 'blur',
+      //   },
+      // },
       {
         label: '审核状态',
         prop: 'status',
@@ -244,11 +210,7 @@ const state = reactive({
         addDisplay: false,
         editDisplay: false,
         search: false,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
+        rules: { required: true, message: '请输入', trigger: 'blur' },
       },
       {
         label: '审核意见',
@@ -264,7 +226,7 @@ const state = reactive({
           trigger: 'blur',
         },
       },
-      { label: '创建时间', prop: 'createTime', addDisplay: false, editDisplay: false, search: false },
+      { label: '创建时间', prop: 'createTime', width: '180px', addDisplay: false, editDisplay: false, search: false },
     ],
     searchColumn: [
       { label: '主体代码', prop: 'landName', search: true },
@@ -440,26 +402,20 @@ const state = reactive({
         column: [
           {
             label: '是否通过',
-            prop: 'isIllegal',
+            prop: 'status',
             span: 24,
             display: true,
             type: 'radio',
             editDisplay: true,
             addDisplay: false,
             dicData: [
-              {
-                label: '是',
-                value: '1',
-              },
-              {
-                label: '否',
-                value: '0',
-              },
+              { label: '是', value: 1 },
+              { label: '否', value: 0 },
             ],
           },
           {
             label: '审核意见',
-            prop: 'note',
+            prop: 'reviewSuggestion',
             type: 'textarea',
             span: 24,
             minRows: 3, // 设置最小行数
@@ -538,7 +494,7 @@ const onExport = () => {
     return;
   }
   state.loading = true;
-  const fileName = '网格明细表';
+  const fileName = '经营主体审核历史列表';
   exportBusinessCheckRecord(state.query)
     .then((res) => {
       if (res.status === 200) {
diff --git a/sub-government-affairs-service/src/views/productOperateMain/home/index.vue b/sub-government-affairs-service/src/views/productOperateMain/home/index.vue
index 352769f..e7601aa 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/home/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/home/index.vue
@@ -1,12 +1,14 @@
 <template>
   <div>
-    <mapSplashed></mapSplashed>
+    <iframe :src="iframeUrl" :style="iframeStyle"></iframe>
   </div>
 </template>
+
 <script setup>
-// import { reactive, ref } from 'vue';
-// import { useApp } from '@/hooks';
+import { reactive, ref } from 'vue';
 import mapSplashed from '../home/components/mapSplashed.vue';
+const iframeUrl = ref('http://192.168.18.41:9000/v2/entities');
+const iframeStyle = ref({ width: '100%', height: ' calc(100vh - 120px)' });
 </script>
 
 <style></style>

From b27bc1ba09d9e72515b76fac4043467c1206ffdd Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Sun, 27 Apr 2025 15:50:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=8F=E8=90=A5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=BB=E4=BD=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/router/modules/productOperateMain.js  |   4 +-
 .../businessEntity/index.vue                  |  11 +-
 .../views/productOperateMain/examine/list.vue |  99 ++++---
 .../productOperateMain/examine/record.vue     | 277 ++++++------------
 4 files changed, 153 insertions(+), 238 deletions(-)

diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js
index ef0591b..c3d447d 100644
--- a/sub-government-affairs-service/src/router/modules/productOperateMain.js
+++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js
@@ -48,13 +48,13 @@ export default [
         path: '/sub-government-affairs-service/examineList',
         component: () => import('@/views/productOperateMain/examine/list.vue'),
         name: 'examineList',
-        meta: { title: '主体审核管理', icon: 'Document' },
+        meta: { title: '待审核', icon: 'Document' },
       },
       {
         path: '/sub-government-affairs-service/examineRecord',
         component: () => import('@/views/productOperateMain/examine/record.vue'),
         name: 'examineRecord',
-        meta: { title: '主体审核历史', icon: 'Document' },
+        meta: { title: '审核历史', icon: 'Document' },
       },
     ],
   },
diff --git a/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue b/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
index 1cfe5a5..26ff9c4 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
@@ -39,7 +39,7 @@
       </template>
 
       <template #status="{ row }">
-        <el-tag v-if="row.status == '0'" type="warning" size="small">待审核</el-tag>
+        <el-tag v-if="row.status == '0' || !row.status" type="warning" size="small">待审核</el-tag>
         <el-tag v-if="row.status == '1'" type="success" size="small">通过</el-tag>
         <el-tag v-if="row.status == '2'" type="danger" size="small">拒绝</el-tag>
       </template>
@@ -87,7 +87,6 @@ let businessType = reactive({
   label: '主体类型',
   prop: 'businessType',
   type: 'radio',
-  className: 'el-col-md-24',
   props: {
     label: 'dictLabel',
     value: 'dictValue',
@@ -343,6 +342,7 @@ const state = reactive({
           },
           {
             ...businessType,
+            className: 'el-col-md-24',
             change: (val) => bTypeChange(val.value),
           },
           {
@@ -496,8 +496,8 @@ const state = reactive({
             editDisabled: true,
             viewDisabled: true,
             dicData: [
-              { label: '是', value: '1' },
-              { label: '否', value: '0' },
+              { label: '是', value: 1 },
+              { label: '否', value: 0 },
             ],
           },
           {
@@ -586,6 +586,9 @@ const loadData = (resetPage) => {
       if (res.code === 200) {
         const { current, size, total, records } = res.data;
         state.data = records;
+        state.data = state.data.map((m) => {
+          return { ...m, addressCode: [m.provinceCode, m.cityCode, m.countyCode, m.townCode] };
+        });
         pageData.value.total = res.data.total;
       }
     })
diff --git a/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue b/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue
index 6f7774e..c2cd635 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/examine/list.vue
@@ -3,8 +3,8 @@
     <avue-crud
       ref="crudRef"
       v-model="state.form"
-      v-model:search="state.query"
-      v-model:page="state.pageData"
+      v-model:search="searchCondition"
+      v-model:page="pageData"
       :table-loading="state.loading"
       :data="state.data"
       :option="state.options"
@@ -35,7 +35,7 @@
         <Attrs v-model:attrs="permitUrl" :type="'view'" :limit="1" />
       </template>
       <template #status="{ row }">
-        <el-tag v-if="row.status == '0'" type="warning" size="small">待审核</el-tag>
+        <el-tag v-if="row.status == '0' || !row.status" type="warning" size="small">待审核</el-tag>
         <el-tag v-if="row.status == '1'" type="success" size="small">通过</el-tag>
         <el-tag v-if="row.status == '2'" type="danger" size="small">拒绝</el-tag>
       </template>
@@ -48,7 +48,7 @@
 <script setup>
 import { reactive, ref } from 'vue';
 import { useApp } from '@/hooks';
-import { CRUD_OPTIONS } from '@/config';
+import { CRUD_OPTIONS, pageData } from '@/config';
 import { isEmpty, downloadFile } from '@/utils';
 import { useUserStore } from '@/store/modules/user';
 import { getBuinesCheckList, doBusinessCheck, exportBusinessCheck } from '@/apis/productOperateMain';
@@ -77,6 +77,16 @@ const auditStatusOptions = reactive([
   { label: '已拒绝', value: '2' },
 ]);
 
+const searchCondition = ref({
+  businessType: null,
+  businessId: '',
+  productType: '', //产品类型
+  createStartTime: '',
+  createEndTime: '',
+  primaryProduct: '',
+  status: null,
+});
+
 const attrs = ref([]);
 const permitUrl = ref([]);
 
@@ -113,7 +123,6 @@ let businessType = reactive({
   label: '主体类型',
   prop: 'businessType',
   type: 'radio',
-  className: 'el-col-md-24',
   props: {
     label: 'dictLabel',
     value: 'dictValue',
@@ -135,6 +144,12 @@ let businessType = reactive({
   },
 });
 
+const searchDateChange = (val) => {
+  // console.info('searchDateChange', val);
+  searchCondition.value.createStartTime = val[0] || '';
+  searchCondition.value.createEndTime = val[1] || '';
+};
+
 const state = reactive({
   loading: false,
   query: {
@@ -152,6 +167,7 @@ const state = reactive({
     searchGutter: 100,
     searchMenuPosition: 'center',
     updateBtnText: '审核',
+    updateBtn: false,
     column: [
       {
         ...businessType,
@@ -301,40 +317,20 @@ const state = reactive({
       { label: '创建时间', prop: 'createTime', ...columnHide, width: '160px', search: false },
     ],
     searchColumn: [
-      { label: '主体代码', prop: 'landName', search: true },
-      { label: '主体名称', prop: 'crop', search: true },
+      {
+        ...businessType,
+        button: true,
+        searchSpan: 24,
+      },
+      { label: '主体代码', prop: 'id', search: true },
+      { label: '主体名称', prop: 'businessName', search: true },
       {
         label: '审核状态',
-        prop: 'auditStatus',
+        prop: 'status',
         type: 'select',
         search: true,
         dicData: auditStatusOptions,
       },
-      {
-        label: '主体类型',
-        prop: 'operationType',
-        type: 'select',
-        search: true,
-        props: {
-          label: 'dictLabel',
-          value: 'dictValue',
-        },
-        dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
-        dicQuery: {
-          dictType: 'sys_business_type',
-          current: 1,
-          size: 10,
-        },
-        dicHeaders: {
-          authorization: UserStore.token,
-        },
-        dicFormatter: (res) => {
-          return (res.data.records ?? []).map((item) => ({
-            ...item,
-            dictValue: Number(item.dictValue),
-          }));
-        },
-      },
       {
         label: '创建日期',
         prop: 'operationDate',
@@ -343,6 +339,7 @@ const state = reactive({
         valueFormat: 'YYYY-MM-DD',
         width: 200,
         search: true,
+        change: (val) => searchDateChange(val.value),
       },
     ],
     group: [
@@ -359,6 +356,7 @@ const state = reactive({
           {
             ...businessType,
             ...groupDisabled,
+            className: 'el-col-md-24',
           },
           {
             label: '经营产品种类',
@@ -524,8 +522,8 @@ const state = reactive({
             editDisplay: true,
             addDisplay: false,
             dicData: [
-              { label: '是', value: '1' },
-              { label: '否', value: '0' },
+              { label: '是', value: 1 },
+              { label: '否', value: 0 },
             ],
           },
           {
@@ -559,18 +557,30 @@ const state = reactive({
 });
 
 // 加载
-const loadData = () => {
+const loadData = (resetPage) => {
+  resetPage === 1 && (pageData.value.currentPage = 1);
   state.loading = true;
-  getBuinesCheckList(state.query)
+  let searchParmer = {
+    ...searchCondition.value,
+  };
+
+  delete searchParmer.operationDate;
+  let params = Object.assign(
+    {
+      current: pageData.value.currentPage,
+      size: pageData.value.size,
+    },
+    searchParmer
+  );
+  getBuinesCheckList(params)
     .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,
-        };
+        state.data = state.data.map((m) => {
+          return { ...m, addressCode: [m.provinceCode, m.cityCode, m.countyCode, m.townCode] };
+        });
+        pageData.value.total = res.data.total;
       }
     })
     .catch((err) => {
@@ -665,6 +675,9 @@ const doExam = (row) => {
   attrs.value = [row.businessLicense] || [];
   permitUrl.value = [row.businessPermitUrl] || [];
   beforeOpen(row.businessType);
+  state.options.updateBtn = !row.status || row.status == 0 ? true : false;
+  // state.options.group[state.options.group.length - 1].column[0].disabled = !row.status || row.status == 0 ? false : true;
+  state.options.group[state.options.group.length - 1].column[1].disabled = !row.status || row.status == 0 ? false : true;
   crudRef.value && crudRef.value.rowEdit(row);
 };
 
@@ -676,7 +689,7 @@ const rowUpdate = (row, index, done, loading) => {
     reviewSuggestion: row.reviewSuggestion,
   };
 
-  console.info('审核params', params);
+  // console.info('审核params', params);
   doBusinessCheck(params)
     .then((res) => {
       if (res.code === 200) {
diff --git a/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue b/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue
index 00283e7..b548b36 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/examine/record.vue
@@ -3,14 +3,23 @@
     <avue-crud
       ref="crudRef"
       v-model="state.form"
-      v-model:search="state.query"
-      v-model:page="state.pageData"
+      v-model:search="searchCondition"
+      v-model:page="pageData"
       :table-loading="state.loading"
       :data="state.data"
       :option="state.options"
-      @refresh-change="refreshChange"
-      @search-reset="searchChange"
-      @search-change="searchChange"
+      @refresh-change="loadData"
+      @search-reset="
+        () => {
+          loadData(1);
+        }
+      "
+      @search-change="
+        (form, done) => {
+          loadData(1);
+          done();
+        }
+      "
       @selection-change="selectionChange"
       @current-change="currentChange"
       @size-change="sizeChange"
@@ -19,7 +28,7 @@
         <el-button type="success" icon="download" @click="onExport">导出</el-button>
       </template>
       <template #status="{ row }">
-        <el-tag v-if="row.status == '0'" type="warning" size="small">待审核</el-tag>
+        <el-tag v-if="row.status == '0' || !row.status" type="warning" size="small">待审核</el-tag>
         <el-tag v-if="row.status == '1'" type="success" size="small">通过</el-tag>
         <el-tag v-if="row.status == '2'" type="danger" size="small">拒绝</el-tag>
       </template>
@@ -32,7 +41,7 @@
 <script setup>
 import { reactive, ref } from 'vue';
 import { useApp } from '@/hooks';
-import { CRUD_OPTIONS } from '@/config';
+import { CRUD_OPTIONS, pageData } from '@/config';
 import { isEmpty, downloadFile } from '@/utils';
 import { useUserStore } from '@/store/modules/user';
 import { getBuinesCheckRecord, exportBusinessCheckRecord } from '@/apis/productOperateMain';
@@ -42,23 +51,27 @@ const app = useApp();
 const UserStore = useUserStore();
 const crudRef = ref(null);
 
-const bTypeOptions = reactive([
-  { label: '个体', value: '0' },
-  { label: '村集体', value: '1' },
-  { label: '合作社', value: '2' },
-  { label: '企业', value: '3' },
-]);
-
 const auditStatusOptions = reactive([
   { label: '待审核', value: '0' },
   { label: '已通过', value: '1' },
   { label: '已拒绝', value: '2' },
 ]);
 
-const productTypeOptions = reactive([
-  { label: '蔬菜', value: '0' },
-  { label: '水果', value: '1' },
-]);
+const searchCondition = ref({
+  businessType: null,
+  businessId: '',
+  productType: '', //产品类型
+  createStartTime: '',
+  createEndTime: '',
+  primaryProduct: '',
+  status: null,
+});
+
+const searchDateChange = (val) => {
+  // console.info('searchDateChange', val);
+  searchCondition.value.createStartTime = val[0] || '';
+  searchCondition.value.createEndTime = val[1] || '';
+};
 
 const state = reactive({
   loading: false,
@@ -95,13 +108,17 @@ const state = reactive({
         dicHeaders: {
           authorization: UserStore.token,
         },
-        dicFormatter: (res) => res.data.records ?? [],
+        dicFormatter: (res) => {
+          return (res.data.records ?? []).map((item) => ({
+            ...item,
+            dictValue: Number(item.dictValue),
+          }));
+        },
         rules: { required: true, message: '请选择', trigger: 'blur' },
       },
       {
         label: '主体代码',
         prop: 'id',
-        width: '120px',
         ellipsis: true,
         showOverflowTooltip: true,
         addDisplay: false,
@@ -214,7 +231,7 @@ const state = reactive({
       },
       {
         label: '审核意见',
-        prop: 'remark',
+        prop: 'reviewSuggestion',
         addDisplay: false,
         editDisplay: false,
         width: '200px',
@@ -229,8 +246,15 @@ const state = reactive({
       { label: '创建时间', prop: 'createTime', width: '180px', addDisplay: false, editDisplay: false, search: false },
     ],
     searchColumn: [
-      { label: '主体代码', prop: 'landName', search: true },
-      { label: '主体名称', prop: 'crop', search: true },
+      { label: '主体代码', prop: 'id', search: true },
+      { label: '主体名称', prop: 'businessName', search: true },
+      {
+        label: '审核状态',
+        prop: 'status',
+        type: 'select',
+        search: true,
+        dicData: auditStatusOptions,
+      },
       {
         label: '经营产品种类',
         prop: 'productType',
@@ -256,10 +280,27 @@ const state = reactive({
       },
       {
         label: '主体类型',
-        prop: 'operationType',
-        type: 'select',
-        search: true,
-        dicData: bTypeOptions,
+        prop: 'businessType',
+        type: 'radio',
+        props: {
+          label: 'dictLabel',
+          value: 'dictValue',
+        },
+        dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list`,
+        dicQuery: {
+          dictType: 'sys_business_type',
+          current: 1,
+          size: 10,
+        },
+        dicHeaders: {
+          authorization: UserStore.token,
+        },
+        dicFormatter: (res) => {
+          return (res.data.records ?? []).map((item) => ({
+            ...item,
+            dictValue: Number(item.dictValue),
+          }));
+        },
       },
       {
         label: '创建日期',
@@ -269,161 +310,7 @@ const state = reactive({
         valueFormat: 'YYYY-MM-DD',
         width: 200,
         search: true,
-      },
-    ],
-    group: [
-      {
-        label: '基本信息>',
-        prop: 'caseInfo',
-        column: [
-          {
-            label: '主体代码',
-            prop: 'taskCode',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-          },
-          {
-            label: '主体名称',
-            prop: 'taskCode',
-            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: 'product',
-            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: 'inspectionTarget',
-            rules: { required: true, message: '请输入', trigger: 'blur' },
-            type: 'select',
-            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' },
-          },
-        ],
-      },
-      {
-        label: '审核操作>',
-        prop: 'caseInfo',
-        column: [
-          {
-            label: '是否通过',
-            prop: 'status',
-            span: 24,
-            display: true,
-            type: 'radio',
-            editDisplay: true,
-            addDisplay: false,
-            dicData: [
-              { label: '是', value: 1 },
-              { label: '否', value: 0 },
-            ],
-          },
-          {
-            label: '审核意见',
-            prop: 'reviewSuggestion',
-            type: 'textarea',
-            span: 24,
-            minRows: 3, // 设置最小行数
-            maxRows: 5, // 设置最大行数
-            overHidden: true,
-            width: 200,
-          },
-        ],
+        change: (val) => searchDateChange(val.value),
       },
     ],
   },
@@ -437,18 +324,30 @@ const state = reactive({
 });
 
 // 加载
-const loadData = () => {
+const loadData = (resetPage) => {
+  resetPage === 1 && (pageData.value.currentPage = 1);
   state.loading = true;
-  getBuinesCheckRecord(state.query)
+  let searchParmer = {
+    ...searchCondition.value,
+  };
+
+  delete searchParmer.operationDate;
+  let params = Object.assign(
+    {
+      current: pageData.value.currentPage,
+      size: pageData.value.size,
+    },
+    searchParmer
+  );
+  getBuinesCheckRecord(params)
     .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,
-        };
+        state.data = state.data.map((m) => {
+          return { ...m, addressCode: [m.provinceCode, m.cityCode, m.countyCode, m.townCode] };
+        });
+        pageData.value.total = res.data.total;
       }
     })
     .catch((err) => {