|
@@ -364,9 +364,9 @@ class Orderback extends \app\BaseController
|
|
|
//新写一个退货接口
|
|
|
public function ExamNew()
|
|
|
{
|
|
|
- $param = $this->request->only(['thNo', 'status', 'remark', 'can_sell_wsm' => '', 'can_sell_num' => 0, 'defective_wsm' => '', 'defective_num' => 0, 'loss_num' => 0], 'post', 'trim');
|
|
|
+ $param = $this->request->only(['thNo', 'status', 'status_remark', 'can_sell_wsm' => '', 'can_sell_num' => 0, 'defective_wsm' => '', 'defective_num' => 0, 'loss_num' => 0], 'post', 'trim');
|
|
|
|
|
|
- $val = Validate::rule(['thNo|退货编码' => 'require', 'status|状态' => 'require|number|in:4,2,1', 'remark|备注' => 'checkRemark:']);
|
|
|
+ $val = Validate::rule(['thNo|退货编码' => 'require', 'status|状态' => 'require|number|in:4,2,1', 'status_remark|备注' => 'checkRemark:']);
|
|
|
|
|
|
$val->extend('checkRemark', function ($val, $rule, $data) {
|
|
|
return $data['status'] == 4 ? true : (empty($val) ? '请填写备注' : true);
|
|
@@ -387,7 +387,7 @@ class Orderback extends \app\BaseController
|
|
|
$update_data = ['status' => $param['status'], 'updatetime' => date('Y-m-d H:i:s')];
|
|
|
|
|
|
//status==4通过,其他值表示驳回
|
|
|
- if ($param['status'] != 4) $update_data['remark'] = $param['remark'];
|
|
|
+ if ($param['status'] != 4) $update_data['status_remark'] = $param['status_remark'];
|
|
|
else {
|
|
|
$update_data['can_sell_wsm'] = $param['can_sell_wsm'];
|
|
|
$update_data['can_sell_num'] = $param['can_sell_num'];
|