完善功能

app/admin/validate/life/CollegeTeachingValidate.php

@@ -9,10 +9,10 @@ class CollegeTeachingValidate extends Validate
     protected $rule = [
         'teaching_id' => 'require|integer',
         'teaching_name|名称' => 'require|chsDash',
-        'teaching_time' => 'date',
-        'teaching_courses_id' => 'require|integer',
-        'teaching_price' => 'float',
-        'teaching_status' => 'integer',
+        'teaching_time|上课时间' => 'date',
+        'teaching_courses_id|所属课程' => 'require|integer',
+        'teaching_price|价格' => 'float',
+        'teaching_status|状态' => 'integer',
         'teaching_is_del' => 'integer',
     ];
 

app/admin/validate/life/FarmLandValidate.php

@@ -8,10 +8,10 @@ class FarmLandValidate extends Validate
 {
     protected $rule = [
         'land_id' => 'require|integer',
-        'land_name' => 'require|chsDash',
-        'land_price' => 'require|float',
-        'land_long' => 'require|regex:/^[0-9\.]+$/',
-        'land_lat' => 'require|regex:/^[0-9\.]+$/'
+        'land_name|地块名' => 'require|chsDash',
+        'land_price|价格' => 'require|float',
+        'land_long|经度' => 'require|regex:/^[0-9\.]+$/',
+        'land_lat|纬度' => 'require|regex:/^[0-9\.]+$/'
     ];
 
     protected $message = [];

app/admin/validate/order/OrderExpressValidate.php

@@ -8,13 +8,13 @@ class OrderExpressValidate extends Validate
 {
     protected $rule = [
         'order_id' => 'require|alphaDash',
-        'order_express_type' => 'require|in:自营物流,顺丰速递',
-        'order_express_code' => 'require|alphaDash',
-        'order_express_city' => 'require',
-        'order_express_address' => 'require',
-        'order_express_mobile' => 'require|mobile',
-        'order_express_telephone' => 'mobile',
-        'order_express_person' => 'require',
+        'order_express_type|配送方式' => 'require|in:自营物流,顺丰速递',
+        'order_express_code|快递单号' => 'require|alphaDash',
+        'order_express_city|省市县区' => 'require',
+        'order_express_address|具体地址' => 'require',
+        'order_express_mobile|联系电话' => 'require|mobile',
+        'order_express_telephone|备用电话' => 'mobile',
+        'order_express_person|收件人信息' => 'require',
     ];
 
     protected $scene = [

app/admin/validate/order/OrderValidate.php

@@ -13,10 +13,10 @@ class OrderValidate extends Validate
     protected $rule = [
         'order_id' => 'require|alphaDash',
         'join_order_member_id' => 'require|alphaDash',
-        'order_name' => 'max:32',
-        'order_status_system' => 'require|max:32',
-        'order_status_payment' => 'require|max:32',
-        'order_status_storage' => 'require|max:32',
+        'order_name|订单名称' => 'max:32',
+        'order_status_system|订单系统状态' => 'require|max:32',
+        'order_status_payment|订单支付状态' => 'require|max:32',
+        'order_status_storage|订单库存状态' => 'require|max:32',
     ];
 
     /**

app/admin/validate/order/ReturnValidate.php

@@ -10,14 +10,14 @@ class ReturnValidate extends Validate
         'orders_return_id' => 'require|integer',
         'join_order_return_user_id' => 'require|alphaDash',
         'join_return_order_id' => 'require|alphaDash',
-        'order_return_status' => 'require|in:PENDING,DOING,DONE',
-        'order_return_apply_datetimes' => 'date',
-        'order_return_apply_json' => 'isJson',
-        'order_return_accept_datetimes' => 'date',
-        'order_return_recharge_json' => 'isJson',
-        'order_return_regoods_json' => 'isJson',
-        'order_return_change_json' => 'isJson',
-        'order_return_task_json' => 'isJson',
+        'order_return_status|退单状态' => 'require|in:PENDING,DOING,DONE',
+        'order_return_apply_datetimes|申请时间' => 'date',
+        'order_return_apply_json|申请信息' => 'isJson',
+        'order_return_accept_datetimes|受理时间' => 'date',
+        'order_return_recharge_json|退款处理' => 'isJson',
+        'order_return_regoods_json|退货处理' => 'isJson',
+        'order_return_change_json|换货处理' => 'isJson',
+        'order_return_task_json|工单处理' => 'isJson',
     ];
 
     protected $scene = [

app/admin/validate/sys_manage/AdvValidate.php

@@ -8,18 +8,18 @@ class AdvValidate extends Validate
 {
     protected $rule = [
         'adv_id' => 'require|integer',
-        'join_adv_category_id' => 'integer',
-        'adv_status' => 'in:PENDING,ACTIVED,DISABLED',
-        'adv_category' => 'max:32',
-        'adv_name' => 'require|max:64',
-        'adv_title' => 'require|max:64',
-        'adv_carrier' => 'max:64',
-        'adv_media' => 'isJson',
-        'adv_href' => 'max:64',
-        'adv_config_json' => 'isJson',
-        'content_sort' => 'integer',
-        'content_groupby' => 'max:32',
-        'content_remark' => 'max:128',
+        'join_adv_category_id|所属分类' => 'integer',
+        'adv_status|状态' => 'in:PENDING,ACTIVED,DISABLED',
+        'adv_category|广告分类' => 'max:32',
+        'adv_name|名称' => 'require|max:64',
+        'adv_title|标题' => 'require|max:64',
+        'adv_carrier载体页面' => 'max:64',
+        'adv_media|多媒体信息' => 'isJson',
+        'adv_href|跳转链接' => 'max:64',
+        'adv_config_json|配置信息' => 'isJson',
+        'content_sort|排序' => 'integer',
+        'content_groupby|分组' => 'max:32',
+        'content_remark|备注' => 'max:128',
         'content_extend_json' => 'isJson'
     ];
 

app/admin/validate/sys_manage/ApiValidate.php

@@ -8,12 +8,12 @@ class ApiValidate extends Validate
 {
     protected $rule = [
         'api_id' => 'require|alphaDash',
-        'api_status' => 'require|in:ACTIVED,DISABLED',
-        'api_category' => 'max:32',
-        'api_token' => 'max:32',
-        'api_name' => 'max:64',
-        'api_request_json' => 'isJson',
-        'api_response_json' => 'isJson'
+        'api_status|状态' => 'require|in:ACTIVED,DISABLED',
+        'api_category|分类' => 'max:32',
+        'api_token|Token' => 'max:32',
+        'api_name|名称' => 'max:64',
+        'api_request_json|请求体配置' => 'isJson',
+        'api_response_json|应答体配置' => 'isJson'
     ];
 
     protected $scene = [

app/admin/validate/sys_manage/ArticleValidate.php

@@ -8,10 +8,10 @@ class ArticleValidate extends Validate
 {
     protected $rule = [
         'id' => 'require|integer',
-        'title' => 'require|max:64',
-        'author' => 'max:64',
-        'introduce' => 'max:255',
-        'sort'=>'integer'
+        'title|标题' => 'require|max:64',
+        'author|作者' => 'max:64',
+        'introduce|简介' => 'max:255',
+        'sort|排序'=>'integer'
     ];
 
     protected $message = [];

app/admin/validate/sys_manage/CategoryValidate.php

@@ -7,14 +7,14 @@ use think\Validate;
 class CategoryValidate extends Validate
 {
     protected $rule = [
-        'category_name' => 'require|chsDash',
-        'category_super_id' => 'integer',
-        'category_status' => 'require|in:PENDING,ACTIVED,DISABLED',
-        'category_classify' => 'chsDash',
-        'category_type' => 'chsDash',
-        'category_sort' => 'integer',
-        'category_groupby' => 'chsDash',
-        'category_remark' => 'chsDash'
+        'category_name|分类名称' => 'require|chsDash',
+        'category_super_id|上级' => 'integer',
+        'category_status|分类' => 'require|in:PENDING,ACTIVED,DISABLED',
+        'category_classify|归类' => 'chsDash',
+        'category_type|类型' => 'chsDash',
+        'category_sort|排序' => 'integer',
+        'category_groupby|分组' => 'chsDash',
+//        'category_remark|备注' => 'chsDash'
     ];
 
     protected $message = [];

app/admin/validate/sys_manage/ConfigValidate.php

@@ -7,14 +7,14 @@ use think\Validate;
 class ConfigValidate extends Validate
 {
     protected $rule = [
-        'config_status' => 'require|in:ACTIVED,DISABLED',
-        'config_category' => 'require|in:SYSTEM,APP',
-        'config_key' => 'require|alphaDash',
-        'config_name' => 'chsDash',
-        'config_alias' => 'chsDash',
-        'config_value_json' => 'isJson',
-        'config_sort' => 'integer',
-        'config_groupby' => 'chsDash',
+        'config_status|状态' => 'require|in:ACTIVED,DISABLED',
+        'config_category|分类' => 'require|in:SYSTEM,APP',
+        'config_key|标识' => 'require|alphaDash',
+        'config_name|名称' => 'chsDash',
+        'config_alias|别名' => 'chsDash',
+        'config_value_json|配置内容' => 'isJson',
+        'config_sort|排序' => 'integer',
+        'config_groupby|分组' => 'chsDash',
         'config_extend_json' => 'isJson'
     ];
 

app/admin/validate/sys_manage/ContentValidate.php

@@ -8,7 +8,7 @@ class ContentValidate extends Validate
 {
     protected $rule = [
         'content_id' => 'require|integer',
-        'content_title' => 'require',
+        'content_title|标题' => 'require',
     ];
 
     protected $scene = [

app/admin/validate/sys_manage/DeptValidate.php

@@ -8,16 +8,16 @@ class DeptValidate extends Validate
 {
     protected $rule = [
         'dept_id' => 'require|integer',
-        'dept_super_id' => 'require|integer',
-        'dept_status' => 'require|in:ACTIVED,DISABLED',
-        'dept_category' => 'require|in:职能部门,财务部门,仓库货仓,外延部门,营业场所,其他',
-        'dept_code' => 'require|alphaDash',
-        'dept_city' => 'require|chsDash',
-        'dept_name' => 'require|chsDash',
-        'dept_telephone' => 'mobile',
-        'dept_position' => 'regex:/^[0-9\.]+$/',
-        'dept_address' => 'chsDash',
-        'dept_remark' => 'chsDash'
+        'dept_super_id|上级' => 'require|integer',
+        'dept_status|状态' => 'require|in:ACTIVED,DISABLED',
+        'dept_category|分类' => 'require|in:职能部门,财务部门,仓库货仓,外延部门,营业场所,其他',
+        'dept_code|编号' => 'require|alphaDash',
+        'dept_city|所在城市' => 'require|chsDash',
+        'dept_name|名称' => 'require|chsDash',
+        'dept_telephone|联系电话' => 'mobile',
+        'dept_position|坐标' => 'regex:/^[0-9\.]+$/',
+        'dept_address|地址' => 'chsDash',
+//        'dept_remark' => 'chsDash'
     ];
 
     protected $message = [];

app/admin/validate/sys_manage/FieldValidate.php

@@ -7,15 +7,15 @@ use think\Validate;
 class FieldValidate extends Validate
 {
     protected $rule = [
-        'field_status' => 'require|in:ACTIVED,DISABLED',
-        'field_category' => 'in:NORMAL,PAGE,OTHER',
-        'field_name' => 'require|chsDash',
-        'field_table' => 'require|alphaDash',
-        'field_column_key' => 'alphaDash',
-        'field_column_datatype' => 'in:string,decimal,text,dateTime',
-        'field_column_default' => 'checkDefault',
+        'field_status|状态' => 'require|in:ACTIVED,DISABLED',
+        'field_category|分类' => 'in:NORMAL,PAGE,OTHER',
+        'field_name|名称' => 'require|chsDash',
+        'field_table|所属表' => 'require|alphaDash',
+        'field_column_key|字段列名' => 'alphaDash',
+        'field_column_datatype|数据类型' => 'in:string,decimal,text,dateTime',
+        'field_column_default|列默认值' => 'checkDefault',
 //        'field_form_key' => 'in:id,name',
-        'field_form_type' => 'alphaDash',
+        'field_form_type|DOM表单类型' => 'alphaDash',
 //        'field_form_default' => 'chsDash',
 //        'field_refer_json' => 'isJson',
 //        'field_remark' => 'chsDash',

app/admin/validate/sys_manage/MenuValidate.php

@@ -8,16 +8,16 @@ class MenuValidate extends Validate
 {
     protected $rule = [
         'menu_id' => 'require|integer',
-        'menu_pid' => 'require|integer',
-        'menu_icon' => 'alphaDash',
-        'menu_name' => 'require|max:128',
-        'menu_route' => 'max:64',
-        'menu_params' => 'max:128',
-        'menu_sort' => 'require|integer',
-        'menu_is_show' => 'require|integer',
-        'menu_is_menu' => 'require|integer',
-        'menu_status' => 'require|integer',
-        'level' => 'integer',
+        'menu_pid|上级' => 'require|integer',
+        'menu_icon|ICON' => 'alphaDash',
+        'menu_name|名称' => 'require|max:128',
+        'menu_route|路由' => 'max:64',
+        'menu_params|参数' => 'max:128',
+        'menu_sort|排序' => 'require|integer',
+        'menu_is_show|是否显示' => 'require|integer',
+        'menu_is_menu|类型' => 'require|integer',
+        'menu_status|状态' => 'require|integer',
+        'level|等级' => 'integer',
     ];
 
     protected $scene = [

app/admin/validate/sys_manage/PostageTemplateValidate.php

@@ -8,13 +8,13 @@ class PostageTemplateValidate extends Validate
 {
     protected $rule = [
         'postage_id' => 'require|integer',
-        'postage_name' => 'require|regex:/^[\x{4e00}-\x{9fa5}a-zA-Z0-9\_\-\s]+$/u',
-        'postage_type' => 'require|in:1,2',
-        'postage_first_weight' => 'require|float',
-        'postage_first_price' => 'require|float',
-        'postage_extend_weight' => 'require|float',
-        'postage_extend_price' => 'require|float',
-        'postage_status' => 'in:1,2',
+        'postage_name名称' => 'require|regex:/^[\x{4e00}-\x{9fa5}a-zA-Z0-9\_\-\s]+$/u',
+        'postage_type|类型' => 'require|in:1,2',
+        'postage_first_weight|首重' => 'require|float',
+        'postage_first_price|首重价格' => 'require|float',
+        'postage_extend_weight|续重' => 'require|float',
+        'postage_extend_price|续重价格' => 'require|float',
+        'postage_status|状态' => 'in:1,2',
     ];
 
     protected $message = [];

app/admin/validate/sys_manage/RoleValidate.php

@@ -8,9 +8,9 @@ class RoleValidate extends Validate
 {
     protected $rule = [
         'role_id'       => 'require',
-        'role_status'   => 'require|in:ACTIVED,DISABLED',
-        'role_category' => 'require|in:NORMAL,OTHER',
-        'role_name'     => 'chsDash'
+        'role_status|状态'   => 'require|in:ACTIVED,DISABLED',
+        'role_category|分类' => 'require|in:NORMAL,OTHER',
+        'role_name|名称'     => 'chsDash'
     ];
 
     protected $message = [];

app/admin/validate/sys_manage/SupplierValidate.php

@@ -9,9 +9,9 @@ class SupplierValidate extends Validate
     protected $rule = [
         'supplier_id' => 'require|integer',
         'join_supplier_category_id' => 'integer',
-        'supplier_status' => 'require|in:ACTIVED,DISABLED',
-        'supplier_category' => 'max:32',
-        'supplier_name' => 'require|max:64',
+        'supplier_status|状态' => 'require|in:ACTIVED,DISABLED',
+        'supplier_category|分类' => 'max:32',
+        'supplier_name|名称' => 'require|max:64',
         'supplier_contact_json' => 'isJson',
         'supplier_config_json' => 'isJson',
         'supplier_extend_json' => 'isJson'

app/admin/validate/sys_manage/TaskValidate.php

@@ -8,21 +8,21 @@ class TaskValidate extends Validate
 {
     protected $rule = [
         'task_id' => 'require|integer',
-        'join_task_apply_user_id' => 'require|regex:/^[0-9a-zA-Z]+$/',
-        'join_task_assign_user_id' => 'regex:/^[0-9a-zA-Z]+$/',
-        'task_status' => 'require|in:INIT,PENDING,RESERVING,PROCESSING,DONE,CONFIRM',
-        'task_classify' => 'in:订单工单,工作工单,服务工单,维保工单',
-        'task_category' => 'in:安装,维修,其他',
-        'join_task_order_id' => 'regex:/^[0-9a-zA-Z]+$/',
-        'join_task_order_json' => 'isJson',
-        'join_task_appointment_id' => 'regex:/^[0-9a-zA-Z]+$/',
-        'join_task_appointment_json' => 'isJson',
-        'task_assign_datetimes' => 'date',
-        'task_accept_datetimes' => 'date',
-        'task_reserv_datetimes' => 'date',
-        'task_name' => 'require|max:64',
-        'task_config_json' => 'isJson',
-        'task_notify_json' => 'isJson',
+        'join_task_apply_user_id|申请用户' => 'require|regex:/^[0-9a-zA-Z]+$/',
+        'join_task_assign_user_id|处理用户' => 'regex:/^[0-9a-zA-Z]+$/',
+        'task_status|工单状态' => 'require|in:INIT,PENDING,RESERVING,PROCESSING,DONE,CONFIRM',
+        'task_classify|归类' => 'in:订单工单,工作工单,服务工单,维保工单',
+        'task_category|分类' => 'in:安装,维修,其他',
+        'join_task_order_id|订单' => 'regex:/^[0-9a-zA-Z]+$/',
+        'join_task_order_json|订单信息' => 'isJson',
+        'join_task_appointment_id|预约ID' => 'regex:/^[0-9a-zA-Z]+$/',
+        'join_task_appointment_json|预约信息' => 'isJson',
+        'task_assign_datetimes|分配时间' => 'date',
+        'task_accept_datetimes|受理时间' => 'date',
+        'task_reserv_datetimes|预约时间' => 'date',
+        'task_name|名称' => 'require|max:64',
+        'task_config_json|配置信息' => 'isJson',
+        'task_notify_json|回调信息' => 'isJson',
         'task_extend_json' => 'isJson',
         'task_process_status' => 'in:NONE,START,PAUSE,COMPLETE'
     ];

app/admin/validate/sys_manage/UserValidate.php

@@ -9,12 +9,12 @@ class UserValidate extends Validate
     protected $rule = [
         'join_user_role_id'     => 'integer',
         'join_user_dept_id'     => 'integer',
-        'user_status'           => 'require|in:ACTIVED,DISABLED,PENDING',
-        'user_category'         => 'require|in:EMPLOY,OTHER',
-        'user_name'             => 'require|chsDash',
-        'user_login_name'       => 'require|alphaDash',
-        'user_login_pass'       => 'require',
-        'user_mobile'           => 'mobile'
+        'user_status|状态'           => 'require|in:ACTIVED,DISABLED,PENDING',
+        'user_category|分类'         => 'require|in:EMPLOY,OTHER',
+        'user_name|姓名'             => 'require|chsDash',
+        'user_login_name|登录名'       => 'require|alphaDash',
+        'user_login_pass|登录密码'       => 'require',
+        'user_mobile|联系电话'           => 'mobile'
     ];
 
     protected $message = [];