test

application/em/controller/Useage.php

@@ -151,7 +151,12 @@ class Useage extends Base
         //数据验证
         $validate = new UseageGeneralInfoValidate();
         //根据计量模式 验证去表单数据
-        if(!$validate->scene('s1')->check($data)){
+
+        $sence = 's1';
+        if($data['pricing_type'] == 2){
+            $sence = 's2';
+        }
+        if(!$validate->scene($sence)->check($data)){
             return json(['status'=>0,'message'=>$validate->getError()]);
         }
         //获取电表基本信息

application/em/validate/UseageGeneralInfoValidate.php

@@ -26,12 +26,12 @@ class UseageGeneralInfoValidate extends Validate
         'photo_id.require' => '请上传电表照片',
         'staff_id.require' => '请选择抄表员',
         'price' => '单价必填且只能是数字或小数',
-        'amount.require' =>'缴费金额未填写'
+        'amount.require' =>'实缴电费未填写'
     ];
 
     protected $scene = [
         's1' => 'em_id,last_numb,last_date,current_numb,current_date,photo_id,staff_id,price',
-        's2' => 'em_id,last_numb,last_date,current_numb,current_date,photo_id,staff_id,price',
+        's2' => 'em_id,last_numb,last_date,current_numb,current_date,photo_id,staff_id,price,amount',
     ];
 
     protected  function checkDate($value,$rule,$data=[]){