|
@@ -34,7 +34,6 @@ use app\common\model\works\ServiceWork;
|
|
|
use app\common\model\works\ServiceWorkAppointmentLog;
|
|
use app\common\model\works\ServiceWorkAppointmentLog;
|
|
|
use app\common\model\works\ServiceWorkDeterminedPrice;
|
|
use app\common\model\works\ServiceWorkDeterminedPrice;
|
|
|
use app\common\model\works\ServiceWorkSpare;
|
|
use app\common\model\works\ServiceWorkSpare;
|
|
|
-use app\common\model\works\ServiceWorkSpareAudit;
|
|
|
|
|
use app\workerapi\logic\ServiceWorkLogLogic;
|
|
use app\workerapi\logic\ServiceWorkLogLogic;
|
|
|
use think\Exception;
|
|
use think\Exception;
|
|
|
use think\facade\Db;
|
|
use think\facade\Db;
|
|
@@ -537,13 +536,9 @@ class ServiceOrderLogic extends BaseLogic
|
|
|
$order_info['spare_total'] = $order_info['service_work']['spare_total']??0;
|
|
$order_info['spare_total'] = $order_info['service_work']['spare_total']??0;
|
|
|
$order_info['spare_parts'] = [];
|
|
$order_info['spare_parts'] = [];
|
|
|
$order_info['self_spare_parts'] = [];
|
|
$order_info['self_spare_parts'] = [];
|
|
|
- $order_info['spare_parts_audit_status'] = 0;//自选配件审核状态
|
|
|
|
|
if($order_info['service_work']['spare_total']){
|
|
if($order_info['service_work']['spare_total']){
|
|
|
$order_info['spare_parts'] = ServiceWorkSpare::getLists($order_info['work_id'], 1);
|
|
$order_info['spare_parts'] = ServiceWorkSpare::getLists($order_info['work_id'], 1);
|
|
|
$order_info['self_spare_parts'] = ServiceWorkSpare::getLists($order_info['work_id'], 2);
|
|
$order_info['self_spare_parts'] = ServiceWorkSpare::getLists($order_info['work_id'], 2);
|
|
|
- if ($order_info['self_spare_parts']) {
|
|
|
|
|
- $order_info['spare_parts_audit_status'] = (int)ServiceWorkSpareAudit::where(['service_work_id' => $order_info['work_id']])->value('status');
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//获取所有的改约记录
|
|
//获取所有的改约记录
|