diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index 9e70b75..7448b8e 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -45,8 +45,8 @@ export const constantRoutes = [ }, ...resourceRouter, ...traceRouter, - ...landsRoutes, - ...dictRoutes, + // ...landsRoutes, + // ...dictRoutes, ...productOperateMainRoutes, ...inputSuppliesRoutes, ]; diff --git a/sub-government-affairs-service/src/router/modules/dict.js b/sub-government-affairs-service/src/router/modules/dict.js index eca219e..b2a5b88 100644 --- a/sub-government-affairs-service/src/router/modules/dict.js +++ b/sub-government-affairs-service/src/router/modules/dict.js @@ -1,10 +1,11 @@ import Layout from '@/layouts/index.vue'; +import Views from '@/layouts/Views.vue'; const dictRoutes = [ { path: '/sub-government-affairs-service/dict', name: 'dict', - component: Layout, + component: Views, redirect: '/sub-government-affairs-service/region', meta: { title: '基础信息维护', icon: 'Document' }, children: [ diff --git a/sub-government-affairs-service/src/router/modules/lands.js b/sub-government-affairs-service/src/router/modules/lands.js index 440eb12..d4424b2 100644 --- a/sub-government-affairs-service/src/router/modules/lands.js +++ b/sub-government-affairs-service/src/router/modules/lands.js @@ -1,10 +1,11 @@ import Layout from '@/layouts/index.vue'; +import Views from '@/layouts/Views.vue'; const landsRoutes = [ { path: '/sub-government-affairs-service/landManage', name: 'landManage', - component: Layout, + component: Views, redirect: '/sub-government-affairs-service/landsManage', meta: { title: '土地管理', icon: 'Document' }, children: [ diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js index 6109b27..25b8b5b 100644 --- a/sub-government-affairs-service/src/router/modules/productOperateMain.js +++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js @@ -20,6 +20,12 @@ export default [ name: 'collective', meta: { title: '村集体', icon: 'Document' }, }, + { + path: '/sub-government-affairs-service/coop', + component: () => import('@/views/productOperateMain/coOp/index.vue'), + name: 'coop', + meta: { title: '合作社', icon: 'Document' }, + }, ], }, ]; diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js index 52a5eac..45cb536 100644 --- a/sub-government-affairs-service/src/router/modules/resource.js +++ b/sub-government-affairs-service/src/router/modules/resource.js @@ -1,6 +1,8 @@ import Layout from '@/layouts/index.vue'; import annualplanRouters from './annualplan'; import statisticsRoutes from './statisticAnalysis'; +import landsRoutes from './lands'; +import dictRoutes from './dict'; export default [ { @@ -18,6 +20,8 @@ export default [ }, ...annualplanRouters, ...statisticsRoutes, + ...landsRoutes, + ...dictRoutes, ], }, ]; diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue new file mode 100644 index 0000000..1cd141c --- /dev/null +++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue @@ -0,0 +1,466 @@ + + diff --git a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue index 5aecae1..9925683 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue @@ -237,15 +237,6 @@ const state = reactive({ }, }, { label: '创建时间', prop: 'crop', addDisplay: false, editDisplay: false, search: false }, - { - label: '创建日期', - prop: 'operationDate', - type: 'daterange', - format: 'YYYY-MM-DD', - valueFormat: 'YYYY-MM-DD', - width: 200, - search: true, - }, ], searchColumn: [ { label: '主体代码', prop: 'landName', search: true },