Merge remote-tracking branch 'origin/master'

src/api/mes/baseEqualMaterialInfo/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseEqualMaterialInfoVO, BaseEqualMaterialInfoForm, BaseEqualMaterialInfoQuery } from '@/api/mes/baseEqualMaterialInfo/types';
+
+/**
+ * 查询等同物料信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseEqualMaterialInfo = (query?: BaseEqualMaterialInfoQuery): AxiosPromise<BaseEqualMaterialInfoVO[]> => {
+  return request({
+    url: '/mes/baseEqualMaterialInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询等同物料信息详细
+ * @param equalMaterialInfoId
+ */
+export const getBaseEqualMaterialInfo = (equalMaterialInfoId: string | number): AxiosPromise<BaseEqualMaterialInfoVO> => {
+  return request({
+    url: '/mes/baseEqualMaterialInfo/' + equalMaterialInfoId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增等同物料信息
+ * @param data
+ */
+export const addBaseEqualMaterialInfo = (data: BaseEqualMaterialInfoForm) => {
+  return request({
+    url: '/mes/baseEqualMaterialInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改等同物料信息
+ * @param data
+ */
+export const updateBaseEqualMaterialInfo = (data: BaseEqualMaterialInfoForm) => {
+  return request({
+    url: '/mes/baseEqualMaterialInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除等同物料信息
+ * @param equalMaterialInfoId
+ */
+export const delBaseEqualMaterialInfo = (equalMaterialInfoId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/baseEqualMaterialInfo/' + equalMaterialInfoId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询等同物料信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseEqualMaterialInfoList (query) {
+    return request({
+        url: '/mes/baseEqualMaterialInfo/getBaseEqualMaterialInfoList',
+        method: 'get',
+        params: query
+    });
+};

src/api/mes/baseEqualMaterialInfo/types.ts

@@ -0,0 +1,116 @@
+export interface BaseEqualMaterialInfoVO {
+  /**
+   * 主键标识
+   */
+  equalMaterialInfoId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 物料ID
+   */
+  materialId: string | number;
+
+  /**
+   * 等同物料ID
+   */
+  equalMaterialId: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface BaseEqualMaterialInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  equalMaterialInfoId?: string | number;
+
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
+  /**
+   * 等同物料ID
+   */
+  equalMaterialId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface BaseEqualMaterialInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  equalMaterialInfoId?: string | number;
+
+  /**
+   * 物料ID
+   */
+  materialId?: string | number;
+
+  /**
+   * 等同物料ID
+   */
+  equalMaterialId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/mes/baseMaterialType/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseMaterialTypeVO, BaseMaterialTypeForm, BaseMaterialTypeQuery } from '@/api/mes/baseMaterialType/types';
+
+/**
+ * 查询物料类型信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseMaterialType = (query?: BaseMaterialTypeQuery): AxiosPromise<BaseMaterialTypeVO[]> => {
+  return request({
+    url: '/mes/baseMaterialType/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询物料类型信息详细
+ * @param matrialTypeId
+ */
+export const getBaseMaterialType = (matrialTypeId: string | number): AxiosPromise<BaseMaterialTypeVO> => {
+  return request({
+    url: '/mes/baseMaterialType/' + matrialTypeId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增物料类型信息
+ * @param data
+ */
+export const addBaseMaterialType = (data: BaseMaterialTypeForm) => {
+  return request({
+    url: '/mes/baseMaterialType',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改物料类型信息
+ * @param data
+ */
+export const updateBaseMaterialType = (data: BaseMaterialTypeForm) => {
+  return request({
+    url: '/mes/baseMaterialType',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除物料类型信息
+ * @param matrialTypeId
+ */
+export const delBaseMaterialType = (matrialTypeId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/baseMaterialType/' + matrialTypeId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询物料类型信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseMaterialTypeList (query) {
+    return request({
+        url: '/mes/baseMaterialType/getBaseMaterialTypeList',
+        method: 'get',
+        params: query
+    });
+};

src/api/mes/baseMaterialType/types.ts

@@ -0,0 +1,195 @@
+export interface BaseMaterialTypeVO {
+  /**
+   * 物料类型ID
+   */
+  matrialTypeId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId: string | number;
+
+  /**
+   * 物料类型编号
+   */
+  matrialTypeCode: string;
+
+  /**
+   * 物料类型名称
+   */
+  matrialTypeName: string;
+
+  /**
+   * 祖级列表
+   */
+  ancestors: string;
+
+  /**
+   * 物料大类(1原材料  2半成品 3成品)
+   */
+  materialCategories: string;
+
+  /**
+   * 物料小类
+   */
+  materialSubclass: string;
+
+  /**
+   * 工序ID
+   */
+  processId: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+    /**
+     * 子对象
+     */
+    children: BaseMaterialTypeVO[];
+}
+
+export interface BaseMaterialTypeForm extends BaseEntity {
+  /**
+   * 物料类型ID
+   */
+  matrialTypeId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 物料类型编号
+   */
+  matrialTypeCode?: string;
+
+  /**
+   * 物料类型名称
+   */
+  matrialTypeName?: string;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 物料大类(1原材料  2半成品 3成品)
+   */
+  materialCategories?: string;
+
+  /**
+   * 物料小类
+   */
+  materialSubclass?: string;
+
+  /**
+   * 工序ID
+   */
+  processId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface BaseMaterialTypeQuery {
+
+  /**
+   * 物料类型ID
+   */
+  matrialTypeId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 物料类型编号
+   */
+  matrialTypeCode?: string;
+
+  /**
+   * 物料类型名称
+   */
+  matrialTypeName?: string;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 物料大类(1原材料  2半成品 3成品)
+   */
+  materialCategories?: string;
+
+  /**
+   * 物料小类
+   */
+  materialSubclass?: string;
+
+  /**
+   * 工序ID
+   */
+  processId?: string | number;
+
+  /**
+   * 激活标识（1是 0否）
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/mes/baseMeasurementUnitInfo/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseMeasurementUnitInfoVO, BaseMeasurementUnitInfoForm, BaseMeasurementUnitInfoQuery } from '@/api/mes/baseMeasurementUnitInfo/types';
+
+/**
+ * 查询计量单位信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseMeasurementUnitInfo = (query?: BaseMeasurementUnitInfoQuery): AxiosPromise<BaseMeasurementUnitInfoVO[]> => {
+  return request({
+    url: '/mes/baseMeasurementUnitInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询计量单位信息详细
+ * @param unitId
+ */
+export const getBaseMeasurementUnitInfo = (unitId: string | number): AxiosPromise<BaseMeasurementUnitInfoVO> => {
+  return request({
+    url: '/mes/baseMeasurementUnitInfo/' + unitId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增计量单位信息
+ * @param data
+ */
+export const addBaseMeasurementUnitInfo = (data: BaseMeasurementUnitInfoForm) => {
+  return request({
+    url: '/mes/baseMeasurementUnitInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改计量单位信息
+ * @param data
+ */
+export const updateBaseMeasurementUnitInfo = (data: BaseMeasurementUnitInfoForm) => {
+  return request({
+    url: '/mes/baseMeasurementUnitInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除计量单位信息
+ * @param unitId
+ */
+export const delBaseMeasurementUnitInfo = (unitId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/baseMeasurementUnitInfo/' + unitId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询计量单位信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseMeasurementUnitInfoList (query) {
+    return request({
+        url: '/mes/baseMeasurementUnitInfo/getBaseMeasurementUnitInfoList',
+        method: 'get',
+        params: query
+    });
+};

src/api/mes/baseMeasurementUnitInfo/types.ts

@@ -0,0 +1,175 @@
+export interface BaseMeasurementUnitInfoVO {
+  /**
+   * 主键标识
+   */
+  unitId: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId: string | number;
+
+  /**
+   * 计量单位编号
+   */
+  unitCode: string;
+
+  /**
+   * 计量单位名称
+   */
+  unitName: string;
+
+  /**
+   * 计量单位转换（与最顶级转换关系，最顶级是1）
+   */
+  unitConversion: number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors: string;
+
+  /**
+   * 单位类型（1长度 2质量 3时间 4面积 5体积）
+   */
+  unitType: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+    /**
+     * 子对象
+     */
+    children: BaseMeasurementUnitInfoVO[];
+}
+
+export interface BaseMeasurementUnitInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  unitId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 计量单位编号
+   */
+  unitCode?: string;
+
+  /**
+   * 计量单位名称
+   */
+  unitName?: string;
+
+  /**
+   * 计量单位转换（与最顶级转换关系，最顶级是1）
+   */
+  unitConversion?: number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 单位类型（1长度 2质量 3时间 4面积 5体积）
+   */
+  unitType?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+}
+
+export interface BaseMeasurementUnitInfoQuery {
+
+  /**
+   * 主键标识
+   */
+  unitId?: string | number;
+
+  /**
+   * 父级标识
+   */
+  parentId?: string | number;
+
+  /**
+   * 计量单位编号
+   */
+  unitCode?: string;
+
+  /**
+   * 计量单位名称
+   */
+  unitName?: string;
+
+  /**
+   * 计量单位转换（与最顶级转换关系，最顶级是1）
+   */
+  unitConversion?: number;
+
+  /**
+   * 祖级列表
+   */
+  ancestors?: string;
+
+  /**
+   * 单位类型（1长度 2质量 3时间 4面积 5体积）
+   */
+  unitType?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/mes/baseRoute/types.ts

@@ -1,3 +1,23 @@
+// 定义工艺路线步骤的接口
+export interface ProdBaseRouteProcess {
+  /** 工序ID */
+  processId: string | number;
+  /** 工序顺序 */
+  processOrder: string | number;
+  /** 备注 */
+  remark?: string;
+  /** 创建人 */
+  createBy?: number;
+  /** 创建时间 */
+  createTime?: string;
+  /** 更新人 */
+  updateBy?: number;
+  /** 更新时间 */
+  updateTime?: string;
+  /** 序号（前端使用） */
+  index?: number;
+}
+
 export interface BaseRouteVO {
   /**
    * 工艺路线ID
@@ -54,6 +74,13 @@ export interface BaseRouteVO {
    */
   updateTime: string;
 
+  /**
+   * 工艺路线步骤列表
+   */
+  routeProcessBoList?: ProdBaseRouteProcess[];
+
+  routeProcessVoList?: ProdBaseRouteProcess[];
+
 }
 
 export interface BaseRouteForm extends BaseEntity {
@@ -82,6 +109,12 @@ export interface BaseRouteForm extends BaseEntity {
    */
   remark?: string;
 
+  /**
+   * 工艺路线步骤列表
+   */
+  routeProcessBoList?: ProdBaseRouteProcess[];
+
+  routeProcessVoList?: ProdBaseRouteProcess[];
 }
 
 export interface BaseRouteQuery extends PageQuery {

src/api/mes/baseSupplierInfo/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseSupplierInfoVO, BaseSupplierInfoForm, BaseSupplierInfoQuery } from '@/api/mes/baseSupplierInfo/types';
+
+/**
+ * 查询供应商信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseSupplierInfo = (query?: BaseSupplierInfoQuery): AxiosPromise<BaseSupplierInfoVO[]> => {
+  return request({
+    url: '/mes/baseSupplierInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询供应商信息详细
+ * @param supplierId
+ */
+export const getBaseSupplierInfo = (supplierId: string | number): AxiosPromise<BaseSupplierInfoVO> => {
+  return request({
+    url: '/mes/baseSupplierInfo/' + supplierId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增供应商信息
+ * @param data
+ */
+export const addBaseSupplierInfo = (data: BaseSupplierInfoForm) => {
+  return request({
+    url: '/mes/baseSupplierInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改供应商信息
+ * @param data
+ */
+export const updateBaseSupplierInfo = (data: BaseSupplierInfoForm) => {
+  return request({
+    url: '/mes/baseSupplierInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除供应商信息
+ * @param supplierId
+ */
+export const delBaseSupplierInfo = (supplierId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/baseSupplierInfo/' + supplierId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询供应商信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseSupplierInfoList (query) {
+    return request({
+        url: '/mes/baseSupplierInfo/getBaseSupplierInfoList',
+        method: 'get',
+        params: query
+    });
+};

src/api/mes/baseSupplierInfo/types.ts

@@ -0,0 +1,161 @@
+export interface BaseSupplierInfoVO {
+  /**
+   * 主键标识
+   */
+  supplierId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 供应商编号
+   */
+  supplierCode: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName: string;
+
+  /**
+   * erp的主键
+   */
+  erpId: string | number;
+
+  /**
+   * 激活状态（1启用 0停用）
+   */
+  supplierStatus: string;
+
+  /**
+   * 审核日期
+   */
+  auditDate: string;
+
+  /**
+   * erp最后更新时间
+   */
+  erpModifyDate: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface BaseSupplierInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供应商编号
+   */
+  supplierCode?: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName?: string;
+
+  /**
+   * erp的主键
+   */
+  erpId?: string | number;
+
+  /**
+   * 激活状态（1启用 0停用）
+   */
+  supplierStatus?: string;
+
+  /**
+   * 审核日期
+   */
+  auditDate?: string;
+
+  /**
+   * erp最后更新时间
+   */
+  erpModifyDate?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface BaseSupplierInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  supplierId?: string | number;
+
+  /**
+   * 供应商编号
+   */
+  supplierCode?: string;
+
+  /**
+   * 供应商名称
+   */
+  supplierName?: string;
+
+  /**
+   * erp的主键
+   */
+  erpId?: string | number;
+
+  /**
+   * 激活状态（1启用 0停用）
+   */
+  supplierStatus?: string;
+
+  /**
+   * 审核日期
+   */
+  auditDate?: string;
+
+  /**
+   * erp最后更新时间
+   */
+  erpModifyDate?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/api/mes/baseToolingInfo/index.ts

@@ -0,0 +1,77 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { BaseToolingInfoVO, BaseToolingInfoForm, BaseToolingInfoQuery } from '@/api/mes/baseToolingInfo/types';
+
+/**
+ * 查询载具工装信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listBaseToolingInfo = (query?: BaseToolingInfoQuery): AxiosPromise<BaseToolingInfoVO[]> => {
+  return request({
+    url: '/mes/baseToolingInfo/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询载具工装信息详细
+ * @param toolingId
+ */
+export const getBaseToolingInfo = (toolingId: string | number): AxiosPromise<BaseToolingInfoVO> => {
+  return request({
+    url: '/mes/baseToolingInfo/' + toolingId,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增载具工装信息
+ * @param data
+ */
+export const addBaseToolingInfo = (data: BaseToolingInfoForm) => {
+  return request({
+    url: '/mes/baseToolingInfo',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改载具工装信息
+ * @param data
+ */
+export const updateBaseToolingInfo = (data: BaseToolingInfoForm) => {
+  return request({
+    url: '/mes/baseToolingInfo',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除载具工装信息
+ * @param toolingId
+ */
+export const delBaseToolingInfo = (toolingId: string | number | Array<string | number>) => {
+  return request({
+    url: '/mes/baseToolingInfo/' + toolingId,
+    method: 'delete'
+  });
+};
+
+
+/**
+ * 下拉框查询载具工装信息列表
+ * @param query
+ * @returns {*}
+ */
+export function getBaseToolingInfoList (query) {
+    return request({
+        url: '/mes/baseToolingInfo/getBaseToolingInfoList',
+        method: 'get',
+        params: query
+    });
+};

src/api/mes/baseToolingInfo/types.ts

@@ -0,0 +1,206 @@
+export interface BaseToolingInfoVO {
+  /**
+   * 主键标识
+   */
+  toolingId: string | number;
+
+  /**
+   * 租户编号
+   */
+  tenantId: string | number;
+
+  /**
+   * 工装编号
+   */
+  toolingCode: string;
+
+  /**
+   * 工装名称
+   */
+  toolingName: string;
+
+  /**
+   * 工装类型（用字典）
+   */
+  toolingTypeCode: string;
+
+  /**
+   * 工装规格（用字典）
+   */
+  toolingSpecCode: string;
+
+  /**
+   * 工装条码
+   */
+  toolingBarcode: string;
+
+  /**
+   * 工装RFID条码
+   */
+  toolingRfidBarcode: string | number;
+
+  /**
+   * 物料编号
+   */
+  materialCode: string;
+
+  /**
+   * 重量
+   */
+  weight: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag: string;
+
+  /**
+   * 创建部门
+   */
+  createDept: number;
+
+  /**
+   * 创建人
+   */
+  createBy: number;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+  /**
+   * 更新人
+   */
+  updateBy: number;
+
+  /**
+   * 更新时间
+   */
+  updateTime: string;
+
+}
+
+export interface BaseToolingInfoForm extends BaseEntity {
+  /**
+   * 主键标识
+   */
+  toolingId?: string | number;
+
+  /**
+   * 工装编号
+   */
+  toolingCode?: string;
+
+  /**
+   * 工装名称
+   */
+  toolingName?: string;
+
+  /**
+   * 工装类型（用字典）
+   */
+  toolingTypeCode?: string;
+
+  /**
+   * 工装规格（用字典）
+   */
+  toolingSpecCode?: string;
+
+  /**
+   * 工装条码
+   */
+  toolingBarcode?: string;
+
+  /**
+   * 工装RFID条码
+   */
+  toolingRfidBarcode?: string | number;
+
+  /**
+   * 物料编号
+   */
+  materialCode?: string;
+
+  /**
+   * 重量
+   */
+  weight?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+}
+
+export interface BaseToolingInfoQuery extends PageQuery {
+
+  /**
+   * 主键标识
+   */
+  toolingId?: string | number;
+
+  /**
+   * 工装编号
+   */
+  toolingCode?: string;
+
+  /**
+   * 工装名称
+   */
+  toolingName?: string;
+
+  /**
+   * 工装类型（用字典）
+   */
+  toolingTypeCode?: string;
+
+  /**
+   * 工装规格（用字典）
+   */
+  toolingSpecCode?: string;
+
+  /**
+   * 工装条码
+   */
+  toolingBarcode?: string;
+
+  /**
+   * 工装RFID条码
+   */
+  toolingRfidBarcode?: string | number;
+
+  /**
+   * 物料编号
+   */
+  materialCode?: string;
+
+  /**
+   * 重量
+   */
+  weight?: number;
+
+  /**
+   * 激活标识(1是 0否)
+   */
+  activeFlag?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+

src/views/mes/baseClassTeamInfo/index.vue

@@ -153,7 +153,7 @@
 <!--        <el-form-item label="班次ID" prop="shiftId">
           <el-input v-model="form.shiftId" placeholder="请输入班次ID" />
         </el-form-item>-->
-        <el-form-item label="班次ID" prop="shiftId">
+        <el-form-item label="班次" prop="shiftId">
           <el-select v-model="form.shiftId" placeholder="请选择班次">
             <el-option
               v-for="item in shiftList"

src/views/mes/baseEqualMaterialInfo/index.vue

@@ -0,0 +1,293 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="equalMaterialInfoId">
+              <el-input v-model="queryParams.equalMaterialInfoId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="物料ID" prop="materialId">
+              <el-input v-model="queryParams.materialId" placeholder="请输入物料ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="等同物料ID" prop="equalMaterialId">
+              <el-input v-model="queryParams.equalMaterialId" placeholder="请输入等同物料ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:baseEqualMaterialInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseEqualMaterialInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseEqualMaterialInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseEqualMaterialInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="baseEqualMaterialInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+<!--        <el-table-column label="主键标识" align="center" prop="equalMaterialInfoId" v-if="columns[0].visible"/>
+        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>-->
+        <el-table-column label="物料" align="center" prop="materialName" v-if="columns[0].visible"/>
+        <el-table-column label="等同物料ID" align="center" prop="equalMaterialId" v-if="columns[1].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[2].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[3].visible"/>
+<!--        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[6].visible"/>
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[8].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[9].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[10].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseEqualMaterialInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseEqualMaterialInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改等同物料信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseEqualMaterialInfoFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="主键标识" prop="equalMaterialInfoId">
+          <el-input v-model="form.equalMaterialInfoId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="物料" prop="materialId">
+<!--          <el-input v-model="form.materialId" placeholder="请输入物料ID" />-->
+          <el-select v-model="form.materialId" placeholder="请选择物料" clearable >
+            <el-option v-for="item in materialList"
+                       :key="item.materialId"
+                       :label="item.materialName"
+                       :value="item.materialId"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="等同物料ID" prop="equalMaterialId">
+          <el-input v-model="form.equalMaterialId" placeholder="请输入等同物料ID" />
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseEqualMaterialInfo" lang="ts">
+import { listBaseEqualMaterialInfo, getBaseEqualMaterialInfo, delBaseEqualMaterialInfo, addBaseEqualMaterialInfo, updateBaseEqualMaterialInfo } from '@/api/mes/baseEqualMaterialInfo';
+import { BaseEqualMaterialInfoVO, BaseEqualMaterialInfoQuery, BaseEqualMaterialInfoForm } from '@/api/mes/baseEqualMaterialInfo/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const baseEqualMaterialInfoList = ref<BaseEqualMaterialInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const materialList = ref([]);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseEqualMaterialInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+/*        { key: 0, label: `主键标识`, visible: true },
+        { key: 1, label: `租户编号`, visible: true },*/
+        { key: 0, label: `物料`, visible: true },
+        { key: 1, label: `等同物料ID`, visible: true },
+        { key: 2, label: `激活标识`, visible: true },
+        { key: 3, label: `备注`, visible: true },
+/*        { key: 6, label: `创建部门`, visible: true },
+        { key: 7, label: `创建人`, visible: true },
+        { key: 8, label: `创建时间`, visible: true },
+        { key: 9, label: `更新人`, visible: true },
+        { key: 10, label: `更新时间`, visible: true },*/
+]);
+
+const initFormData: BaseEqualMaterialInfoForm = {
+  equalMaterialInfoId: undefined,
+  materialId: undefined,
+  equalMaterialId: undefined,
+  activeFlag: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<BaseEqualMaterialInfoForm, BaseEqualMaterialInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    equalMaterialInfoId: undefined,
+    materialId: undefined,
+    equalMaterialId: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询等同物料信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseEqualMaterialInfo(queryParams.value);
+  baseEqualMaterialInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseEqualMaterialInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseEqualMaterialInfoVO[]) => {
+  ids.value = selection.map(item => item.equalMaterialInfoId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加等同物料信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseEqualMaterialInfoVO) => {
+  reset();
+  const _equalMaterialInfoId = row?.equalMaterialInfoId || ids.value[0]
+  const res = await getBaseEqualMaterialInfo(_equalMaterialInfoId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改等同物料信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseEqualMaterialInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.equalMaterialInfoId) {
+        await updateBaseEqualMaterialInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseEqualMaterialInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseEqualMaterialInfoVO) => {
+  const _equalMaterialInfoIds = row?.equalMaterialInfoId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除等同物料信息编号为"' + _equalMaterialInfoIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseEqualMaterialInfo(_equalMaterialInfoIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/baseEqualMaterialInfo/export', {
+    ...queryParams.value
+  }, `baseEqualMaterialInfo_${new Date().getTime()}.xlsx`)
+}
+
+/*w物料下拉框*/
+const getListsSelect = () => {
+  let res = getBaseMaterialInfoList(null);
+  materialList.value = res.data;
+}
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/mes/baseMaterialType/index.vue

@@ -0,0 +1,404 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="物料类型ID" prop="matrialTypeId">
+              <el-input v-model="queryParams.matrialTypeId" placeholder="请输入物料类型ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+<!--            <el-form-item label="父级标识" prop="parentId">
+              <el-input v-model="queryParams.parentId" placeholder="请输入父级标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="物料类型编号" prop="matrialTypeCode">
+              <el-input v-model="queryParams.matrialTypeCode" placeholder="请输入物料类型编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料类型名称" prop="matrialTypeName">
+              <el-input v-model="queryParams.matrialTypeName" placeholder="请输入物料类型名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="祖级列表" prop="ancestors">
+              <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="物料大类" prop="materialCategories">
+              <el-select v-model="queryParams.materialCategories" placeholder="请选择物料大类(1原材料  2半成品 3成品)" clearable>
+                <el-option v-for="dict in mes_material_categories" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label="物料小类" prop="materialSubclass">
+              <el-input v-model="queryParams.materialSubclass" placeholder="请输入物料小类" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工序ID" prop="processId">
+              <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable>
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['mes:baseMaterialType:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table
+        ref="baseMaterialTypeTableRef"
+        v-loading="loading"
+        :data="baseMaterialTypeList"
+        row-key="matrialTypeId"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+<!--        <el-table-column label="物料类型ID" align="center" prop="matrialTypeId" />
+        <el-table-column label="租户编号" prop="tenantId" />-->
+        <el-table-column label="父级标识" align="center" prop="parentId" />
+        <el-table-column label="物料类型编号" align="center" prop="matrialTypeCode" />
+        <el-table-column label="物料类型名称" align="center" prop="matrialTypeName" />
+        <el-table-column label="祖级列表" align="center" prop="ancestors" />
+        <el-table-column label="物料大类" align="center" prop="materialCategories">
+          <template #default="scope">
+            <dict-tag :options="mes_material_categories" :value="scope.row.materialCategories"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="物料小类" align="center" prop="materialSubclass" />
+        <el-table-column label="工序ID" align="center" prop="processId" />
+        <el-table-column label="激活标识" align="center" prop="activeFlag">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+<!--        <el-table-column label="创建部门" align="center" prop="createDept" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseMaterialType:edit']" />
+            </el-tooltip>
+            <el-tooltip content="新增" placement="top">
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['mes:baseMaterialType:add']" />
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseMaterialType:remove']" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 添加或修改物料类型信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseMaterialTypeFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="物料类型ID" prop="matrialTypeId">
+          <el-input v-model="form.matrialTypeId" placeholder="请输入物料类型ID" />
+        </el-form-item>-->
+        <el-form-item label="父级标识" prop="parentId">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="baseMaterialTypeOptions"
+            :props="{ value: 'matrialTypeId', label: 'matrialTypeName', children: 'children' }"
+            value-key="matrialTypeId"
+            placeholder="请选择父级标识"
+            check-strictly
+          />
+        </el-form-item>
+        <el-form-item label="物料类型编号" prop="matrialTypeCode">
+          <el-input v-model="form.matrialTypeCode" placeholder="请输入物料类型编号" />
+        </el-form-item>
+        <el-form-item label="物料类型名称" prop="matrialTypeName">
+          <el-input v-model="form.matrialTypeName" placeholder="请输入物料类型名称" />
+        </el-form-item>
+<!--        <el-form-item label="祖级列表" prop="ancestors">
+          <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />
+        </el-form-item>-->
+        <el-form-item label="物料大类" prop="materialCategories">
+          <el-select v-model="form.materialCategories" placeholder="请选择物料大类">
+            <el-option
+              v-for="dict in mes_material_categories"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="物料小类" prop="materialSubclass">
+          <el-input v-model="form.materialSubclass" placeholder="请输入物料小类" />
+        </el-form-item>
+<!--        <el-form-item label="工序ID" prop="processId">
+          <el-input v-model="form.processId" placeholder="请输入工序ID" />
+        </el-form-item>-->
+        <el-form-item label="工序" prop="processId">
+          <el-select v-model="form.processId" placeholder="请选择工序">
+            <el-option
+              v-for="item in processList"
+              :key="item.processId"
+              :label="item.processName"
+              :value="item.processId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseMaterialType" lang="ts">
+import { listBaseMaterialType, getBaseMaterialType, delBaseMaterialType, addBaseMaterialType, updateBaseMaterialType } from "@/api/mes/baseMaterialType";
+import { BaseMaterialTypeVO, BaseMaterialTypeQuery, BaseMaterialTypeForm } from '@/api/mes/baseMaterialType/types';
+import { getProcessInfoList } from "@/api/mes/baseProcessInfo";
+
+type BaseMaterialTypeOption = {
+  matrialTypeId: number;
+  matrialTypeName: string;
+  children?: BaseMaterialTypeOption[];
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
+
+const { active_flag, mes_material_categories } = toRefs<any>(proxy?.useDict('active_flag', 'mes_material_categories'));
+
+const baseMaterialTypeList = ref<BaseMaterialTypeVO[]>([]);
+const baseMaterialTypeOptions = ref<BaseMaterialTypeOption[]>([]);
+const buttonLoading = ref(false);
+const showSearch = ref(true);
+const isExpandAll = ref(true);
+const loading = ref(false);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseMaterialTypeFormRef = ref<ElFormInstance>();
+const baseMaterialTypeTableRef = ref<ElTableInstance>()
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+
+const initFormData: BaseMaterialTypeForm = {
+    matrialTypeId: undefined,
+    parentId: undefined,
+    matrialTypeCode: undefined,
+    matrialTypeName: undefined,
+    ancestors: undefined,
+    materialCategories: undefined,
+    materialSubclass: undefined,
+    processId: undefined,
+    activeFlag: undefined,
+    remark: undefined,
+}
+
+const data = reactive<PageData<BaseMaterialTypeForm, BaseMaterialTypeQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    matrialTypeId: undefined,
+    parentId: undefined,
+    matrialTypeCode: undefined,
+    matrialTypeName: undefined,
+    ancestors: undefined,
+    materialCategories: undefined,
+    materialSubclass: undefined,
+    processId: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+/*    matrialTypeId: [
+      { required: true, message: "物料类型ID不能为空", trigger: "blur" }
+    ],*/
+    parentId: [
+      { required: true, message: "父级标识不能为空", trigger: "blur" }
+    ],
+    matrialTypeCode: [
+      { required: true, message: "物料类型编号不能为空", trigger: "blur" }
+    ],
+    matrialTypeName: [
+      { required: true, message: "物料类型名称不能为空", trigger: "blur" }
+    ],
+   /* ancestors: [
+      { required: true, message: "祖级列表不能为空", trigger: "blur" }
+    ],
+    materialCategories: [
+      { required: true, message: "物料大类(1原材料  2半成品 3成品)不能为空", trigger: "change" }
+    ],
+    materialSubclass: [
+      { required: true, message: "物料小类不能为空", trigger: "blur" }
+    ],
+    processId: [
+      { required: true, message: "工序ID不能为空", trigger: "blur" }
+    ],
+    activeFlag: [
+      { required: true, message: "激活标识不能为空", trigger: "change" }
+    ],
+    remark: [
+      { required: true, message: "备注不能为空", trigger: "blur" }
+    ],*/
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询物料类型信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseMaterialType(queryParams.value);
+  const data = proxy?.handleTree<BaseMaterialTypeVO>(res.data, "matrialTypeId", "parentId");
+  if (data) {
+    baseMaterialTypeList.value = data;
+    loading.value = false;
+  }
+}
+
+let processList = ref([]);
+  /*获取工序下拉框*/
+  const getProcessSelect = async () => {
+  let res = await getProcessInfoList(null);
+  processList.value = res.data;
+};
+
+/** 查询物料类型信息下拉树结构 */
+const getTreeselect = async () => {
+  const res = await listBaseMaterialType();
+  baseMaterialTypeOptions.value = [];
+  const data: BaseMaterialTypeOption = { matrialTypeId: 0, matrialTypeName: '顶级节点', children: [] };
+  data.children = proxy?.handleTree<BaseMaterialTypeOption>(res.data, "matrialTypeId", "parentId");
+  baseMaterialTypeOptions.value.push(data);
+}
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+// 表单重置
+const reset = () => {
+  form.value = {...initFormData}
+  baseMaterialTypeFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 新增按钮操作 */
+const handleAdd = (row?: BaseMaterialTypeVO) => {
+  reset();
+  getTreeselect();
+  if (row != null && row.matrialTypeId) {
+    form.value.parentId = row.matrialTypeId;
+  } else {
+    form.value.parentId = 0;
+  }
+  dialog.visible = true;
+  dialog.title = "添加物料类型信息";
+}
+
+/** 展开/折叠操作 */
+const handleToggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  toggleExpandAll(baseMaterialTypeList.value, isExpandAll.value)
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = (data: BaseMaterialTypeVO[], status: boolean) => {
+  data.forEach((item) => {
+    baseMaterialTypeTableRef.value?.toggleRowExpansion(item, status)
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+  })
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row: BaseMaterialTypeVO) => {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.parentId = row.parentId;
+  }
+  const res = await getBaseMaterialType(row.matrialTypeId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改物料类型信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseMaterialTypeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.matrialTypeId) {
+        await updateBaseMaterialType(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addBaseMaterialType(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row: BaseMaterialTypeVO) => {
+  await proxy?.$modal.confirm('是否确认删除物料类型信息编号为"' + row.matrialTypeId + '"的数据项？');
+  loading.value = true;
+  await delBaseMaterialType(row.matrialTypeId).finally(() => loading.value = false);
+  await getList();
+  proxy?.$modal.msgSuccess("删除成功");
+}
+
+onMounted(() => {
+  getProcessSelect();
+  getList();
+});
+</script>

src/views/mes/baseMeasurementUnitInfo/index.vue

@@ -0,0 +1,339 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="unitId">
+              <el-input v-model="queryParams.unitId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="父级标识" prop="parentId">
+              <el-input v-model="queryParams.parentId" placeholder="请输入父级标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="计量单位编号" prop="unitCode">
+              <el-input v-model="queryParams.unitCode" placeholder="请输入计量单位编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="计量单位名称" prop="unitName">
+              <el-input v-model="queryParams.unitName" placeholder="请输入计量单位名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="计量单位转换" prop="unitConversion">
+              <el-input v-model="queryParams.unitConversion" placeholder="请输入计量单位转换" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="祖级列表" prop="ancestors">
+              <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="单位类型" prop="unitType">
+              <el-select v-model="queryParams.unitType" placeholder="请选择单位类型" clearable>
+                <el-option v-for="dict in unit_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['mes:baseMeasurementUnitInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table
+        ref="baseMeasurementUnitInfoTableRef"
+        v-loading="loading"
+        :data="baseMeasurementUnitInfoList"
+        row-key="unitId"
+        :default-expand-all="isExpandAll"
+        :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+<!--        <el-table-column label="主键标识" align="center" prop="unitId" />-->
+        <el-table-column label="父级标识" prop="parentId" />
+        <el-table-column label="计量单位编号" align="center" prop="unitCode" />
+        <el-table-column label="计量单位名称" align="center" prop="unitName" />
+        <el-table-column label="计量单位转换" align="center" prop="unitConversion" />
+        <el-table-column label="祖级列表" align="center" prop="ancestors" />
+        <el-table-column label="单位类型" align="center" prop="unitType">
+          <template #default="scope">
+            <dict-tag :options="unit_type" :value="scope.row.unitType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="激活标识(1是 0否)" align="center" prop="activeFlag" />
+<!--        <el-table-column label="创建部门" align="center" prop="createDept" />
+        <el-table-column label="创建人" align="center" prop="createBy" />
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseMeasurementUnitInfo:edit']" />
+            </el-tooltip>
+            <el-tooltip content="新增" placement="top">
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['mes:baseMeasurementUnitInfo:add']" />
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseMeasurementUnitInfo:remove']" />
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 添加或修改计量单位信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseMeasurementUnitInfoFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="主键标识" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="父级标识" prop="parentId">
+          <el-tree-select
+            v-model="form.parentId"
+            :data="baseMeasurementUnitInfoOptions"
+            :props="{ value: 'unitId', label: 'unitName', children: 'children' }"
+            value-key="unitId"
+            placeholder="请选择父级标识"
+            check-strictly
+          />
+        </el-form-item>
+        <el-form-item label="计量单位编号" prop="unitCode">
+          <el-input v-model="form.unitCode" placeholder="请输入计量单位编号" />
+        </el-form-item>
+        <el-form-item label="计量单位名称" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入计量单位名称" />
+        </el-form-item>
+        <el-form-item label="计量单位转换" prop="unitConversion">
+          <el-input v-model="form.unitConversion" placeholder="请输入计量单位转换" />
+        </el-form-item>
+<!--        <el-form-item label="祖级列表" prop="ancestors">
+          <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />
+        </el-form-item>-->
+        <el-form-item label="单位类型" prop="unitType">
+          <el-select v-model="form.unitType" placeholder="请选择单位类型">
+            <el-option
+              v-for="dict in unit_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-input v-model="form.activeFlag" placeholder="请输入激活标识" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseMeasurementUnitInfo" lang="ts">
+import { listBaseMeasurementUnitInfo, getBaseMeasurementUnitInfo, delBaseMeasurementUnitInfo, addBaseMeasurementUnitInfo, updateBaseMeasurementUnitInfo } from "@/api/mes/baseMeasurementUnitInfo";
+import { BaseMeasurementUnitInfoVO, BaseMeasurementUnitInfoQuery, BaseMeasurementUnitInfoForm } from '@/api/mes/baseMeasurementUnitInfo/types';
+
+type BaseMeasurementUnitInfoOption = {
+  unitId: number;
+  unitName: string;
+  children?: BaseMeasurementUnitInfoOption[];
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;;
+
+const { unit_type } = toRefs<any>(proxy?.useDict('unit_type'));
+
+const baseMeasurementUnitInfoList = ref<BaseMeasurementUnitInfoVO[]>([]);
+const baseMeasurementUnitInfoOptions = ref<BaseMeasurementUnitInfoOption[]>([]);
+const buttonLoading = ref(false);
+const showSearch = ref(true);
+const isExpandAll = ref(true);
+const loading = ref(false);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseMeasurementUnitInfoFormRef = ref<ElFormInstance>();
+const baseMeasurementUnitInfoTableRef = ref<ElTableInstance>()
+
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+
+
+const initFormData: BaseMeasurementUnitInfoForm = {
+    unitId: undefined,
+    parentId: undefined,
+    unitCode: undefined,
+    unitName: undefined,
+    unitConversion: undefined,
+    ancestors: undefined,
+    unitType: undefined,
+    remark: undefined,
+    activeFlag: undefined,
+}
+
+const data = reactive<PageData<BaseMeasurementUnitInfoForm, BaseMeasurementUnitInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    unitId: undefined,
+    parentId: undefined,
+    unitCode: undefined,
+    unitName: undefined,
+    unitConversion: undefined,
+    ancestors: undefined,
+    unitType: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+    unitCode: [
+      { required: true, message: "计量单位编号不能为空", trigger: "blur" }
+    ],
+    unitName: [
+      { required: true, message: "计量单位名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询计量单位信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseMeasurementUnitInfo(queryParams.value);
+  const data = proxy?.handleTree<BaseMeasurementUnitInfoVO>(res.data, "unitId", "parentId");
+  if (data) {
+    baseMeasurementUnitInfoList.value = data;
+    loading.value = false;
+  }
+}
+
+/** 查询计量单位信息下拉树结构 */
+const getTreeselect = async () => {
+  const res = await listBaseMeasurementUnitInfo();
+  baseMeasurementUnitInfoOptions.value = [];
+  const data: BaseMeasurementUnitInfoOption = { unitId: 0, unitName: '顶级节点', children: [] };
+  data.children = proxy?.handleTree<BaseMeasurementUnitInfoOption>(res.data, "unitId", "parentId");
+  baseMeasurementUnitInfoOptions.value.push(data);
+}
+
+// 取消按钮
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+// 表单重置
+const reset = () => {
+  form.value = {...initFormData}
+  baseMeasurementUnitInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 新增按钮操作 */
+const handleAdd = (row?: BaseMeasurementUnitInfoVO) => {
+  reset();
+  getTreeselect();
+  if (row != null && row.unitId) {
+    form.value.parentId = row.unitId;
+  } else {
+    form.value.parentId = 0;
+  }
+  dialog.visible = true;
+  dialog.title = "添加计量单位信息";
+}
+
+/** 展开/折叠操作 */
+const handleToggleExpandAll = () => {
+  isExpandAll.value = !isExpandAll.value;
+  toggleExpandAll(baseMeasurementUnitInfoList.value, isExpandAll.value)
+}
+
+/** 展开/折叠操作 */
+const toggleExpandAll = (data: BaseMeasurementUnitInfoVO[], status: boolean) => {
+  data.forEach((item) => {
+    baseMeasurementUnitInfoTableRef.value?.toggleRowExpansion(item, status)
+    if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+  })
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row: BaseMeasurementUnitInfoVO) => {
+  reset();
+  await getTreeselect();
+  if (row != null) {
+    form.value.parentId = row.parentId;
+  }
+  const res = await getBaseMeasurementUnitInfo(row.unitId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改计量单位信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseMeasurementUnitInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.unitId) {
+        await updateBaseMeasurementUnitInfo(form.value).finally(() => buttonLoading.value = false);
+      } else {
+        await addBaseMeasurementUnitInfo(form.value).finally(() => buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row: BaseMeasurementUnitInfoVO) => {
+  await proxy?.$modal.confirm('是否确认删除计量单位信息编号为"' + row.unitId + '"的数据项？');
+  loading.value = true;
+  await delBaseMeasurementUnitInfo(row.unitId).finally(() => loading.value = false);
+  await getList();
+  proxy?.$modal.msgSuccess("删除成功");
+}
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/mes/baseRoute/index.vue

@@ -71,14 +71,25 @@
         </el-table-column>
         <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
           <template #default='scope'>
-            <el-tooltip content='修改' placement='top'>
+<!--            <el-tooltip content='修改' placement='top'>
               <el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
                          v-hasPermi="['mes:baseRoute:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content='删除' placement='top'>
               <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
                          v-hasPermi="['mes:baseRoute:remove']"></el-button>
-            </el-tooltip>
+            </el-tooltip>-->
+
+            <el-button
+              size="small"
+              type="text"
+              icon="el-icon-edit"
+              @click="routeProcessUpdate(scope.row)"
+              v-hasPermi="['mes:baseRoute:edit']"
+            >工艺步骤
+            </el-button>
+
+
           </template>
         </el-table-column>
       </el-table>
@@ -116,12 +127,73 @@
         </div>
       </template>
     </el-dialog>
+
+
+<!--维护工艺路线步骤对话框-->
+    <el-dialog :title='dialog.title' v-model='ifOpen' width='500px' append-to-body>
+      <el-form ref='baseRouteFormRef' :model='form' :rules='rules' label-width='110px'>
+    <el-form-item label='工艺路线名称' prop='routeName'>
+      <el-input v-model='form.routeName' placeholder='请输入工艺路线名称' disabled />
+    </el-form-item>
+    <el-divider content-position='center'>工艺路线组成信息</el-divider>
+    <el-row :gutter='10' class='mb8'>
+      <el-col :span='1.5'>
+        <el-button type='primary' icon='Plus' size='small' @click='handleAddProdBaseRouteProcess'>添加</el-button>
+      </el-col>
+      <el-col :span='1.5'>
+        <el-button type='danger' icon='Delete' size='small' @click='handleDeleteProdBaseRouteProcess'>删除</el-button>
+      </el-col>
+      <!-- <el-col :span='1.5'>
+        <span v-show='tagShow'>提示:该工艺路线已关联生产工单，无法修改！</span>
+      </el-col> -->
+    </el-row>
+<!--    <el-table :data='routeProcessBoList' :row-class-name='rowProdBaseRouteProcessIndex'
+              @selection-change='handleProdBaseRouteProcessSelectionChange' ref='mesBaseRouteProcess'>-->
+    <el-table
+      :data="routeProcessBoList"
+      :row-class-name="rowProdBaseRouteProcessIndex"
+      @selection-change="handleProdBaseRouteProcessSelectionChange"
+      ref="mesBaseRouteProcess"
+    >
+      <el-table-column type='selection' width='50' align='center' />
+      <el-table-column label='序号' align='center' prop='index' v-if='false' />
+      <el-table-column label='工艺路线顺序' prop='processOrder' width='100'>
+        <template #default='scope'>
+          <el-input v-model='scope.row.processOrder' />
+        </template>
+      </el-table-column>
+      <el-table-column label='工序' prop='processId'>
+        <template #default='scope'>
+          <el-select v-model='scope.row.processId' filterable placeholder='请选择工序' clearable>
+            <el-option
+              v-for='item in processList'
+              :key='item.processId'
+              :label='item.processName'
+              :value='item.processId'
+              :disabled='routeProcessBoList.some(i => i.processId === item.processId)'
+            />
+          </el-select>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <template #footer>
+    <div class='dialog-footer'>
+      <el-button type='primary' @click='submitForm' v-show='submitShow'>确 定</el-button>
+      <el-button @click='cancel'>取 消</el-button>
+    </div>
+  </template>
+</el-dialog>
+
   </div>
 </template>
 
 <script setup name='BaseRoute' lang='ts'>
 import { listBaseRoute, getBaseRoute, delBaseRoute, addBaseRoute, updateBaseRoute } from '@/api/mes/baseRoute';
-import { BaseRouteVO, BaseRouteQuery, BaseRouteForm } from '@/api/mes/baseRoute/types';
+import { BaseRouteVO, BaseRouteQuery, BaseRouteForm, ProdBaseRouteProcess } from '@/api/mes/baseRoute/types';
+import {getProcessInfoList} from "@/api/mes/baseProcessInfo";
+/*import type { ProdBaseRouteProcess } from '@/api/mes/baseRoute/types';*/
+
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@@ -138,6 +210,19 @@ const total = ref(0);
 const queryFormRef = ref<ElFormInstance>();
 const baseRouteFormRef = ref<ElFormInstance>();
 
+
+
+// 在data部分添加以下变量
+const routeProcessOpen = ref(false);
+const submitShow = ref(true);
+const tagShow = ref(false);
+const routeProcessBoList = ref<any[]>([]);
+const checkedProdBaseRouteProcess = ref<any[]>([]);
+const processList = ref<any[]>([]);
+
+//控制维护工艺路线步骤对话框的显示与隐藏，默认为false隐藏
+const ifOpen = ref(false); // 使用 ref 定义响应式变量
+
 const dialog = reactive<DialogOption>({
   visible: false,
   title: ''
@@ -163,7 +248,8 @@ const initFormData: BaseRouteForm = {
   routeName: undefined,
   routeDesc: undefined,
   activeFlag: '1',
-  remark: undefined
+  remark: undefined,
+  routeProcessBoList: []//工艺步骤
 };
 const data = reactive<PageData<BaseRouteForm, BaseRouteQuery>>({
   form: { ...initFormData },
@@ -201,12 +287,15 @@ const getList = async () => {
 const cancel = () => {
   reset();
   dialog.visible = false;
+
+  ifOpen.value = false;
 };
 
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
   baseRouteFormRef.value?.resetFields();
+  routeProcessBoList.value = [];
 };
 
 /** 搜索按钮操作 */
@@ -250,6 +339,10 @@ const submitForm = () => {
   baseRouteFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
+
+      // 确保 form 包含最新的 routeProcessBoList 数据
+      form.value.routeProcessBoList = routeProcessBoList.value;
+
       if (form.value.routeId) {
         await updateBaseRoute(form.value).finally(() => buttonLoading.value = false);
       } else {
@@ -257,6 +350,13 @@ const submitForm = () => {
       }
       proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
+
+      // 关闭维护工艺路线步骤对话框,重置数据
+      ifOpen.value = false;
+      routeProcessBoList.value = [];
+      form.value.routeProcessBoList = [];
+      form.value.routeProcessVoList = [];
+
       await getList();
     }
   });
@@ -278,7 +378,90 @@ const handleExport = () => {
   }, `baseRoute_${new Date().getTime()}.xlsx`);
 };
 
+
+
+// 在methods部分添加以下方法
+/** 维护工艺路线步骤 */
+const routeProcessUpdate = async (row: BaseRouteVO) => {
+  reset();
+  const _routeId = row?.routeId || ids.value[0];
+  submitShow.value = true;
+
+  // 打开维护工艺路线步骤对话框
+  ifOpen.value = true;
+
+/*  tagShow.value = false;*/
+
+  /*  // 检查是否关联生产工单
+    const res = await listProductOrder({ dispatchId: _routeId });
+    if (res.rows.length > 0) {
+      submitShow.value = false;
+      tagShow.value = true;
+    }*/
+
+// 获取数据时
+  const routeRes = await getBaseRoute(_routeId);
+  form.value = routeRes.data;
+  routeProcessBoList.value = routeRes.data.routeProcessVoList || [];
+  routeProcessOpen.value = true;
+  dialog.title = '维护工艺路线步骤';
+};
+
+// 修改rowProdBaseRouteProcessIndex方法，返回类名字符串
+const rowProdBaseRouteProcessIndex = ({ row, rowIndex }: {
+  row: ProdBaseRouteProcess;
+  rowIndex: number
+}): string => {
+  // 如果当前行的processOrder属性不存在
+  if (!row.processOrder) {
+    // 设置当前行的index属性为行索引加1
+    row.index = rowIndex + 1;
+    // 设置当前行的processOrder属性为(行索引加1)乘以10
+    row.processOrder = (rowIndex + 1) * 10;
+  }
+  // 返回一个空字符串表示不添加额外类名
+  return '';
+};
+/** 工艺路线组成信息添加按钮操作 */
+const handleAddProdBaseRouteProcess = () => {
+  routeProcessBoList.value.push({
+    processId: '',
+    processOrder: '',
+    remark: '',
+    createBy: '',
+    createTime: '',
+    updateBy: '',
+    updateTime: ''
+  });
+};
+
+/** 工艺路线组成信息删除按钮操作 */
+const handleDeleteProdBaseRouteProcess = () => {
+  // 检查是否有选中的工艺路线组成信息数据，如果没有则显示错误提示
+  if (checkedProdBaseRouteProcess.value.length === 0) {
+    proxy?.$modal.msgError('请先选择要删除的工艺路线组成信息数据');
+  } else {
+    // 过滤掉已选中的工艺路线组成信息数据
+    routeProcessBoList.value = routeProcessBoList.value.filter(
+      item => !checkedProdBaseRouteProcess.value.includes(item.index)
+    );
+  }
+};
+
+/** 复选框选中数据 */
+const handleProdBaseRouteProcessSelectionChange = (selection: any[]) => {
+  // 将选中的项的索引映射到checkedProdBaseRouteProcess.value数组中
+  checkedProdBaseRouteProcess.value = selection.map(item => item.index);
+};
+
+const getProcessList = async () => {
+  const processRes = await getProcessInfoList(null);
+  processList.value = processRes.data;
+};
+
+
 onMounted(() => {
+  getProcessList();
   getList();
 });
 </script>

src/views/mes/baseSupplierInfo/index.vue

@@ -0,0 +1,361 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="supplierId">
+              <el-input v-model="queryParams.supplierId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="供应商编号" prop="supplierCode">
+              <el-input v-model="queryParams.supplierCode" placeholder="请输入供应商编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="供应商名称" prop="supplierName">
+              <el-input v-model="queryParams.supplierName" placeholder="请输入供应商名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+<!--            <el-form-item label="erp的主键" prop="erpId">
+              <el-input v-model="queryParams.erpId" placeholder="请输入erp的主键" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="激活状态" prop="supplierStatus">
+              <el-select v-model="queryParams.supplierStatus" placeholder="请选择激活状态" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审核日期" style="width: 308px">
+              <el-date-picker
+                v-model="dateRangeAuditDate"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+              />
+            </el-form-item>
+            <el-form-item label="erp最后更新时间" style="width: 308px">
+              <el-date-picker
+                v-model="dateRangeErpModifyDate"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                type="daterange"
+                range-separator="-"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:baseSupplierInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseSupplierInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseSupplierInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseSupplierInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="baseSupplierInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+<!--        <el-table-column label="主键标识" align="center" prop="supplierId" v-if="columns[0].visible"/>
+        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>-->
+        <el-table-column label="供应商编号" align="center" prop="supplierCode" v-if="columns[0].visible"/>
+        <el-table-column label="供应商名称" align="center" prop="supplierName" v-if="columns[1].visible"/>
+        <el-table-column label="erp的主键" align="center" prop="erpId" v-if="columns[2].visible"/>
+        <el-table-column label="激活状态" align="center" prop="supplierStatus" v-if="columns[3].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.supplierStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核日期" align="center" prop="auditDate" width="180" v-if="columns[4].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.auditDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="erp最后更新时间" align="center" prop="erpModifyDate" width="180" v-if="columns[5].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.erpModifyDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[6].visible"/>
+<!--        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[9].visible"/>
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[10].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[11].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[12].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[13].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>-->
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseSupplierInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseSupplierInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改供应商信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseSupplierInfoFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="主键标识" prop="supplierId">
+          <el-input v-model="form.supplierId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="供应商编号" prop="supplierCode">
+          <el-input v-model="form.supplierCode" placeholder="请输入供应商编号" />
+        </el-form-item>
+        <el-form-item label="供应商名称" prop="supplierName">
+          <el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
+        </el-form-item>
+        <el-form-item label="erp的主键" prop="erpId">
+          <el-input v-model="form.erpId" placeholder="请输入erp的主键" />
+        </el-form-item>
+        <el-form-item label="激活状态" prop="supplierStatus">
+          <el-radio-group v-model="form.supplierStatus">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审核日期" prop="auditDate">
+          <el-date-picker clearable
+            v-model="form.auditDate"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择审核日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="erp最后更新时间" prop="erpModifyDate">
+          <el-date-picker clearable
+            v-model="form.erpModifyDate"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择erp最后更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseSupplierInfo" lang="ts">
+import { listBaseSupplierInfo, getBaseSupplierInfo, delBaseSupplierInfo, addBaseSupplierInfo, updateBaseSupplierInfo } from '@/api/mes/baseSupplierInfo';
+import { BaseSupplierInfoVO, BaseSupplierInfoQuery, BaseSupplierInfoForm } from '@/api/mes/baseSupplierInfo/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
+
+const baseSupplierInfoList = ref<BaseSupplierInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const dateRangeAuditDate = ref<[DateModelType, DateModelType]>(['', '']);
+const dateRangeErpModifyDate = ref<[DateModelType, DateModelType]>(['', '']);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseSupplierInfoFormRef = ref<ElFormInstance>();
+
+
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+/*        { key: 0, label: `主键标识`, visible: true },
+        { key: 1, label: `租户编号`, visible: true },*/
+        { key: 0, label: `供应商编号`, visible: true },
+        { key: 1, label: `供应商名称`, visible: true },
+        { key: 2, label: `erp的主键`, visible: true },
+        { key: 3, label: `激活状态`, visible: true },
+        { key: 4, label: `审核日期`, visible: true },
+        { key: 5, label: `erp最后更新时间`, visible: true },
+        { key: 6, label: `备注`, visible: true },
+/*        { key: 9, label: `创建部门`, visible: true },
+        { key: 10, label: `创建人`, visible: true },
+        { key: 11, label: `创建时间`, visible: true },
+        { key: 12, label: `更新人`, visible: true },
+        { key: 13, label: `更新时间`, visible: true },*/
+]);
+
+
+
+const initFormData: BaseSupplierInfoForm = {
+  supplierId: undefined,
+  supplierCode: undefined,
+  supplierName: undefined,
+  erpId: undefined,
+  supplierStatus: undefined,
+  auditDate: undefined,
+  erpModifyDate: undefined,
+  remark: undefined,
+}
+const data = reactive<PageData<BaseSupplierInfoForm, BaseSupplierInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    supplierId: undefined,
+    supplierCode: undefined,
+    supplierName: undefined,
+    erpId: undefined,
+    supplierStatus: undefined,
+    params: {
+      auditDate: undefined,
+      erpModifyDate: undefined,
+    }
+  },
+  rules: {
+    supplierCode: [
+      { required: true, message: "供应商编号不能为空", trigger: "blur" }
+    ],
+    supplierName: [
+      { required: true, message: "供应商名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询供应商信息列表 */
+const getList = async () => {
+  loading.value = true;
+  queryParams.value.params = {};
+  proxy?.addDateRange(queryParams.value, dateRangeAuditDate.value, 'AuditDate');
+  proxy?.addDateRange(queryParams.value, dateRangeErpModifyDate.value, 'ErpModifyDate');
+  const res = await listBaseSupplierInfo(queryParams.value);
+  baseSupplierInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseSupplierInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  dateRangeAuditDate.value = ['', ''];
+  dateRangeErpModifyDate.value = ['', ''];
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseSupplierInfoVO[]) => {
+  ids.value = selection.map(item => item.supplierId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加供应商信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseSupplierInfoVO) => {
+  reset();
+  const _supplierId = row?.supplierId || ids.value[0]
+  const res = await getBaseSupplierInfo(_supplierId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改供应商信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseSupplierInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.supplierId) {
+        await updateBaseSupplierInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseSupplierInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseSupplierInfoVO) => {
+  const _supplierIds = row?.supplierId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除供应商信息编号为"' + _supplierIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseSupplierInfo(_supplierIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/baseSupplierInfo/export', {
+    ...queryParams.value
+  }, `baseSupplierInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>

src/views/mes/baseToolingInfo/index.vue

@@ -0,0 +1,366 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+<!--            <el-form-item label="主键标识" prop="toolingId">
+              <el-input v-model="queryParams.toolingId" placeholder="请输入主键标识" clearable @keyup.enter="handleQuery" />
+            </el-form-item>-->
+            <el-form-item label="工装编号" prop="toolingCode">
+              <el-input v-model="queryParams.toolingCode" placeholder="请输入工装编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工装名称" prop="toolingName">
+              <el-input v-model="queryParams.toolingName" placeholder="请输入工装名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工装类型" prop="toolingTypeCode">
+              <el-select v-model="queryParams.toolingTypeCode" placeholder="请选择工装类型" clearable >
+                <el-option v-for="dict in tooling_type_code" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="工装规格" prop="toolingSpecCode">
+              <el-select v-model="queryParams.toolingSpecCode" placeholder="请选择工装规格" clearable >
+                <el-option v-for="dict in tooling_spec_code" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+<!--            <el-form-item label="工装条码" prop="toolingBarcode">
+              <el-input v-model="queryParams.toolingBarcode" placeholder="请输入工装条码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="工装RFID条码" prop="toolingRfidBarcode">
+              <el-input v-model="queryParams.toolingRfidBarcode" placeholder="请输入工装RFID条码" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="物料编号" prop="materialCode">
+              <el-input v-model="queryParams.materialCode" placeholder="请输入物料编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="重量" prop="weight">
+              <el-input v-model="queryParams.weight" placeholder="请输入重量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="激活标识" prop="activeFlag">
+              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >
+                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>-->
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['mes:baseToolingInfo:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['mes:baseToolingInfo:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['mes:baseToolingInfo:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['mes:baseToolingInfo:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="baseToolingInfoList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键标识" align="center" prop="toolingId" v-if="columns[0].visible"/>
+        <el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[1].visible"/>
+        <el-table-column label="工装编号" align="center" prop="toolingCode" v-if="columns[2].visible"/>
+        <el-table-column label="工装名称" align="center" prop="toolingName" v-if="columns[3].visible"/>
+        <el-table-column label="工装类型" align="center" prop="toolingTypeCode" v-if="columns[4].visible">
+          <template #default="scope">
+            <dict-tag :options="tooling_type_code" :value="scope.row.toolingTypeCode"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="工装规格" align="center" prop="toolingSpecCode" v-if="columns[5].visible">
+          <template #default="scope">
+            <dict-tag :options="tooling_spec_code" :value="scope.row.toolingSpecCode"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="工装条码" align="center" prop="toolingBarcode" v-if="columns[6].visible"/>
+        <el-table-column label="工装RFID条码" align="center" prop="toolingRfidBarcode" v-if="columns[7].visible"/>
+        <el-table-column label="物料编号" align="center" prop="materialCode" v-if="columns[8].visible"/>
+        <el-table-column label="重量" align="center" prop="weight" v-if="columns[9].visible"/>
+        <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
+        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[11].visible">
+          <template #default="scope">
+            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[12].visible"/>
+        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[13].visible"/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[14].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[15].visible"/>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[16].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['mes:baseToolingInfo:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['mes:baseToolingInfo:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改载具工装信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="baseToolingInfoFormRef" :model="form" :rules="rules" label-width="80px">
+<!--        <el-form-item label="主键标识" prop="toolingId">
+          <el-input v-model="form.toolingId" placeholder="请输入主键标识" />
+        </el-form-item>-->
+        <el-form-item label="工装编号" prop="toolingCode">
+          <el-input v-model="form.toolingCode" placeholder="请输入工装编号" />
+        </el-form-item>
+        <el-form-item label="工装名称" prop="toolingName">
+          <el-input v-model="form.toolingName" placeholder="请输入工装名称" />
+        </el-form-item>
+        <el-form-item label="工装类型" prop="toolingTypeCode">
+          <el-select v-model="form.toolingTypeCode" placeholder="请选择工装类型">
+            <el-option
+              v-for="dict in tooling_type_code"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工装规格" prop="toolingSpecCode">
+          <el-select v-model="form.toolingSpecCode" placeholder="请选择工装规格">
+            <el-option
+              v-for="dict in tooling_spec_code"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工装条码" prop="toolingBarcode">
+          <el-input v-model="form.toolingBarcode" placeholder="请输入工装条码" />
+        </el-form-item>
+        <el-form-item label="工装RFID条码" prop="toolingRfidBarcode">
+          <el-input v-model="form.toolingRfidBarcode" placeholder="请输入工装RFID条码" />
+        </el-form-item>
+        <el-form-item label="物料编号" prop="materialCode">
+          <el-input v-model="form.materialCode" placeholder="请输入物料编号" />
+        </el-form-item>
+        <el-form-item label="重量" prop="weight">
+          <el-input v-model="form.weight" placeholder="请输入重量" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="激活标识" prop="activeFlag">
+          <el-radio-group v-model="form.activeFlag">
+            <el-radio
+              v-for="dict in active_flag"
+              :key="dict.value"
+              :value="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="BaseToolingInfo" lang="ts">
+import { listBaseToolingInfo, getBaseToolingInfo, delBaseToolingInfo, addBaseToolingInfo, updateBaseToolingInfo } from '@/api/mes/baseToolingInfo';
+import { BaseToolingInfoVO, BaseToolingInfoQuery, BaseToolingInfoForm } from '@/api/mes/baseToolingInfo/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { active_flag, tooling_spec_code, tooling_type_code } = toRefs<any>(proxy?.useDict('active_flag', 'tooling_spec_code', 'tooling_type_code'));
+
+const baseToolingInfoList = ref<BaseToolingInfoVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const baseToolingInfoFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+// 列显隐信息
+const columns = ref<FieldOption[]>([
+  { key: 0, label: `主键标识`, visible: false },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `工装编号`, visible: true },
+  { key: 3, label: `工装名称`, visible: true },
+  { key: 4, label: `工装类型`, visible: true },
+  { key: 5, label: `工装规格`, visible: true },
+  { key: 6, label: `工装条码`, visible: true },
+  { key: 7, label: `工装RFID条码`, visible: true },
+  { key: 8, label: `物料编号`, visible: true },
+  { key: 9, label: `重量`, visible: true },
+  { key: 10, label: `备注`, visible: true },
+  { key: 11, label: `激活标识`, visible: false },
+  { key: 12, label: `创建部门`, visible: false },
+  { key: 13, label: `创建人`, visible: false },
+  { key: 14, label: `创建时间`, visible: false },
+  { key: 15, label: `更新人`, visible: false },
+  { key: 16, label: `更新时间`, visible: false },
+]);
+
+const initFormData: BaseToolingInfoForm = {
+  toolingId: undefined,
+  toolingCode: undefined,
+  toolingName: undefined,
+  toolingTypeCode: undefined,
+  toolingSpecCode: undefined,
+  toolingBarcode: undefined,
+  toolingRfidBarcode: undefined,
+  materialCode: undefined,
+  weight: undefined,
+  remark: undefined,
+  activeFlag: undefined,
+}
+const data = reactive<PageData<BaseToolingInfoForm, BaseToolingInfoQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    toolingId: undefined,
+    toolingCode: undefined,
+    toolingName: undefined,
+    toolingTypeCode: undefined,
+    toolingSpecCode: undefined,
+    toolingBarcode: undefined,
+    toolingRfidBarcode: undefined,
+    materialCode: undefined,
+    weight: undefined,
+    activeFlag: undefined,
+    params: {
+    }
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询载具工装信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listBaseToolingInfo(queryParams.value);
+  baseToolingInfoList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  baseToolingInfoFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: BaseToolingInfoVO[]) => {
+  ids.value = selection.map(item => item.toolingId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加载具工装信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: BaseToolingInfoVO) => {
+  reset();
+  const _toolingId = row?.toolingId || ids.value[0]
+  const res = await getBaseToolingInfo(_toolingId);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改载具工装信息";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  baseToolingInfoFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.toolingId) {
+        await updateBaseToolingInfo(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addBaseToolingInfo(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: BaseToolingInfoVO) => {
+  const _toolingIds = row?.toolingId || ids.value;
+  await proxy?.$modal.confirm('是否确认删除载具工装信息编号为"' + _toolingIds + '"的数据项？').finally(() => loading.value = false);
+  await delBaseToolingInfo(_toolingIds);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('mes/baseToolingInfo/export', {
+    ...queryParams.value
+  }, `baseToolingInfo_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>