diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js index f73f253..23526cb 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -3,63 +3,81 @@ import Views from '@/layouts/Views.vue'; const inputSuppliesRoutes = [ { - path: '/sub-government-affairs-service/inputSuppliesManage', + path: '/sub-government-affairs-service/material', name: 'inputSuppliesManage', component: Layout, - redirect: '/sub-government-affairs-service/materialManage', - meta: { title: '投入品监管平台', icon: 'FullScreen' }, + redirect: '/sub-government-affairs-service/material/pesticide', + meta: { title: '投入品管理', icon: 'FullScreen' }, children: [ - // { - // path: '/sub-government-affairs-service/inputDataView', - // name: 'inputDataView', - // component: () => import('@/views/inputSuppliesManage/inputDataView/index.vue'), - // meta: { title: '投入品资源一张图', icon: 'Document' }, - // }, { - path: '/sub-government-affairs-service/material', - name: 'material', - component: Views, - redirect: '/sub-government-affairs-service/material/pesticide', - meta: { title: '投入品管理', icon: 'OfficeBuilding' }, - children: [ - { - path: '/sub-government-affairs-service/material/pesticide', - name: 'input-supplies-pesticide', - component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), - meta: { title: '农药管理', icon: '' }, - }, - { - path: '/sub-government-affairs-service/material/fertilizer', - name: 'input-supplies-fertilizer', - component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), - meta: { title: '肥料管理', icon: '' }, - }, - // { - // path: '/sub-government-affairs-service/material/pesticide', - // name: 'input-supplies-pesticide', - // component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), - // meta: { title: '农药管理', icon: '' }, - // }, - // { - // path: '/sub-government-affairs-service/material/ratPoison', - // name: 'input-supplies-ratPoison', - // component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'), - // meta: { title: '兽药管理', icon: '' }, - // }, - { - path: '/sub-government-affairs-service/material/seed', - name: 'input-supplies-seed', - component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), - meta: { title: '种子管理', icon: '' }, - }, - // { - // path: '/sub-government-affairs-service/material/farmMachinery', - // name: 'input-supplies-farmMachinery', - // component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'), - // meta: { title: '农机管理', icon: '' }, - // }, - ], + path: '/sub-government-affairs-service/material/pesticide', + name: 'input-supplies-pesticide', + component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), + meta: { title: '农药管理', icon: '' }, }, + { + path: '/sub-government-affairs-service/material/fertilizer', + name: 'input-supplies-fertilizer', + component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), + meta: { title: '肥料管理', icon: '' }, + }, + { + path: '/sub-government-affairs-service/material/seed', + name: 'input-supplies-seed', + component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), + meta: { title: '种子管理', icon: '' }, + }, + { + path: '/sub-government-affairs-service/material/others', + name: 'input-supplies-others', + component: () => import('@/views/inputSuppliesManage/material/others/index.vue'), + meta: { title: '其他投入品', icon: '' }, + }, + // { + // path: '/sub-government-affairs-service/materialManage', + // name: 'materialManage', + // component: Views, + // redirect: '/sub-government-affairs-service/material/pesticide', + // meta: { title: '投入品管理', icon: 'OfficeBuilding' }, + // children: [ + // { + // path: '/sub-government-affairs-service/material/pesticide', + // name: 'input-supplies-pesticide', + // component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), + // meta: { title: '农药管理', icon: '' }, + // }, + // { + // path: '/sub-government-affairs-service/material/fertilizer', + // name: 'input-supplies-fertilizer', + // component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), + // meta: { title: '肥料管理', icon: '' }, + // }, + // // { + // // path: '/sub-government-affairs-service/material/pesticide', + // // name: 'input-supplies-pesticide', + // // component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), + // // meta: { title: '农药管理', icon: '' }, + // // }, + // // { + // // path: '/sub-government-affairs-service/material/ratPoison', + // // name: 'input-supplies-ratPoison', + // // component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'), + // // meta: { title: '兽药管理', icon: '' }, + // // }, + // { + // path: '/sub-government-affairs-service/material/seed', + // name: 'input-supplies-seed', + // component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), + // meta: { title: '种子管理', icon: '' }, + // }, + // // { + // // path: '/sub-government-affairs-service/material/farmMachinery', + // // name: 'input-supplies-farmMachinery', + // // component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'), + // // meta: { title: '农机管理', icon: '' }, + // // }, + // ], + // }, // { // path: '/sub-government-affairs-service/productionDealer', // name: 'productionDealer', @@ -90,12 +108,12 @@ const inputSuppliesRoutes = [ // component: () => import('@/views/inputSuppliesManage/redBlackRank/index.vue'), // meta: { title: '企业红黑榜', icon: '' }, // }, - { - path: '/sub-government-affairs-service/knowledgeManage', - name: 'knowledgeManage', - component: () => import('@/views/inputSuppliesManage/knowledgeManage/index.vue'), - meta: { title: '知识库', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/knowledgeManage', + // name: 'knowledgeManage', + // component: () => import('@/views/inputSuppliesManage/knowledgeManage/index.vue'), + // meta: { title: '知识库', icon: '' }, + // }, // { // path: '/sub-government-affairs-service/patrolCaseManage', // name: 'patrolCaseManage', diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js index b7cd559..dbe46c5 100644 --- a/sub-government-affairs-service/src/router/modules/productOperateMain.js +++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js @@ -18,7 +18,7 @@ export default [ path: '/sub-government-affairs-service/individual', component: () => import('@/views/productOperateMain/individual/index.vue'), name: 'individual', - meta: { title: '农户', icon: '' }, + meta: { title: '农户管理', icon: '' }, }, // { // path: '/sub-government-affairs-service/collective', @@ -30,7 +30,7 @@ export default [ path: '/sub-government-affairs-service/coop', component: () => import('@/views/productOperateMain/coOp/index.vue'), name: 'coop', - meta: { title: '农企合作社', icon: '' }, + meta: { title: '农企合作社管理', icon: '' }, }, // { // path: '/sub-government-affairs-service/enterprise', @@ -62,12 +62,12 @@ export default [ // name: 'enterprise', // meta: { title: '经营企业', icon: 'Document' }, // }, - { - path: '/sub-government-affairs-service/examineList', - component: () => import('@/views/productOperateMain/examine/list.vue'), - name: 'examineList', - meta: { title: '主体审核管理', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/examineList', + // component: () => import('@/views/productOperateMain/examine/list.vue'), + // name: 'examineList', + // meta: { title: '主体审核管理', icon: '' }, + // }, // { // path: '/sub-government-affairs-service/examineRecord', // component: () => import('@/views/productOperateMain/examine/record.vue'), diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/others/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/others/index.vue new file mode 100644 index 0000000..fc5fb58 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/others/index.vue @@ -0,0 +1,270 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue b/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue index 128b2d7..535908c 100644 --- a/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue +++ b/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue @@ -18,6 +18,10 @@ @row-update="rowUpdate" @row-del="rowDel" > + + @@ -25,6 +29,23 @@ + + @@ -46,31 +67,24 @@ const state = reactive({ query: { current: 1, size: 10, + gridName: '', + regionCode: '', }, form: {}, selection: [], options: { ...CRUD_OPTIONS, - // addBtnText: '添加网格', + addBtnText: '添加网格', + // detail: true, + // detailTitle: '详情', column: [ - // { - // label: '网格区', - // prop: 'gridArea', - // search: true, - // width: 200, - // addDisplay: false, - // editDisplay: false, - // viewDisplay: true, - // rules: { - // required: true, - // message: '请输入', - // trigger: 'blur', - // }, - // }, + { + label: '网格编号', + prop: 'id', + }, { label: '网格名称', prop: 'gridName', - search: true, rules: { required: true, message: '请输入', @@ -78,10 +92,10 @@ const state = reactive({ }, }, { - label: '网格区域', + label: '所属行政区域', prop: 'gridAreaName', - // width: 300, - display: false, + addDisplay: false, + viewDisplay: true, rules: { required: true, message: '请输入', @@ -89,18 +103,16 @@ const state = reactive({ }, }, { - label: '网格区域', + label: '所属行政区域', prop: 'cities', type: 'cascader', hide: true, + span: 24, + width: 300, addDisplay: true, editDisplay: true, viewDisplay: false, - // multiple: true, - // checkStrictly: true, - // collapseTags: true, - // emitPath: false, - // checkDescendants: false, + emitPath: false, props: { label: 'areaName', value: 'areaCode', @@ -117,54 +129,31 @@ const state = reactive({ trigger: 'blur', }, }, + { + label: '网格地图', + prop: 'mapUrl', + type: 'upload', + hide: true, + // action: `${VITE_APP_BASE_API}/system/file/upload`, + }, // { - // label: '网格管理员', - // prop: 'gridManager', - // rules: { - // required: true, - // message: '请输入', - // trigger: 'blur', + // label: '网格名称', + // prop: 'gridName', + // type: 'select', + // addDisplay: false, + // hide: true, + // // search: true, + // searchLabelWidth: 100, + // dicUrl: `${VITE_APP_BASE_API}/land-resource/gridManage/page?regionCode={{key}}`, + // props: { + // label: 'gridName', + // value: 'gridName', // }, - // }, - // { - // label: '联系方式', - // prop: 'contactInfo', - // rules: { - // required: true, - // message: '请输入', - // trigger: 'blur', + // dicHeaders: { + // authorization: UserStore.token, // }, + // dicFormatter: (res) => res.data?.records, // }, - { - label: '省', - prop: 'provinceCode', - hide: true, - display: false, - }, - { - label: '市', - prop: 'cityCode', - hide: true, - display: false, - }, - { - label: '县/区', - prop: 'gridAreaCode', - hide: true, - display: false, - }, - { - label: '乡镇', - prop: 'townCode', - hide: true, - display: false, - }, - { - label: '乡镇', - prop: 'village', - hide: true, - display: false, - }, { label: '备注', prop: 'note', @@ -209,6 +198,32 @@ const state = reactive({ data: [], currentRow: {}, }); +const baseDetailOption = { + column: [ + { + label: '网格名称', + prop: 'gridName', + }, + { + label: '所属行政区域', + prop: 'gridAreaName', + }, + { + label: '备注', + prop: 'note', + }, + ], +}; + +const otherDetailOption = { + column: [ + { + label: '创建时间', + prop: 'createTime', + }, + // 可以添加更多字段... + ], +}; // 加载 const loadData = () => { @@ -276,7 +291,7 @@ const setCity = (row) => { if (!isEmpty(row.cities)) { row.provinceCode = row?.cities[0] ?? null; row.cityCode = row?.cities[1] ?? null; - row.gridAreaCode = row?.cities[2] ?? null; + row.gridAreaCode = row?.cities[4] ?? null; row.townCode = row?.cities[3] ?? null; row.village = row?.cities[4] ?? null; // row.village = row?.cities.join(',');