|
|
@@ -291,7 +291,7 @@ class ConstructionService extends Service
|
|
|
$sales = SalesOrder::where('id',$construction['sales_order_id'])->value('order_number');
|
|
|
$construction['sales_order_number'] = $sales;
|
|
|
$customer_title = Customer::where('id',$construction['customer_id'])->value('title');
|
|
|
- $construction['customer_title'] = $customer_title;
|
|
|
+ $construction['customer_title'] = $customer_title ?? "";
|
|
|
$construction['storehouse_title'] = Storehouse::where('id',$construction['storehouse_id'])->value('title');
|
|
|
$emp_title = Employee::where('id',$construction['customer_contact_id'])->value('emp_name');
|
|
|
$construction['customer_contact_title'] = $emp_title;
|
|
|
@@ -433,6 +433,7 @@ class ConstructionService extends Service
|
|
|
if(! empty($data['service_price'])){
|
|
|
$res = $this->checkNumber($data['service_price']);
|
|
|
if(! $res) return [false,'服务价格请输入不超过两位小数并且大于0的数值'];
|
|
|
+ if(! $res) return [false,'服务价格请输入不超过两位小数并且大于0的数值'];
|
|
|
}
|
|
|
if(! empty($data['construction_time'])) $data['construction_time'] = $this->changeDateToDateMin($data['construction_time']);
|
|
|
if(! empty($data['handover_time'])) $data['handover_time'] = $this->changeDateToDateMin($data['handover_time']);
|
cqpCow