From 783d849a9d24af217d7830282c10f16fec436bfa Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 3 Jun 2024 19:20:24 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/UserForm.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue index d673cdc96..c6ec91013 100644 --- a/src/views/system/user/UserForm.vue +++ b/src/views/system/user/UserForm.vue @@ -138,13 +138,13 @@ const formRules = reactive({ trigger: ['blur', 'change'] } ], - mobile: [ - { - pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/, - message: '请输入正确的手机号码', - trigger: 'blur' - } - ] + // mobile: [ + // { + // pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/, + // message: '请输入正确的手机号码', + // trigger: 'blur' + // } + // ] }) const formRef = ref() // 表单 Ref const deptList = ref([]) // 树形结构 From 5080f247c9e428df9e342878b3c739a28cd19594 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Tue, 4 Jun 2024 08:27:21 +0800 Subject: [PATCH 02/11] =?UTF-8?q?scp=E7=AD=9B=E9=80=89=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierUser/supplierUser.data.ts | 9 +++++++ .../supplierinvoiceRecordMain.data.ts | 9 +++++++ .../supplierinvoiceInvoiced.data.ts | 27 +++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts index 81a8bcc3c..7358be064 100644 --- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts @@ -170,6 +170,15 @@ export const SupplierUser = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, isForm: false, }, { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index d4870f42d..33c1ce108 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -687,6 +687,15 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 180 }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } }, { label: '开票数量', diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts index da35415d0..89c1358c3 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts @@ -23,6 +23,15 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, table: { width: 150 }, @@ -41,6 +50,15 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, table: { width: 150 }, @@ -183,6 +201,15 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, table: { width: 150 }, From 9433b7015381b94857eb6ea90849c6e2e062cf21 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Tue, 4 Jun 2024 10:32:57 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=8F=AD=E7=BB=84=20=20=E5=8E=BB?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=89=E6=9D=A1=E4=BB=B6=20=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/orderManage/shift/shift.data.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts index f48755d9e..a4b7220b0 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts +++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts @@ -34,7 +34,7 @@ export const Shift = useCrudSchemas(reactive([ detail: { dateFormat: 'HH:mm:ss' }, - sort: 'custom', + sort: 'custom', table: { width: 180, }, @@ -47,9 +47,9 @@ export const Shift = useCrudSchemas(reactive([ valueFormat: 'x', } }, - isSearch: true, + isSearch: false, search: { - show: true, + show: false, component: 'TimePicker', componentProps: { valueFormat: 'HH:mm:ss', @@ -78,9 +78,9 @@ export const Shift = useCrudSchemas(reactive([ valueFormat: 'x', } }, - isSearch: true, + isSearch: false, search: { - show: true, + show: false, component: 'TimePicker', componentProps: { valueFormat: 'HH:mm:ss', @@ -249,4 +249,4 @@ export const ShiftRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) From 5f6d993d846364efca304f1bbf5130ebabd13cfb Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 4 Jun 2024 10:41:07 +0800 Subject: [PATCH 04/11] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E4=BF=9D?= =?UTF-8?q?=E5=85=BB=E8=AE=B0=E5=BD=95=20=E4=B8=BB=E5=AD=90=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentMaintenanceRecordMain.data.ts | 383 ++++++++++++++---- .../equipmentMaintenanceRecordMain/index.vue | 30 +- 2 files changed, 315 insertions(+), 98 deletions(-) diff --git a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts index 199b71234..3541eeece 100644 --- a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts +++ b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts @@ -4,138 +4,229 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const EquipmentMaintenanceRecordMainRules = reactive({ number: [required], + sources: [required], equipmentCode: [required], - planNumber: [required], - status: [required], - factoryAreaCode: [required], - concurrencyStamp: [required] + type: [required], + planStartTime: [required], + planEndTime: [required], + startTime: [required], + endTime: [required], }) export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive([ { - label: '保养编号', - field: 'number', + label: 'id', + field: 'id', + sort: 'custom', + isForm: false, + }, + { + label: '记录编号', + field: 'recordNo', sort: 'custom', - isSearch: true + isSearch: true, }, { label: '描述', field: 'describing', sort: 'custom', - isSearch: true + isSearch: true, + isSearch: false, + }, + { + label: '保养工单', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '来源字典', + field: 'sources', + sort: 'custom', + isSearch: true, + isSearch: false, }, { label: '设备编号', field: 'equipmentCode', sort: 'custom', - isSearch: true + isSearch: true, }, { - label: '设备类别', - field: 'category', + label: '故障类型枚举', + field: 'faultType', sort: 'custom', - dictType: DICT_TYPE.DEVICE_TYPE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, - form: { - component: 'SelectV2' - } + isSearch: false, + }, { - label: '班次枚举', - field: 'classes', + label: '工装或设备字典', + field: 'type', sort: 'custom', - // dictType: DICT_TYPE.SHIFT_TYPE, - // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', }, { - label: '保养计划工单', + label: '保养计划工单号', field: 'planNumber', sort: 'custom', - isSearch: true + isSearch: true, }, { - label: '故障类型枚举', - field: 'faultType', + label: '计划开始时间', + field: 'planStartTime', sort: 'custom', - dictType: DICT_TYPE.FAILURE_REASON, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true, + formatter: dateFormatter, + isSearch: 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: 'SelectV2' - } + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, }, { - label: '保养周期', - field: 'cycle', + label: '计划结束时间', + field: 'planEndTime', sort: 'custom', - dictType: DICT_TYPE.MAINTENANCE_CYCLE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true + formatter: dateFormatter, + isSearch: 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: '保养次数', - field: 'times', + label: '保养开始时间', + field: 'startTime', sort: 'custom', - isSearch: true + formatter: dateFormatter, + isSearch: 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: '验证人', - field: 'verifyer2', + label: '保养结束时间', + field: 'endTime', sort: 'custom', - isSearch: true, + formatter: dateFormatter, + isSearch: 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: 'InputNumber', - value: 0 - } + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, }, { - label: '验证内容', - field: 'verifyContent2', + label: '保养班组', + field: 'classType', sort: 'custom', - isSearch: true + isSearch: false, }, { - label: '验证时间', - field: 'verifyTime2', + label: '验证人', + field: 'verifyer', sort: 'custom', - isSearch: true + isSearch: false, }, { - label: '保养人', - field: 'maintenancer', + label: '验证内容', + field: 'verifyContent', sort: 'custom', - isSearch: true, + isSearch: false, form: { - component: 'InputNumber', - value: 0 - } + component: 'Editor', + componentProps: { + valueHtml: '', + height: 200 + } + }, }, { - label: '保养人联系电话', - field: 'maintenancePhone', + label: '验证时间', + field: 'verifyTime', sort: 'custom', - isSearch: true + formatter: dateFormatter, + isSearch: 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: '结果枚举', - field: 'completeResult', + label: '保养人id', + field: 'maintenancer', sort: 'custom', - isSearch: true + isSearch: false, }, { - label: '完成时间', - field: 'completionTime2', + label: '保养人联系电话', + field: 'maintenancePhone', sort: 'custom', - isSearch: true + isSearch: false, }, { - label: '保养时间', - field: 'maintenanceTime', + label: '完成时间', + field: 'completionTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -150,58 +241,172 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive -