From b66f9d3df2577c463105e2c86ed37686264ec4ec Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Wed, 3 Jan 2024 10:24:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain.data.ts         | 12 +++++
 .../purchaseMain/purchaseMain.data.ts         |  7 ++-
 .../purchaseclaimRequestMain.data.ts          | 51 +++++++++++--------
 .../supplierinvoiceRequestMain.data.ts        | 20 +++++++-
 4 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 564c1de5a..c63ce5dee 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -417,6 +417,15 @@ export const PurchasereturnRequestMainRules = reactive({
   supplierCode: [
     { required: true, message: '请输入供应商代码', trigger: 'blur' }
   ],
+  carrierCode: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  vehiclePlateNumber: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
   fromWarehouseCode: [
     { required: true, message: '请输入从仓库代码', trigger: 'blur' }
   ],
@@ -1084,4 +1093,7 @@ export const PurchasereturnRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物品代码', trigger: 'blur' }
   ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
 })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index 84dbac0e4..fc91b560b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -4,6 +4,7 @@ import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import {validateHanset,validateEmail} from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
 /**
@@ -345,10 +346,12 @@ export const PurchaseMainRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   contactPhone:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'}
   ],
   contactEmail:  [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { validator:validateEmail, message: '请输入正确的手机号', trigger: 'blur'}
   ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
index 762834c34..6525476ef 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts
@@ -329,6 +329,9 @@ export const PurchaseclaimRequestMainRules = reactive({
   status:  [
     { required: true, message: '请选择状态', trigger: 'change' }
   ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
 })
 
 /**
@@ -520,40 +523,44 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
 
 // 表单校验
 export const PurchaseclaimRequestDetailRules = reactive({
-  batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
-  ],
-  altBatch:  [
-    { required: true, message: '请输入替代批次', trigger: 'blur' }
-  ],
   poNumber: [
     { required: true, message: '请输入订单号', trigger: 'change' }
   ],
   poLine: [
-    { required: true, message: '请输入订单行', trigger: 'change' }
-  ],
-  singlePrice:  [
-    { required: true, message: '请输入单价', trigger: 'change' }
+    { required: true, message: '请输入订单行', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  amount:  [
-    { required: true, message: '请输入金额', trigger: 'change' }
+  qty:  [
+    { required: true, message: '请输入数量', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  number:  [
-    { required: true, message: '请输入单据号', trigger: 'change' }
+  uom:  [
+    { required: true, message: '请输入计量单位', trigger: 'change' }
   ],
   itemCode:  [
-    { required: true, message: '请输入物品代码', trigger: 'change' }
+    { required: true, message: '请输入物品代码', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  projectCode:  [
-    { required: true, message: '请输入项目代码', trigger: 'change' }
+  itemName:  [
+    { required: true, message: '请输入物品名称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  qty:  [
-    { required: true, message: '请输入数量', trigger: 'change' }
+  batch: [
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-  uom:  [
-    { required: true, message: '请输入计量单位', trigger: 'change' }
+
+  singlePrice:  [
+    { required: true, message: '请输入单价', trigger: 'change' }
+  ],
+  amount:  [
+    { required: true, message: '请输入金额', trigger: 'change' }
   ],
   reason:  [
-    { required: true, message: '请输入原因', trigger: 'change' }
+    { required: true, message: '请输入原因', trigger: 'change' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
 })
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index 23f468161..2e1cc7f72 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -331,7 +331,10 @@ export const SupplierinvoiceRequestMainRules = reactive({
   ],
   businessType: [
     { required: true, message: '请输入业务类型', trigger: 'blur' }
-  ]
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
 })
 
 /**
@@ -574,7 +577,8 @@ export const SupplierinvoiceRequestDetailRules = reactive({
     { required: true, message: '请输入包装号', trigger: 'blur' }
   ],
   batch: [
-    { required: true, message: '请输入批次', trigger: 'blur' }
+    { required: true, message: '请输入批次', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   poNumber: [
     { required: true, message: '请输入订单号', trigger: 'blur' }
@@ -594,4 +598,16 @@ export const SupplierinvoiceRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物品代码', trigger: 'blur' }
   ],
+  ownerCode:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  singlePrice:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  amount:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark:  [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
 })