diff --git a/.env.development b/.env.development index 78976cddd..7ffad86e9 100644 --- a/.env.development +++ b/.env.development @@ -34,4 +34,7 @@ VITE_OUT_DIR=dist VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://localhost:12080' \ No newline at end of file +VITE_JMREPORT_BASE_URL='http://localhost:12080' + +# 租户配置 +VITE_TENANT='["长春","成都"]' \ No newline at end of file diff --git a/.env.hella13 b/.env.hella13 index 9b9e1300c..b60b2be7c 100644 --- a/.env.hella13 +++ b/.env.hella13 @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://172.21.32.13:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' + +# 租户配置 +VITE_TENANT='["长春"]' diff --git a/.env.hella14 b/.env.hella14 index 9e15dcdd5..4d29e7b41 100644 --- a/.env.hella14 +++ b/.env.hella14 @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://172.21.32.14:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.21.32.14:90' + +# 租户配置 +VITE_TENANT='["长春"]' diff --git a/.env.hella15 b/.env.hella15 index 30eac259b..dc2a813d1 100644 --- a/.env.hella15 +++ b/.env.hella15 @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://172.21.32.15:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.21.32.15:90' + +# 租户配置 +VITE_TENANT='["长春"]' diff --git a/.env.hella16 b/.env.hella16 index 459c68a41..9672dcd3e 100644 --- a/.env.hella16 +++ b/.env.hella16 @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://172.21.32.16:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.21.32.16:90' + +# 租户配置 +VITE_TENANT='["长春","成都"]' diff --git a/.env.hella8 b/.env.hella8 index 844c22c0e..d1d914dac 100644 --- a/.env.hella8 +++ b/.env.hella8 @@ -35,3 +35,7 @@ VITE_INTERFACE_URL='http://172.22.32.8:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' + + +# 租户配置 +VITE_TENANT='["成都"]' \ No newline at end of file diff --git a/.env.hella9 b/.env.hella9 index 308a2ffd2..86853d4ef 100644 --- a/.env.hella9 +++ b/.env.hella9 @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://172.22.32.9:90/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' + +# 租户配置 +VITE_TENANT='["成都"]' \ No newline at end of file diff --git a/.env.test b/.env.test index a42a17cd3..27d463213 100644 --- a/.env.test +++ b/.env.test @@ -35,3 +35,6 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' + +# 租户配置 +VITE_TENANT='["长春","成都"]' \ No newline at end of file diff --git a/.env.test-scp b/.env.test-scp index a68d25459..e64386900 100644 --- a/.env.test-scp +++ b/.env.test-scp @@ -35,3 +35,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25311/magic/web/index.html' # 积木报表请求路径 VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25311' + + +# 租户配置 +VITE_TENANT='["长春","成都"]' diff --git a/.env.wyf b/.env.wyf index 4c5de71c6..ae1a58502 100644 --- a/.env.wyf +++ b/.env.wyf @@ -4,9 +4,9 @@ NODE_ENV=test VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://192.168.0.113:12080' +VITE_BASE_URL='http://192.168.0.108:12080' # 上传路径 -VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://192.168.0.108:12080/admin-api/infra/file/upload' # # 请求路径 # VITE_BASE_URL='http://dev.ccwin-in.com:25300/api' @@ -46,3 +46,6 @@ VITE_JMREPORT_BASE_URL='http://192.168.0.108:12080' # # 积木报表请求路径 # VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310' + +# 租户配置 +VITE_TENANT='["长春","成都"]' \ No newline at end of file diff --git a/README.md b/README.md index 9ddf0ac73..74eef9397 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## dev发布2024-05-15-002 +## dev发布2024-05-15-004 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { @@ -28,6 +28,7 @@ form: { } **tableForm明细列表查询弹窗配置** tableForm:{ + hidden:false,//控制列是否展示 isInpuFocusShow: true, // 开启查询弹窗 【**与form表单中唯一不同属性**】 searchListPlaceholder: '请选择从仓库代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/api/eam/documentType/index.ts b/src/api/eam/basicDocumentType/index.ts similarity index 87% rename from src/api/eam/documentType/index.ts rename to src/api/eam/basicDocumentType/index.ts index 4d73e1d21..0ab30af39 100644 --- a/src/api/eam/documentType/index.ts +++ b/src/api/eam/basicDocumentType/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; export interface DocumentTypeVO { id: number @@ -53,4 +54,9 @@ export const exportDocumentType = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/document-type/get-import-template' }) -} \ No newline at end of file +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/document-type/ables` , data }) +} diff --git a/src/api/eam/basicFaultCause/index.ts b/src/api/eam/basicFaultCause/index.ts index 391442089..ff5aed0e5 100644 --- a/src/api/eam/basicFaultCause/index.ts +++ b/src/api/eam/basicFaultCause/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; export interface BasicFaultCauseVO { id: number @@ -54,4 +55,9 @@ export const exportBasicFaultCause = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/basic-fault-cause/get-import-template' }) -} \ No newline at end of file +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/basic-fault-cause/ables` , data }) +} diff --git a/src/api/eam/basicFaultType/index.ts b/src/api/eam/basicFaultType/index.ts index 727094608..899b82ec4 100644 --- a/src/api/eam/basicFaultType/index.ts +++ b/src/api/eam/basicFaultType/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; export interface BasicFaultTypeVO { id: number @@ -53,4 +54,9 @@ export const exportBasicFaultType = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/basic-fault-type/get-import-template' }) -} \ No newline at end of file +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/basic-fault-type/ables` , data }) +} diff --git a/src/api/eam/basicInspectionOption/index.ts b/src/api/eam/basicInspectionOption/index.ts new file mode 100644 index 000000000..c41812cbe --- /dev/null +++ b/src/api/eam/basicInspectionOption/index.ts @@ -0,0 +1,64 @@ +import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; + +export interface BasicInspectionOptionVO { + id: number + code: string + name: string + describing: string + isUpdated: boolean + type: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询巡检方案列表 +export const getBasicInspectionOptionPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/basic-inspection-option/senior', data }) + } else { + return await request.get({ url: `/eam/basic-inspection-option/page`, params }) + } +} + +// 查询巡检方案详情 +export const getBasicInspectionOption = async (id: number) => { + return await request.get({ url: `/eam/basic-inspection-option/get?id=` + id }) +} + +// 新增巡检方案 +export const createBasicInspectionOption = async (data: BasicInspectionOptionVO) => { + return await request.post({ url: `/eam/basic-inspection-option/create`, data }) +} + +// 修改巡检方案 +export const updateBasicInspectionOption = async (data: BasicInspectionOptionVO) => { + return await request.put({ url: `/eam/basic-inspection-option/update`, data }) +} + +// 删除巡检方案 +export const deleteBasicInspectionOption = async (id: number) => { + return await request.delete({ url: `/eam/basic-inspection-option/delete?id=` + id }) +} + +// 导出巡检方案 Excel +export const exportBasicInspectionOption = async (params) => { + return await request.download({ url: `/eam/basic-inspection-option/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/basic-inspection-option/get-import-template' }) +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/basic-inspection-option/ables` , data }) +} diff --git a/src/api/eam/basicMaintenanceOption/index.ts b/src/api/eam/basicMaintenanceOption/index.ts new file mode 100644 index 000000000..0d95570c6 --- /dev/null +++ b/src/api/eam/basicMaintenanceOption/index.ts @@ -0,0 +1,64 @@ +import request from '@/config/axios' +import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; + +export interface BasicMaintenanceOptionVO { + id: number + code: string + name: string + describing: string + isUpdated: boolean + type: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询保养方案列表 +export const getBasicMaintenanceOptionPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/basic-maintenance-option/senior', data }) + } else { + return await request.get({ url: `/eam/basic-maintenance-option/page`, params }) + } +} + +// 查询保养方案详情 +export const getBasicMaintenanceOption = async (id: number) => { + return await request.get({ url: `/eam/basic-maintenance-option/get?id=` + id }) +} + +// 新增保养方案 +export const createBasicMaintenanceOption = async (data: BasicMaintenanceOptionVO) => { + return await request.post({ url: `/eam/basic-maintenance-option/create`, data }) +} + +// 修改保养方案 +export const updateBasicMaintenanceOption = async (data: BasicMaintenanceOptionVO) => { + return await request.put({ url: `/eam/basic-maintenance-option/update`, data }) +} + +// 删除保养方案 +export const deleteBasicMaintenanceOption = async (id: number) => { + return await request.delete({ url: `/eam/basic-maintenance-option/delete?id=` + id }) +} + +// 导出保养方案 Excel +export const exportBasicMaintenanceOption = async (params) => { + return await request.download({ url: `/eam/basic-maintenance-option/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/basic-maintenance-option/get-import-template' }) +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/basic-maintenance-option/ables` , data }) +} diff --git a/src/api/eam/equipmentMainPart/index.ts b/src/api/eam/equipmentMainPart/index.ts index 482c17209..a5d7acdd2 100644 --- a/src/api/eam/equipmentMainPart/index.ts +++ b/src/api/eam/equipmentMainPart/index.ts @@ -37,6 +37,7 @@ export const createEquipmentMainPart = async (data: EquipmentMainPartVO) => { // 修改主要部件 export const updateEquipmentMainPart = async (data: EquipmentMainPartVO) => { + console.log(data) return await request.put({ url: `/eam/equipment-main-part/update`, data }) } @@ -53,4 +54,9 @@ export const exportEquipmentMainPart = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/equipment-main-part/get-import-template' }) -} \ No newline at end of file +} + +// 启用 / 禁用 +export const updateEnableCode = async (data: EquipmentMainPartVO) => { + return await request.post({ url: `/eam/equipment-main-part/ables` , data }) +} diff --git a/src/api/wms/containerMainRequest/index.ts b/src/api/wms/containerMainRequest/index.ts index 35e7a9f8d..91d143784 100644 --- a/src/api/wms/containerMainRequest/index.ts +++ b/src/api/wms/containerMainRequest/index.ts @@ -14,7 +14,7 @@ export interface ContainerMainRequestVO { export const getContainerMainRequestPage = async (params) => { if (params.isSearch) { delete params.isSearch - const data = {...params} + const data = { ...params } return await request.post({ url: '/wms/container-main-request/senior', data }) } else { return await request.get({ url: `/wms/container-main-request/page`, params }) @@ -43,7 +43,74 @@ export const deleteContainerMainRequest = async (id: number) => { // 导出器具管理申请主 Excel export const exportContainerMainRequest = async (params) => { - return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + params.businessType = 'ContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } +} + +// 导出初始化器具管理申请主 Excel +export const exportInitialContainerMainRequest = async (params) => { + params.businessType = 'InitialContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } +} + +// 导出初始化器具管理申请主 Excel +export const exportScrapContainerMainRequest = async (params) => { + params.businessType = 'ScrapContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } +} + +// 导出移动器具管理申请主 Excel +export const exportMoveContainerMainRequest = async (params) => { + params.businessType = 'MoveContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } +} + +// 导出返回器具管理申请主 Excel +export const exportReturnContainerMainRequest = async (params) => { + params.businessType = 'ReturnContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } +} + +// 导出发运器具管理申请主 Excel +export const exportDeliverContainerMainRequest = async (params) => { + params.businessType = 'DeliverContainerManage' + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/container-main-request/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/container-main-request/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/wms/qadproductionplan/index.ts b/src/api/wms/qadproductionplan/index.ts new file mode 100644 index 000000000..c25893833 --- /dev/null +++ b/src/api/wms/qadproductionplan/index.ts @@ -0,0 +1,58 @@ +import request from '@/config/axios' + +export interface QadProductionPlanMainVO { + displayOrder: number + workshop: string + productionLine: string + shift: string + team: string + planDate: Date + details: string + number: string + planType: string + businessType: string + remark: string + woNumber: string + woLine: string +} + +// 查询QAD生产计划主列表 +export const getQadProductionPlanMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/qad-production-plan-main/senior', data }) + } else { + return await request.get({ url: `/wms/qad-production-plan-main/page`, params }) + } +} + +// 查询QAD生产计划主详情 +export const getQadProductionPlanMain = async (id: number) => { + return await request.get({ url: `/wms/qad-production-plan-main/get?id=` + id }) +} + +// 新增QAD生产计划主 +export const createQadProductionPlanMain = async (data: QadProductionPlanMainVO) => { + return await request.post({ url: `/wms/qad-production-plan-main/create`, data }) +} + +// 修改QAD生产计划主 +export const updateQadProductionPlanMain = async (data: QadProductionPlanMainVO) => { + return await request.put({ url: `/wms/qad-production-plan-main/update`, data }) +} + +// 删除QAD生产计划主 +export const deleteQadProductionPlanMain = async (id: number) => { + return await request.delete({ url: `/wms/qad-production-plan-main/delete?id=` + id }) +} + +// 导出QAD生产计划主 Excel +export const exportQadProductionPlanMain = async (params) => { + return await request.download({ url: `/wms/qad-production-plan-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/qad-production-plan-main/get-import-template' }) +} diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 2a471aa67..87eb4a851 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -40,7 +40,7 @@ /> ([ sort: 'custom', form: { component: 'Switch', - value: 'TURE', + value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TURE' + activeValue: 'TRUE' } }, }, diff --git a/src/views/eam/documentType/index.vue b/src/views/eam/basicDocumentType/index.vue similarity index 80% rename from src/views/eam/documentType/index.vue rename to src/views/eam/basicDocumentType/index.vue index b244a4a6e..50e79ca47 100644 --- a/src/views/eam/documentType/index.vue +++ b/src/views/eam/basicDocumentType/index.vue @@ -33,7 +33,7 @@ @@ -59,8 +59,8 @@ diff --git a/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts b/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts new file mode 100644 index 000000000..fe26160a5 --- /dev/null +++ b/src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts @@ -0,0 +1,171 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const BasicMaintenanceOptionRules = reactive({ + code: [required], + type: [required], + name: [required], +}) + +export const BasicMaintenanceOption = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '编号', + field: 'code', + sort: 'custom', + isSearch: true, + }, + { + label: '方案名称', + field: 'name', + sort: 'custom', + isSearch: true, + }, + { + label: '描述', + field: 'describing', + sort: 'custom', + isSearch: true, + }, + { + label: '项是否可修改默认是', + field: 'isUpdated', + sort: 'custom', + isSearch: true, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, + { + label: '来源于类型配置', + field: 'type', + sort: 'custom', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/eam/basicMaintenanceOption/index.vue b/src/views/eam/basicMaintenanceOption/index.vue new file mode 100644 index 000000000..cc0acef00 --- /dev/null +++ b/src/views/eam/basicMaintenanceOption/index.vue @@ -0,0 +1,291 @@ + + + diff --git a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts index 8937ab8ef..efba49dec 100644 --- a/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts +++ b/src/views/eam/equipmentMainPart/equipmentMainPart.data.ts @@ -83,10 +83,10 @@ export const EquipmentMainPart = useCrudSchemas(reactive([ isSearch: true, form: { component: 'Switch', - value: 'TURE', + value: 'TRUE', componentProps: { inactiveValue: 'FALSE', - activeValue: 'TURE' + activeValue: 'TRUE' } }, }, diff --git a/src/views/eam/equipmentMainPart/index.vue b/src/views/eam/equipmentMainPart/index.vue index 97cd0bdaf..6af6d2835 100644 --- a/src/views/eam/equipmentMainPart/index.vue +++ b/src/views/eam/equipmentMainPart/index.vue @@ -33,7 +33,7 @@ @@ -131,11 +131,23 @@ const buttonBaseClick = (val, item) => { } } -// 列表-操作按钮 -const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMainPart:update'}), // 编辑 - //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMainPart:delete'}), // 删除 -] +const isShowMainButton = (row,val) => { + if (val.indexOf(row.available) > -1) { + return false + } else { + return true + } +} + + +const butttondata = (row) => { + return [ + defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMainPart:update'}), // 编辑 + //defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMainPart:delete'}), // 删除 + defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentMainPart:update'}), + defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:equipmentMainPart:update'}), + ] +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -143,6 +155,10 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) + }else if (val == 'enable') { + handleEnable(row.id) + }else if (val == 'disable') { + handleDisable(row.id) } } @@ -195,6 +211,40 @@ const handleDelete = async (id: number) => { } catch {} } + + + +/** 启用 */ +const handleEnable = async (id: number) => { + try { + const params = ref({ + id: '', + available:'', + }) + params.value.id = id + params.value.available = 'TRUE' + await EquipmentMainPartApi.updateEnableCode(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} +/** 禁用 */ +const handleDisable = async (id: number) => { + try { + const params = ref({ + id: '', + available:'', + }) + params.value.id = id + params.value.available = 'FALSE' + await EquipmentMainPartApi.updateEnableCode(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index 6f79ce15e..67607c1dc 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -9,8 +9,16 @@ - + + + + @@ -110,6 +118,7 @@ // 验证码开关 const captchaEnabled = ref(true); const codeUrl = ref(""); + const tenantArray = JSON.parse(import.meta.env.VITE_TENANT); const LoginRules = { tenantName: [required], @@ -121,7 +130,7 @@ captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE, tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE, loginForm: { - tenantName: '闻荫源码', + tenantName: tenantArray[0], username: 'admin', password: '123456', captchaVerification: '', diff --git a/src/views/login/components/MobileForm.vue b/src/views/login/components/MobileForm.vue index fa42de03d..1d7038231 100644 --- a/src/views/login/components/MobileForm.vue +++ b/src/views/login/components/MobileForm.vue @@ -18,13 +18,21 @@ - + /> --> + + + @@ -117,6 +125,7 @@ const iconCircleCheck = useIcon({ icon: 'ep:circle-check' }) const { validForm } = useFormValid(formSmsLogin) const { handleBackLogin, getLoginState } = useLoginState() const getShow = computed(() => unref(getLoginState) === LoginStateEnum.MOBILE) +const tenantArray = JSON.parse(import.meta.env.VITE_TENANT); const rules = { tenantName: [required], @@ -132,7 +141,7 @@ const loginData = reactive({ }, loginForm: { uuid: '', - tenantName: '闻荫源码', + tenantName: tenantArray[0], mobileNumber: '', code: '' } diff --git a/src/views/mes/abilityInfo/abilityInfo.data.ts b/src/views/mes/abilityInfo/abilityInfo.data.ts index 37f01205e..16db7dc40 100644 --- a/src/views/mes/abilityInfo/abilityInfo.data.ts +++ b/src/views/mes/abilityInfo/abilityInfo.data.ts @@ -140,7 +140,7 @@ export const AbilityInfo = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: false, - isTable: false + isTable: true }, { label: '状态', diff --git a/src/views/mes/holidayCalendar/index.vue b/src/views/mes/holidayCalendar/index.vue deleted file mode 100644 index 21eeb6ee8..000000000 --- a/src/views/mes/holidayCalendar/index.vue +++ /dev/null @@ -1,75 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts index 02febd8b6..81c779e86 100644 --- a/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts +++ b/src/views/mes/hrPersonAbility/hrPersonAbility.data.ts @@ -178,7 +178,7 @@ export const HrPersonAbility = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: false, - isTable: false + isTable: true }, { label: '状态', diff --git a/src/views/mes/jobcalendar/index.vue b/src/views/mes/jobcalendar/index.vue deleted file mode 100644 index acd7a2a6c..000000000 --- a/src/views/mes/jobcalendar/index.vue +++ /dev/null @@ -1,8 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/mes/orderDay/orderDay.data.ts b/src/views/mes/orderDay/orderDay.data.ts index ab6b2b65d..43bed9d1e 100644 --- a/src/views/mes/orderDay/orderDay.data.ts +++ b/src/views/mes/orderDay/orderDay.data.ts @@ -273,6 +273,9 @@ export const OrderDay = useCrudSchemas(reactive([ valueFormat: 'YYYY-MM-DD', } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -296,6 +299,9 @@ export const OrderDay = useCrudSchemas(reactive([ timeFormat:"HH:mm" } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, }, { label: '结束时间', @@ -312,6 +318,9 @@ export const OrderDay = useCrudSchemas(reactive([ timeFormat:"HH:mm" } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, }, { label: '生产模式', @@ -339,6 +348,9 @@ export const OrderDay = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, isForm: false, }, { diff --git a/src/views/mes/patternType/patternType.data.ts b/src/views/mes/patternType/patternType.data.ts index 3ec104df8..1095f1138 100644 --- a/src/views/mes/patternType/patternType.data.ts +++ b/src/views/mes/patternType/patternType.data.ts @@ -140,6 +140,6 @@ export const PatternType = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', isSearch: false, - isTable: false + isTable: true } ])) diff --git a/src/views/mes/processroute/processroute.data.ts b/src/views/mes/processroute/processroute.data.ts index 36a782b64..077aecc88 100644 --- a/src/views/mes/processroute/processroute.data.ts +++ b/src/views/mes/processroute/processroute.data.ts @@ -4,6 +4,11 @@ import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' // 表单校验 export const ProcessrouteRules = reactive({ + processrouteCode: [required], + processName: [required], + productCode: [required], + ablityCode: [required], + ablityCode: [required], }) export const Processroute = useCrudSchemas(reactive([ @@ -26,6 +31,7 @@ export const Processroute = useCrudSchemas(reactive([ field: 'id', sort: 'custom', isForm: false, + isTable: false, }, { diff --git a/src/views/mes/workScheduling/components/reportAll.vue b/src/views/mes/workScheduling/components/reportAll.vue index 085008f86..060d02c43 100644 --- a/src/views/mes/workScheduling/components/reportAll.vue +++ b/src/views/mes/workScheduling/components/reportAll.vue @@ -9,7 +9,7 @@ 添加 - +