diff --git a/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts
new file mode 100644
index 0000000..b0f89e5
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/api/xxjj/businessWarehouse/index.ts
@@ -0,0 +1,31 @@
+import { defHttp } from '@/utils/http/axios'
+
+// 查询业务线/仓库列表
+export function getBusinessWarehousePage(params) {
+ return defHttp.get({ url: '/xxjj/business-warehouse/page', params })
+}
+
+// 查询业务线/仓库详情
+export function getBusinessWarehouse(id: number) {
+ return defHttp.get({ url: '/xxjj/business-warehouse/get?id=' + id })
+}
+
+// 新增业务线/仓库
+export function createBusinessWarehouse(data) {
+ return defHttp.post({ url: '/xxjj/business-warehouse/create', data })
+}
+
+// 修改业务线/仓库
+export function updateBusinessWarehouse(data) {
+ return defHttp.put({ url: '/xxjj/business-warehouse/update', data })
+}
+
+// 删除业务线/仓库
+export function deleteBusinessWarehouse(id: number) {
+ return defHttp.delete({ url: '/xxjj/business-warehouse/delete?id=' + id })
+}
+
+// 导出业务线/仓库 Excel
+export function exportBusinessWarehouse(params) {
+ return defHttp.download({ url: '/xxjj/business-warehouse/export-excel', params }, '业务线/仓库.xls')
+}
diff --git a/yudao-ui-admin-vben-master/src/utils/dict.ts b/yudao-ui-admin-vben-master/src/utils/dict.ts
index 8d4af3f..7ebce2f 100644
--- a/yudao-ui-admin-vben-master/src/utils/dict.ts
+++ b/yudao-ui-admin-vben-master/src/utils/dict.ts
@@ -152,4 +152,8 @@ export enum DICT_TYPE {
PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status', // 优惠活动的状态
PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
+
+ // ============= BUSINESSLINE 模块=================
+ BUSINESS_TYPE = 'business_type', //业务线类型
+ DIFF_FLAG = 'diff_flag',
}
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue
new file mode 100644
index 0000000..d75087f
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/BusinessWarehouseModal.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts
new file mode 100644
index 0000000..75844d3
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/businessWarehouse.data.ts
@@ -0,0 +1,425 @@
+import { BasicColumn, FormSchema, useRender } from '@/components/Table'
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+
+export const columns: BasicColumn[] = [
+ {
+ title: '业务id',
+ dataIndex: 'id',
+ width: 160
+ },
+ {
+ title: '业务线编号',
+ dataIndex: 'businessCode',
+ width: 160
+ },
+ {
+ title: '业务线简称',
+ dataIndex: 'businessSimple',
+ width: 160
+ },
+ {
+ title: '传真',
+ dataIndex: 'fax',
+ width: 160
+ },
+ {
+ title: '网址',
+ dataIndex: 'url',
+ width: 160
+ },
+ {
+ title: '介绍',
+ dataIndex: 'description',
+ width: 160
+ },
+ {
+ title: '创建时间',
+ dataIndex: 'createTime',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ {
+ title: '业务线名称',
+ dataIndex: 'name',
+ width: 160
+ },
+ {
+ title: '业务线LOGO',
+ dataIndex: 'businessLogo',
+ width: 160
+ },
+ {
+ title: '父id',
+ dataIndex: 'parentId',
+ width: 160
+ },
+ {
+ title: '类型',
+ dataIndex: 'type',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.BUSINESS_TYPE)
+ }
+ },
+ {
+ title: '所属行业',
+ dataIndex: 'industry',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.DUTY_TYPE)
+ }
+ },
+ {
+ title: '所在城市',
+ dataIndex: 'city',
+ width: 160
+ },
+ {
+ title: '成立时间',
+ dataIndex: 'establishDate',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDate(text)
+ }
+ },
+ {
+ title: '归属人员',
+ dataIndex: 'belongUserId',
+ width: 160
+ },
+ {
+ title: '品牌/业务线/事业群名称',
+ dataIndex: 'brandName',
+ width: 160
+ },
+ {
+ title: '电话',
+ dataIndex: 'phone',
+ width: 160
+ },
+ {
+ title: '业务线仓库区分(0:业务线,1:仓库)',
+ dataIndex: 'diffFlag',
+ width: 180,
+ customRender: ({ text }) => {
+ return useRender.renderDict(text, DICT_TYPE.DIFF_FLAG)
+ }
+ },
+]
+
+export const searchFormSchema: FormSchema[] = [
+ // {
+ // label: '业务线编号',
+ // field: 'businessCode',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '业务线简称',
+ // field: 'businessSimple',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '传真',
+ // field: 'fax',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '网址',
+ // field: 'url',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '介绍',
+ // field: 'description',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '创建时间',
+ // field: 'createTime',
+ // component: 'RangePicker',
+ // colProps: { span: 8 }
+ // },
+ {
+ label: '业务线名称',
+ field: 'name',
+ component: 'Input',
+ colProps: { span: 8 }
+ },
+ // {
+ // label: '业务线LOGO',
+ // field: 'businessLogo',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '父id',
+ // field: 'parentId',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '类型',
+ // field: 'type',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.BUSINESS_TYPE)
+ // },
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '所属行业',
+ // field: 'industry',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.DUTY_TYPE)
+ // },
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '所在城市',
+ // field: 'city',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '成立时间',
+ // field: 'establishDate',
+ // component: 'RangePicker',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '归属人员',
+ // field: 'belongUserId',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '品牌/业务线/事业群名称',
+ // field: 'brandName',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '电话',
+ // field: 'phone',
+ // component: 'Input',
+ // colProps: { span: 8 }
+ // },
+ // {
+ // label: '业务线仓库区分(0:业务线,1:仓库)',
+ // field: 'diffFlag',
+ // component: 'Select',
+ // componentProps: {
+ // options: getDictOptions(DICT_TYPE.DIFF_FLAG)
+ // },
+ // colProps: { span: 8 }
+ // },
+]
+
+export const createFormSchema: FormSchema[] = [
+ {
+ label: '编号',
+ field: 'id',
+ show: false,
+ component: 'Input'
+ },
+ {
+ label: '业务线编号',
+ field: 'businessCode',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务线简称',
+ field: 'businessSimple',
+ component: 'Input'
+ },
+ {
+ label: '传真',
+ field: 'fax',
+ component: 'Input'
+ },
+ {
+ label: '网址',
+ field: 'url',
+ component: 'Input'
+ },
+ {
+ label: '介绍',
+ field: 'description',
+ component: 'InputTextArea'
+ },
+ {
+ label: '业务线名称',
+ field: 'name',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务线LOGO',
+ field: 'businessLogo',
+ component: 'Input'
+ },
+ {
+ label: '父id',
+ field: 'parentId',
+ component: 'Input'
+ },
+ {
+ label: '类型',
+ field: 'type',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.BUSINESS_TYPE, 'number')
+ }
+ },
+ {
+ label: '所属行业',
+ field: 'industry',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number')
+ }
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input'
+ },
+ {
+ label: '成立时间',
+ field: 'establishDate',
+ component: 'DatePicker'
+ },
+ {
+ label: '归属人员',
+ field: 'belongUserId',
+ component: 'Input'
+ },
+ {
+ label: '品牌/业务线/事业群名称',
+ field: 'brandName',
+ component: 'Input'
+ },
+ {
+ label: '电话',
+ field: 'phone',
+ component: 'Input'
+ },
+ {
+ label: '业务线仓库区分(0:业务线,1:仓库)',
+ field: 'diffFlag',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number')
+ }
+ },
+]
+
+export const updateFormSchema: FormSchema[] = [
+ {
+ label: '编号',
+ field: 'id',
+ show: false,
+ component: 'Input'
+ },
+ {
+ label: '业务线编号',
+ field: 'businessCode',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务线简称',
+ field: 'businessSimple',
+ component: 'Input'
+ },
+ {
+ label: '传真',
+ field: 'fax',
+ component: 'Input'
+ },
+ {
+ label: '网址',
+ field: 'url',
+ component: 'Input'
+ },
+ {
+ label: '介绍',
+ field: 'description',
+ component: 'InputTextArea'
+ },
+ {
+ label: '业务线名称',
+ field: 'name',
+ required: true,
+ component: 'Input'
+ },
+ {
+ label: '业务线LOGO',
+ field: 'businessLogo',
+ component: 'Input'
+ },
+ {
+ label: '父id',
+ field: 'parentId',
+ component: 'Input'
+ },
+ {
+ label: '类型',
+ field: 'type',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.BUSINESS_TYPE, 'number')
+ }
+ },
+ {
+ label: '所属行业',
+ field: 'industry',
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DUTY_TYPE, 'number')
+ }
+ },
+ {
+ label: '所在城市',
+ field: 'city',
+ component: 'Input'
+ },
+ {
+ label: '成立时间',
+ field: 'establishDate',
+ component: 'DatePicker'
+ },
+ {
+ label: '归属人员',
+ field: 'belongUserId',
+ component: 'Input'
+ },
+ {
+ label: '品牌/业务线/事业群名称',
+ field: 'brandName',
+ component: 'Input'
+ },
+ {
+ label: '电话',
+ field: 'phone',
+ component: 'Input'
+ },
+ {
+ label: '业务线仓库区分(0:业务线,1:仓库)',
+ field: 'diffFlag',
+ required: true,
+ component: 'Select',
+ componentProps: {
+ options: getDictOptions(DICT_TYPE.DIFF_FLAG, 'number')
+ }
+ },
+]
\ No newline at end of file
diff --git a/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue
new file mode 100644
index 0000000..6090326
--- /dev/null
+++ b/yudao-ui-admin-vben-master/src/views/xxjj/businessWarehouse/index.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+ {{ t('action.create') }}
+
+
+ {{ t('action.export') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/pom.xml b/yunxi-module-xxjj/yunxi-module-xxjj-biz/pom.xml
index 98d55f7..a02ef1a 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/pom.xml
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/pom.xml
@@ -30,6 +30,11 @@
yunxi-spring-boot-starter-biz-operatelog
+
+ com.yunxi.scm
+ yunxi-spring-boot-starter-biz-tenant
+
+
com.yunxi.scm
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java
index 7249b34..aa9be7d 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseBaseVO.java
@@ -38,6 +38,9 @@ public class BusinessWarehouseBaseVO {
@Schema(description = "类型")
private String type;
+ @Schema(description = "状态")
+ private String status;
+
@Schema(description = "所属行业")
private String industry;
@@ -66,7 +69,7 @@ public class BusinessWarehouseBaseVO {
@Schema(description = "介绍", example = "你猜")
private String description;
- @Schema(description = "介绍", example = "你猜")
+ @Schema(description = "区分标志", example = "你猜")
private String diffFlag;
}
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java
index 712cd68..ebbb7ab 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExcelVO.java
@@ -41,6 +41,9 @@ public class BusinessWarehouseExcelVO {
@ExcelProperty("类型")
private String type;
+ @ExcelProperty("状态")
+ private String status;
+
@ExcelProperty(value = "所属行业", converter = DictConvert.class)
@DictFormat("duty_type") // TODO 代码优化:建议设置到对应的 XXXDictTypeConstants 枚举类中
private String industry;
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java
index 7a7379d..87aeec3 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehouseExportReqVO.java
@@ -31,6 +31,9 @@ public class BusinessWarehouseExportReqVO {
@Schema(description = "类型", example = "1")
private String type;
+ @Schema(description = "状态", example = "1")
+ private String status;
+
@Schema(description = "所属行业")
private String industry;
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java
index f14c7eb..3184129 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/controller/admin/businesswarehouse/vo/BusinessWarehousePageReqVO.java
@@ -33,6 +33,9 @@ public class BusinessWarehousePageReqVO extends PageParam {
@Schema(description = "类型", example = "1")
private String type;
+ @Schema(description = "状态", example = "1")
+ private String status;
+
@Schema(description = "所属行业")
private String industry;
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java
index eda440d..1569420 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/dataobject/businesswarehouse/BusinessWarehouseDO.java
@@ -1,5 +1,6 @@
package com.yunxi.scm.module.xxjj.dal.dataobject.businesswarehouse;
+import com.yunxi.scm.framework.tenant.core.db.TenantBaseDO;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
@@ -21,7 +22,7 @@ import com.yunxi.scm.framework.mybatis.core.dataobject.BaseDO;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-public class BusinessWarehouseDO extends BaseDO {
+public class BusinessWarehouseDO extends TenantBaseDO {
/**
* 业务id
@@ -52,6 +53,10 @@ public class BusinessWarehouseDO extends BaseDO {
* 类型
*/
private String type;
+ /**
+ * 状态
+ */
+ private String status;
/**
* 所属行业
*
diff --git a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
index 8f26c81..fe7e653 100644
--- a/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
+++ b/yunxi-module-xxjj/yunxi-module-xxjj-biz/src/main/java/com/yunxi/scm/module/xxjj/dal/mysql/businesswarehouse/BusinessWarehouseMapper.java
@@ -25,6 +25,7 @@ public interface BusinessWarehouseMapper extends BaseMapperX