Merge remote-tracking branch 'origin/master'

src/views/wms/basicDataManage/factoryModeling/enterprise/enterprise.data.ts

@@ -3,9 +3,27 @@ import { dateFormatter } from '@/utils/formatTime'
 
 // 表单校验
 export const EnterpriseRules = reactive({
-  code: [required],
+  code: [
-  shortName: [required],
+    { required: true, message: '请输入代码', trigger: 'blur' },
-  available: [required],
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  name: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  shortName: [
+    { required: true, message: '请输入简称', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  available: [
+    { required: true, message: '请输入代码', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  address: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
 })
 
 export const Enterprise = useCrudSchemas(reactive<CrudSchema[]>([

src/views/wms/basicDataManage/factoryModeling/location/location.data.ts

@@ -400,7 +400,7 @@ export const LocationRules = reactive({
     { required: true, message: '请输入库位组代码', trigger: 'change' }
   ],
   erpLocationCode: [
-    { required: true, message: '请选择ERP库位代码', trigger: 'change' }
+    { required: true, message: '请选择ERP库位类型', trigger: 'change' }
   ],
   type: [
     { required: true, message: '请选择类型', trigger: 'change' }

src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue

@@ -189,9 +189,9 @@ const formData = ref({
 
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 

src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue

@@ -305,9 +305,9 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
   configurationRules: [{ required: true, message: '规则配置请填写完全', trigger: 'blur' }]
 })

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@@ -635,9 +635,9 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 

src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue

@@ -292,9 +292,9 @@ const formData = ref({
 
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
   configurationRules: [{ required: true, message: '抽奖规则请填写完全', trigger: 'blur' }]
 })

src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue

@@ -358,9 +358,9 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 

src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue

@@ -201,9 +201,9 @@ const formData = ref({
 
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 

src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue

@@ -328,9 +328,9 @@ const formData = ref({
 
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 

src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue

@@ -329,9 +329,9 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -297,9 +297,9 @@ const formData = ref({
 
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 

src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@@ -578,9 +578,9 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 

src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue

@@ -244,9 +244,9 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 

src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue

@@ -282,9 +282,9 @@ const formData = ref({
 })
 // 验证规则
 const rules = ref({
-  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
+  strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入名字', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
-  description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
+  description: [{ required: true, message: '请输入描述', trigger: 'blur' },{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
   priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 

src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts

@@ -271,6 +271,12 @@ export const AccountcalendarRules = reactive({
   month: [
     { required: true, message: '请输入月', trigger: 'blur' }
   ],
+  descriiption: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
   beginTime: [
     { required: true, message: '请输入开始时间', trigger: 'blur' }
   ],

src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts

@@ -186,4 +186,7 @@ export const CurrencyexchangeRules = reactive({
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
 })

src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts

@@ -199,9 +199,13 @@ export const Systemcalendar = useCrudSchemas(reactive<CrudSchema[]>([
 //表单校验
 export const SystemcalendarRules = reactive({
   module: [
-    { required: true, message: '请输入模块', trigger: 'blur' }
+    { required: true, message: '请输入模块', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }
   ],
+  remark: [
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
 })