diff --git a/sub-government-affairs-service/src/apis/productOperateMain.js b/sub-government-affairs-service/src/apis/productOperateMain.js
index 02370da..7c6089f 100644
--- a/sub-government-affairs-service/src/apis/productOperateMain.js
+++ b/sub-government-affairs-service/src/apis/productOperateMain.js
@@ -3,23 +3,31 @@ import request from '@/utils/axios';
/* 经营主体相关 */
export function getBuinessList(params = {}) {
- return request('land-resource/business/businessPage', {
+ return request('/product-business/business/businessPage', {
method: 'GET',
params,
});
}
export function saveBuiness(data = {}) {
- return request('land-resource/business/businessSave', {
+ return request('/product-business/business/businessSave', {
method: 'POST',
data,
});
}
export function editBuiness(data = {}) {
- return request('/land-resource/business/businessEdit', {
+ return request('/product-business/business/businessEdit', {
method: 'POST',
data,
});
}
+
+export function delBuiness(params = {}) {
+ return request('/product-businesse/business/deleteBusiness', {
+ method: 'DELETE',
+ params,
+ });
+}
+
// #endregion
diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js
index 99cdfbb..ef0591b 100644
--- a/sub-government-affairs-service/src/router/modules/productOperateMain.js
+++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js
@@ -15,29 +15,35 @@ export default [
meta: { title: '数据可视化管理', icon: 'Document' },
},
{
- 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' },
- },
- {
- path: '/sub-government-affairs-service/coop',
- component: () => import('@/views/productOperateMain/coOp/index.vue'),
- name: 'coop',
- meta: { title: '合作社', icon: 'Document' },
- },
- {
- path: '/sub-government-affairs-service/enterprise',
- component: () => import('@/views/productOperateMain/enterprise/index.vue'),
- name: 'enterprise',
- meta: { title: '经营企业', icon: 'Document' },
+ path: '/sub-government-affairs-service/businessEntity',
+ component: () => import('@/views/productOperateMain/businessEntity/index.vue'),
+ name: 'businessEntity',
+ meta: { title: '经营主体', icon: 'Document' },
},
+ // {
+ // 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' },
+ // },
+ // {
+ // path: '/sub-government-affairs-service/coop',
+ // component: () => import('@/views/productOperateMain/coOp/index.vue'),
+ // name: 'coop',
+ // meta: { title: '合作社', icon: 'Document' },
+ // },
+ // {
+ // path: '/sub-government-affairs-service/enterprise',
+ // component: () => import('@/views/productOperateMain/enterprise/index.vue'),
+ // name: 'enterprise',
+ // meta: { title: '经营企业', icon: 'Document' },
+ // },
{
path: '/sub-government-affairs-service/examineList',
component: () => import('@/views/productOperateMain/examine/list.vue'),
diff --git a/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue b/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
new file mode 100644
index 0000000..a67d631
--- /dev/null
+++ b/sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
@@ -0,0 +1,488 @@
+
+
+
{
+ loadData(1);
+ }
+ "
+ @search-change="
+ (form, done) => {
+ loadData(1);
+ done();
+ }
+ "
+ @selection-change="selectionChange"
+ @current-change="loadData"
+ @size-change="loadData"
+ @row-save="rowSave"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ >
+
+
+ 批量删除
+
+
+ 待审核
+ 通过
+ 拒绝
+
+
+
+
+
+
+
+
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 aeafb0d..b023c7c 100644
--- a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
+++ b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
@@ -49,6 +49,8 @@ import {
importOperationRecord,
} from '@/apis/land';
+import { getBuinessList } from '@/apis/productOperateMain';
+
const { VITE_APP_BASE_API } = import.meta.env;
const app = useApp();
const UserStore = useUserStore();
@@ -82,6 +84,12 @@ const state = reactive({
query: {
current: 1,
size: 10,
+ businessType: '',
+ businessId: '',
+ productType: '', //产品类型
+ createStartTime: '',
+ createEndTime: '',
+ primaryProduct: '',
},
form: {},
selection: [],
@@ -95,7 +103,7 @@ const state = reactive({
column: [
{
label: '主体代码',
- prop: 'executor',
+ prop: 'businessId',
addDisplay: false,
editDisplay: false,
search: true,
@@ -115,29 +123,29 @@ const state = reactive({
trigger: 'blur',
},
},
- // {
- // label: '主体类型',
- // prop: 'dictType',
- // type: 'select',
- // search: true,
- // props: {
- // label: 'dictName',
- // value: 'dictType',
- // },
- // dicUrl: `${VITE_APP_BASE_API}/system/dept/list?dictType=sys_business_product_type¤t=1&size=10`,
- // dicHeaders: {
- // authorization: UserStore.token,
- // },
- // dicFormatter: (res) => res.data,
- // rules: {
- // required: true,
- // message: '请选择',
- // trigger: 'blur',
- // },
- // },
+ {
+ label: '主体类型',
+ prop: 'businessType',
+ type: 'select',
+ search: true,
+ props: {
+ label: 'dictLabel',
+ value: 'dictValue',
+ },
+ dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list?dictType=sys_business_type¤t=1&size=10`,
+ dicHeaders: {
+ authorization: UserStore.token,
+ },
+ dicFormatter: (res) => res.data.records ?? [],
+ rules: {
+ required: true,
+ message: '请选择',
+ trigger: 'blur',
+ },
+ },
{
label: '经营产品种类',
- prop: 'landId',
+ prop: 'productType',
type: 'select',
remote: false,
search: true,
@@ -259,11 +267,30 @@ const state = reactive({
{ label: '创建时间', prop: 'crop', addDisplay: false, editDisplay: false, search: false },
],
searchColumn: [
- { label: '主体代码', prop: 'landName', search: true },
+ {
+ label: '主体类型',
+ prop: 'businessType',
+ type: 'select',
+ props: {
+ label: 'dictLabel',
+ value: 'dictValue',
+ },
+ dicUrl: `${VITE_APP_BASE_API}/system/dict/data/list?dictType=sys_business_type¤t=1&size=10`,
+ dicHeaders: {
+ authorization: UserStore.token,
+ },
+ dicFormatter: (res) => res.data.records ?? [],
+ rules: {
+ required: true,
+ message: '请选择',
+ trigger: 'blur',
+ },
+ },
+ { label: '主体代码', prop: 'businessId', search: true },
{ label: '主体名称', prop: 'crop', search: true },
{
label: '经营产品种类',
- prop: 'operationType',
+ prop: 'productType',
type: 'select',
search: true,
dicData: jobTypeOptions,
@@ -308,26 +335,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;
+ getBuinessList(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();
diff --git a/sub-operation-service/src/assets/images/ecommerce/trace01.png b/sub-operation-service/src/assets/images/ecommerce/trace01.png
new file mode 100644
index 0000000..158d576
Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/trace01.png differ
diff --git a/sub-operation-service/src/assets/images/ecommerce/trace02.png b/sub-operation-service/src/assets/images/ecommerce/trace02.png
new file mode 100644
index 0000000..daf955b
Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/trace02.png differ
diff --git a/sub-operation-service/src/assets/images/ecommerce/trace03.png b/sub-operation-service/src/assets/images/ecommerce/trace03.png
new file mode 100644
index 0000000..f487106
Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/trace03.png differ
diff --git a/sub-operation-service/src/assets/images/ecommerce/trace05.png b/sub-operation-service/src/assets/images/ecommerce/trace05.png
new file mode 100644
index 0000000..9421307
Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/trace05.png differ
diff --git a/sub-operation-service/src/assets/images/ecommerce/trace06.png b/sub-operation-service/src/assets/images/ecommerce/trace06.png
new file mode 100644
index 0000000..210c9b0
Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/trace06.png differ
diff --git a/sub-operation-service/src/assets/images/ecommerce/traceb.png b/sub-operation-service/src/assets/images/ecommerce/traceb.png
new file mode 100644
index 0000000..aeb1379
Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/traceb.png differ
diff --git a/sub-operation-service/src/assets/images/ecommerce/tracetxt.png b/sub-operation-service/src/assets/images/ecommerce/tracetxt.png
new file mode 100644
index 0000000..8b46a88
Binary files /dev/null and b/sub-operation-service/src/assets/images/ecommerce/tracetxt.png differ
diff --git a/sub-operation-service/src/components/costomImg.vue b/sub-operation-service/src/components/costomImg.vue
new file mode 100644
index 0000000..1806654
--- /dev/null
+++ b/sub-operation-service/src/components/costomImg.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
diff --git a/sub-operation-service/src/layouts/component/Header/index.vue b/sub-operation-service/src/layouts/component/Header/index.vue
index 8bd3296..f33a36e 100644
--- a/sub-operation-service/src/layouts/component/Header/index.vue
+++ b/sub-operation-service/src/layouts/component/Header/index.vue
@@ -15,7 +15,7 @@