From daa40fd489520ac7a9f8f2bce6c2356f8989693e Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 14 Nov 2023 18:44:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E9=82=AE=E7=BC=96?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentsetting/documentsetting.data.ts           |  1 +
 .../basicDataManage/orderManage/owner/owner.data.ts   | 11 ++++++++---
 .../basicDataManage/orderManage/shift/shift.data.ts   |  8 ++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
index ee753a94b..fbe8db260 100644
--- a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
+++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts
@@ -223,6 +223,7 @@ export const DocumentsettingRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   description: [
+    { required: true, message: '请输入描述', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   type: [
diff --git a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts
index a877766a1..2dc139fde 100644
--- a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts
+++ b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts
@@ -2,6 +2,8 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 
+import {validateHanset,validateFax,validatePostCode} from '@/utils/validator'
+
 /**
  * @returns {Array} 货主
  */
@@ -273,13 +275,16 @@ export const OwnerRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   phone: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
   ],
   fax: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateFax, message: '请输入正确的传真', trigger: 'blur'}
   ],
   postId: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
   ],
   contacts: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
index 99f5b280a..58eb23e1c 100644
--- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
+++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts
@@ -68,6 +68,14 @@ export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
     isSearch: true,
+    search: {
+      show: true,
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+      }
+    }
   },
   {
     label: '是否跨天',