|
@@ -30,6 +30,7 @@ class PaymentReceiptService extends Service
|
|
|
$model->type = $data['type'];
|
|
$model->type = $data['type'];
|
|
|
$model->amount = $data['amount'] ?? 0;
|
|
$model->amount = $data['amount'] ?? 0;
|
|
|
$model->mark = $data['mark'] ?? '';
|
|
$model->mark = $data['mark'] ?? '';
|
|
|
|
|
+ $model->payment_receipt_date = $data['payment_receipt_date'] ?? 0;
|
|
|
$model->save();
|
|
$model->save();
|
|
|
|
|
|
|
|
$time = time();
|
|
$time = time();
|
|
@@ -88,6 +89,7 @@ class PaymentReceiptService extends Service
|
|
|
$model->crt_id = $user['id'];
|
|
$model->crt_id = $user['id'];
|
|
|
$model->depart_id = $data['depart_id'];
|
|
$model->depart_id = $data['depart_id'];
|
|
|
$model->top_depart_id = $data['top_depart_id'];
|
|
$model->top_depart_id = $data['top_depart_id'];
|
|
|
|
|
+ $model->payment_receipt_date = $data['payment_receipt_date'] ?? 0;
|
|
|
$model->save();
|
|
$model->save();
|
|
|
|
|
|
|
|
$time = time();
|
|
$time = time();
|
|
@@ -164,6 +166,7 @@ class PaymentReceiptService extends Service
|
|
|
$customer['type_title'] = PaymentReceipt::$model_type[$customer['type']] ?? "";
|
|
$customer['type_title'] = PaymentReceipt::$model_type[$customer['type']] ?? "";
|
|
|
$customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('emp_name');
|
|
$customer['crt_name'] = Employee::where('id',$customer['crt_id'])->value('emp_name');
|
|
|
$customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
|
|
$customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
|
|
|
|
|
+ $customer['payment_receipt_date'] = $customer['payment_receipt_date'] ? date("Y-m-d",$customer['payment_receipt_date']): '';
|
|
|
|
|
|
|
|
$file = PaymentReceiptInfo::where('del_time',0)
|
|
$file = PaymentReceiptInfo::where('del_time',0)
|
|
|
->where('payment_receipt_id',$data['id'])
|
|
->where('payment_receipt_id',$data['id'])
|
|
@@ -207,7 +210,7 @@ class PaymentReceiptService extends Service
|
|
|
public function customerList($data,$user){
|
|
public function customerList($data,$user){
|
|
|
$model = PaymentReceipt::Clear($user,$data);
|
|
$model = PaymentReceipt::Clear($user,$data);
|
|
|
$model = $model->where('del_time',0)
|
|
$model = $model->where('del_time',0)
|
|
|
- ->select('type','id','data_type','order_number','data_order_no','amount','account','pay_way','crt_id','crt_time','mark','state')
|
|
|
|
|
|
|
+ ->select('type','id','data_type','order_number','data_order_no','amount','account','pay_way','crt_id','crt_time','mark','state','payment_receipt_date')
|
|
|
->orderby('id', 'desc');
|
|
->orderby('id', 'desc');
|
|
|
|
|
|
|
|
if(isset($data['state'])) $model->where('state', $data['state']);
|
|
if(isset($data['state'])) $model->where('state', $data['state']);
|
|
@@ -223,6 +226,11 @@ class PaymentReceiptService extends Service
|
|
|
$model->where('crt_time','>=',$return[0]);
|
|
$model->where('crt_time','>=',$return[0]);
|
|
|
$model->where('crt_time','<=',$return[1]);
|
|
$model->where('crt_time','<=',$return[1]);
|
|
|
}
|
|
}
|
|
|
|
|
+ if(! empty($data['payment_receipt_date'][0]) && ! empty($data['payment_receipt_date'][1])) {
|
|
|
|
|
+ $return = $this->changeDateToTimeStampAboutRange($data['payment_receipt_date']);
|
|
|
|
|
+ $model->where('payment_receipt_date','>=',$return[0]);
|
|
|
|
|
+ $model->where('payment_receipt_date','<=',$return[1]);
|
|
|
|
|
+ }
|
|
|
if(! empty($data['belong'])){
|
|
if(! empty($data['belong'])){
|
|
|
$id = (new RangeService())->paymentReceiptSearch($data);
|
|
$id = (new RangeService())->paymentReceiptSearch($data);
|
|
|
$model->whereIn('id',$id);
|
|
$model->whereIn('id',$id);
|
|
@@ -243,6 +251,8 @@ class PaymentReceiptService extends Service
|
|
|
$res = $this->checkNumber($data['amount']);
|
|
$res = $this->checkNumber($data['amount']);
|
|
|
if(! $res) return [false, '金额请输入不超过两位小数并且大于0的数值'];
|
|
if(! $res) return [false, '金额请输入不超过两位小数并且大于0的数值'];
|
|
|
|
|
|
|
|
|
|
+ if(! empty($data['payment_receipt_date'])) $data['payment_receipt_date'] = $this->changeDateToDate($data['payment_receipt_date']);
|
|
|
|
|
+
|
|
|
//所属部门 以及 顶级部门
|
|
//所属部门 以及 顶级部门
|
|
|
if(empty($data['depart_id'])) {
|
|
if(empty($data['depart_id'])) {
|
|
|
$data['depart_id'] = $this->getDepart($user);
|
|
$data['depart_id'] = $this->getDepart($user);
|
|
@@ -278,6 +288,7 @@ class PaymentReceiptService extends Service
|
|
|
|
|
|
|
|
foreach ($data['data'] as $key => $value){
|
|
foreach ($data['data'] as $key => $value){
|
|
|
$data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
$data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
|
|
|
+ $data['data'][$key]['payment_receipt_date'] = $value['payment_receipt_date'] ? date('Y-m-d',$value['payment_receipt_date']) : '';
|
|
|
$data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
|
|
$data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
|
|
|
$data['data'][$key]['state_title'] = PaymentReceipt::$name[$value['state']] ?? '';
|
|
$data['data'][$key]['state_title'] = PaymentReceipt::$name[$value['state']] ?? '';
|
|
|
$data['data'][$key]['type_title'] = PaymentReceipt::$model_type[$value['type']] ?? '';
|
|
$data['data'][$key]['type_title'] = PaymentReceipt::$model_type[$value['type']] ?? '';
|
cqpCow