diff --git a/Dockerfile b/Dockerfile index ed98c22..0166bd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # 设置基础镜像 -FROM nginx:WIN-1.25.3 +FROM win-nginx WORKDIR /opt/eam COPY nginx.conf /usr/local/nginx/conf/nginx.conf diff --git a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts index b3498da..502b09a 100644 --- a/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts +++ b/src/views/eam/basic/deviceMaintenance/deviceMaintenance.data.ts @@ -129,7 +129,7 @@ export const DeviceMaintenance = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, table: { - width: 150, + width: 170, }, form: { component: 'InputNumber', diff --git a/src/views/eam/basic/inspection/inspection.data.ts b/src/views/eam/basic/inspection/inspection.data.ts index 395768e..34b7292 100644 --- a/src/views/eam/basic/inspection/inspection.data.ts +++ b/src/views/eam/basic/inspection/inspection.data.ts @@ -57,7 +57,7 @@ export const DeviceMoldItems = useCrudSchemas(reactive([ } }, { - label: '设备/模具编号', + label: '设备编号', field: 'deviceNumber', sort: 'custom', isSearch: false, diff --git a/src/views/eam/basic/supplier/supplier.data.ts b/src/views/eam/basic/supplier/supplier.data.ts index 94a12e6..cdce36f 100644 --- a/src/views/eam/basic/supplier/supplier.data.ts +++ b/src/views/eam/basic/supplier/supplier.data.ts @@ -1,4 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import {validateHanset,validateFax,validatePostCode,validateYS} from '@/utils/validator' // 表单校验 export const SupplierRules = reactive({ @@ -6,6 +7,10 @@ export const SupplierRules = reactive({ { required: true, message: '请输入供应商名称', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + phone: [ + { max: 11, message: '不得超过11个字符', trigger: 'blur' }, + { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'} + ], }) export const Supplier = useCrudSchemas(reactive([ diff --git a/src/views/eam/item/itemAccounts/itemAccounts.data.ts b/src/views/eam/item/itemAccounts/itemAccounts.data.ts index 9198994..dfbc5b6 100644 --- a/src/views/eam/item/itemAccounts/itemAccounts.data.ts +++ b/src/views/eam/item/itemAccounts/itemAccounts.data.ts @@ -26,7 +26,7 @@ export const ItemAccounts = useCrudSchemas(reactive([ table: { width: 110 }, - isSearch: true, + isSearch: false, }, { diff --git a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts index 3db0261..fa6c327 100644 --- a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts +++ b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter2 } from '@/utils/formatTime' import { Item } from '@/views/eam/basic/item/item.data' import * as ItemApi from '@/api/eam/basic/item' import { validateHanset, validateEmail } from '@/utils/validator' @@ -20,35 +20,6 @@ export const ItemOrderMain = useCrudSchemas(reactive([ fixed: 'left' }, }, - // { - // label: '日期', - // field: 'date', - // sort: 'custom', - // formatter: dateFormatter, - // form: { - // component: 'DatePicker', - // componentProps: { - // type: 'datetime', - // valueFormat: 'x' - // } - // }, - // }, - { - label: '日期', - field: 'date', - sort: 'custom', - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - type: 'date', - valueFormat: 'x' - } - }, - detail: { - dateFormat: 'YYYY-MM-DD' - } - }, { label: '电话', field: 'phone',