diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index 26299d6..0614a38 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -12,7 +12,7 @@ import resourceRouter from './modules/resource'; import traceRouter from './modules/trace'; import landsRoutes from './modules/lands'; import dictRoutes from './modules/dict'; -import annualplanRoutes from './modules/annualplan'; +import productOperateMainRoutes from './modules/productOperateMain'; export const constantRoutes = [ { @@ -46,6 +46,7 @@ export const constantRoutes = [ ...traceRouter, ...landsRoutes, ...dictRoutes, + ...productOperateMainRoutes, ]; /** diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js new file mode 100644 index 0000000..6109b27 --- /dev/null +++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js @@ -0,0 +1,25 @@ +import Layout from '@/layouts/index.vue'; + +export default [ + { + path: '/sub-government-affairs-service/productOperateMain', + name: 'productOperateMain', + component: Layout, + redirect: '/sub-government-affairs-service/individual', + meta: { title: '生产经营主体', icon: 'icon-test' }, + children: [ + { + path: '/sub-government-affairs-service/individual', + component: () => import('@/views/productOperateMain/individual/index.vue'), + name: 'individual', + meta: { title: '个体户', icon: 'Document' }, + }, + { + path: '/sub-government-affairs-service/collective', + component: () => import('@/views/productOperateMain/collective/index.vue'), + name: 'collective', + meta: { title: '村集体', icon: 'Document' }, + }, + ], + }, +]; diff --git a/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue b/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue index 782b575..7c4c17b 100644 --- a/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue @@ -129,6 +129,10 @@ const state = reactive({ ...CRUD_OPTIONS, addBtnText: '新增', updateBtnText: '确定', + searchSpan: 6, + searchGutter: 80, + searchMenuPosition: 'center', + index: true, column: [ { label: '任务编号', @@ -307,7 +311,6 @@ const state = reactive({ ], }, ], - searchColumn: [], actions: [ { name: '登记结果', @@ -491,3 +494,13 @@ const infoHide = () => { infoVisible.value = false; }; + diff --git a/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue b/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue index bb48ee8..0abe97d 100644 --- a/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue @@ -108,6 +108,10 @@ const state = reactive({ options: { ...CRUD_OPTIONS, addBtnText: '新增作业', + searchLabelWidth: '80px', + searchSpan: 6, + searchGutter: 80, + searchMenuPosition: 'center', column: [ { label: '作业日期', diff --git a/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue b/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue new file mode 100644 index 0000000..e19b34a --- /dev/null +++ b/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue @@ -0,0 +1,274 @@ + + diff --git a/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue b/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue index 6d30a75..f5b462a 100644 --- a/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue @@ -52,7 +52,8 @@ 种植阶段详情 -
+ +
diff --git a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue new file mode 100644 index 0000000..5aecae1 --- /dev/null +++ b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue @@ -0,0 +1,455 @@ + +