From b3a5cfe1f393f7be52e0c8ffb60a1b0aca51a975 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Thu, 7 Mar 2024 15:35:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9nginx=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From a5e21b83a624a80d3404ebee61e48ed63e616db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Thu, 7 Mar 2024 16:22:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deviceMaintenance.data.ts                 |  2 +-
 .../eam/basic/inspection/inspection.data.ts   |  2 +-
 src/views/eam/basic/supplier/supplier.data.ts |  5 +++
 .../item/itemOrderMain/itemOrderMain.data.ts  | 31 +------------------
 4 files changed, 8 insertions(+), 32 deletions(-)

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<CrudSchema[]>([
     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<CrudSchema[]>([
     }
   },
   {
-    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<CrudSchema[]>([
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<CrudSchema[]>([
       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',

From 45876e54e497d61a057efaae2ddd4762e6c23fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 8 Mar 2024 08:36:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/item/itemAccounts/itemAccounts.data.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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<CrudSchema[]>([
     table: {
       width: 110
     },
-    isSearch: true,
+    isSearch: false,
   },
 
   {