From 711c632cfc126dbe0322b7455fb3b2a9d59b3293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E9=B8=BF?= Date: Fri, 13 Jun 2025 16:36:59 +0800 Subject: [PATCH] tag-dev-pro-20250613 --- .../src/router/modules/lands.js | 12 +- .../src/router/modules/resource.js | 2 +- .../src/router/modules/trace.js | 6 +- .../component/landsManage/index.vue | 2 +- .../views/productOperateMain/coOp/index.vue | 239 +++++++++++------- .../productOperateMain/individual/index.vue | 22 +- .../src/views/trace/record/base/index.vue | 4 +- 7 files changed, 167 insertions(+), 120 deletions(-) diff --git a/sub-government-affairs-service/src/router/modules/lands.js b/sub-government-affairs-service/src/router/modules/lands.js index 3022680..94bf110 100644 --- a/sub-government-affairs-service/src/router/modules/lands.js +++ b/sub-government-affairs-service/src/router/modules/lands.js @@ -33,12 +33,12 @@ const landsRoutes = [ component: () => import('@/views/landManage/component/landPartol/index.vue'), meta: { title: '土地使用巡查', icon: '' }, }, - { - path: '/sub-government-affairs-service/illegalHandle', - name: 'illegalHandle', - component: () => import('@/views/landManage/component/illegalHandle/index.vue'), - meta: { title: '土地案件', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/illegalHandle', + // name: 'illegalHandle', + // component: () => import('@/views/landManage/component/illegalHandle/index.vue'), + // meta: { title: '土地案件', icon: '' }, + // }, ], }, ]; diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js index 2055121..24e54d4 100644 --- a/sub-government-affairs-service/src/router/modules/resource.js +++ b/sub-government-affairs-service/src/router/modules/resource.js @@ -16,7 +16,7 @@ export default [ path: '/sub-government-affairs-service/landCassification', name: 'landCassification', component: () => import('@/views/dict/component/landCassification/index.vue'), - meta: { title: '土地分类', icon: '' }, + meta: { title: '土地分类', icon: 'Discount' }, }, { redirect: '/sub-government-affairs-service/add-grid', diff --git a/sub-government-affairs-service/src/router/modules/trace.js b/sub-government-affairs-service/src/router/modules/trace.js index 9ddcd56..45323c1 100644 --- a/sub-government-affairs-service/src/router/modules/trace.js +++ b/sub-government-affairs-service/src/router/modules/trace.js @@ -55,20 +55,20 @@ export default [ path: '/sub-government-affairs-service/trace-search', name: 'trace-search', component: () => import('@/views/trace/search/index.vue'), - meta: { title: '溯源查询', icon: '' }, + meta: { title: '溯源查询', icon: 'Files' }, }, { path: '/sub-government-affairs-service/trace-info', name: 'trace-info', component: () => import('@/views/trace/search/info.vue'), - meta: { title: '溯源详情', icon: '' }, + meta: { title: '溯源详情', icon: 'DocumentCopy' }, hidden: true, }, { path: '/sub-government-affairs-service/trace-statistic', name: 'trace-statistic', component: () => import('@/views/trace/statistic/index.vue'), - meta: { title: '溯源统计', icon: '' }, + meta: { title: '溯源统计', icon: 'Filter' }, }, ], }, diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue index c9e12ed..6273d2b 100644 --- a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue @@ -117,7 +117,7 @@ diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue index a96c096..81941c3 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue @@ -14,7 +14,7 @@ 新增 @@ -170,86 +170,78 @@ const crudOptions = reactive({ column: [ { label: '农企/合作社名称', prop: 'businessName' }, { label: '地点', prop: 'regAddress' }, - { label: '面积', prop: 'area' }, + { label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)} 亩` }, { label: '经营产品', prop: 'businessScope' }, { label: '联系人', prop: 'contactPerson' }, { label: '联系电话', prop: 'phone' }, { label: '聘工人数', prop: 'villageCount' }, - { label: '状态', prop: 'status' }, { label: '信息录入时间', prop: 'createTime' }, { label: '信息更新时间', prop: 'updateTime' }, ], - actions: [ - { - name: '查看', - icon: 'view', - event: ({ row }) => handleView(row), - }, - { - name: '编辑', - icon: 'edit', - event: ({ row }) => handleEdit(row), - }, - { - type: 'danger', - name: '删除', - icon: 'delete', - event: ({ row }) => handleDelete(row.id), - }, - // 驳回原因 showRejectReason （仅显示） - { - name: '驳回原因', - icon: 'warning', - event: ({ row }) => { - showRejectReason(row); - }, - }, - - // 提交审核 handleSubmit - { - name: '提交审核', - icon: 'check', - event: ({ row }) => { - if (row.status === '待提交') { - handleSubmit(); - } else { - ElMessage.warning('当前状态不允许提交审核'); - } - }, - }, - // 撤销（待审核 → 待提交），超级管理员和提交人拥有撤销 handleWithdraw - { - name: '撤销', - icon: 'undo', - event: ({ row }) => { - handleWithdraw(row); - }, - }, - // 重新提交 handleResubmit - { - name: '重新提交', - icon: 'resubmit', - event: (row) => { - handleResubmit(row); - }, - }, - // 通过（待审核 → 已通过） handleApprove - { - name: '通过', - icon: 'check-circle', - event: ({ row }) => { - handleApprove(row); - }, - }, - // 驳回（待审核 → 已驳回） handleReject - { - name: '驳回', - icon: 'close-circle', - event: ({ row }) => { - handleReject(row); - }, - }, - ], + // actions: [ + // { + // name: '查看', + // icon: 'view', + // event: ({ row }) => handleView(row), + // }, + // { + // name: '编辑', + // icon: 'edit', + // event: ({ row }) => handleEdit(row), + // }, + // { + // type: 'danger', + // name: '删除', + // icon: 'delete', + // event: ({ row }) => handleDelete(row.id), + // }, + // { + // name: '驳回原因', + // icon: 'warning', + // event: ({ row }) => { + // showRejectReason(row); + // }, + // }, + // { + // name: '提交审核', + // icon: 'check', + // event: ({ row }) => { + // if (row.status === '待提交') { + // handleSubmit(); + // } else { + // ElMessage.warning('当前状态不允许提交审核'); + // } + // }, + // }, + // { + // name: '撤销', + // icon: 'undo', + // event: ({ row }) => { + // handleWithdraw(row); + // }, + // }, + // { + // name: '重新提交', + // icon: 'resubmit', + // event: (row) => { + // handleResubmit(row); + // }, + // }, + // { + // name: '通过', + // icon: 'check-circle', + // event: ({ row }) => { + // handleApprove(row); + // }, + // }, + // { + // name: '驳回', + // icon: 'close-circle', + // event: ({ row }) => { + // handleReject(row); + // }, + // }, + // ], }); // watch( // () => formData.value.addressArr, @@ -308,26 +300,6 @@ const getEnterDetail = async (id) => { ], }; - // // 初始化图片预览（如果之前实现了图片预览功能） - // if (response.data.cooperativePhoto) { - // cooperativePhotoList.value = [ - // { - // name: '合作社照片', - // url: response.data.cooperativePhoto, - // status: 'success', - // }, - // ]; - // } - // if (response.data.businessLicence) { - // businessLicenceList.value = [ - // { - // name: '营业执照', - // url: response.data.businessLicence, - // status: 'success', - // }, - // ]; - // } - console.log('详情数据加载完成', formData.value); } else { ElMessage.error(response?.msg || '获取详情失败：服务器未返回有效数据'); @@ -534,6 +506,85 @@ function handleSkipSave() { handleSkip(); handleSubmit(); } +import { useUserStore } from '@/store/modules/user'; +const UserStore = useUserStore(); +const user = UserStore.getUserInfo(); +console.log('admin 属性：', user.admin); +const isAdmin = user.admin; +const getActions = (row) => { + const actions = [ + // { + // name: '查看', + // icon: 'view', + // event: () => handleView(row), + // }, + // { + // name: '编辑', + // icon: 'edit', + // event: () => handleEdit(row), + // }, + { + type: 'danger', + name: '删除', + icon: 'delete', + event: () => handleDelete(row.id), + }, + ]; + + switch (row.status) { + case '0': // 待提交 + actions.push( + { + name: '提交审核', + icon: 'check', + event: () => handleSubmit(row), + }, + { + name: '重新提交', + icon: 'resubmit', + event: () => handleResubmit(row), + } + ); + break; + + case '1': // 待审核 + if (isAdmin) { + actions.push( + { + name: '通过', + icon: 'check-circle', + event: () => handleApprove(row), + }, + { + name: '驳回', + icon: 'close-circle', + event: () => handleReject(row), + } + ); + } else { + actions.push({ + name: '撤销', + icon: 'undo', + event: () => handleWithdraw(row), + }); + } + break; + + case '2': // 已通过 + // 仅基础操作 + break; + + case '3': // 已驳回 + actions.push({ + name: '驳回原因', + icon: 'warning', + event: () => showRejectReason(row), + }); + break; + } + + return actions; +};