diff --git a/frontend/controllers/FixCarController.php b/frontend/controllers/FixCarController.php index c85330f..6630309 100644 --- a/frontend/controllers/FixCarController.php +++ b/frontend/controllers/FixCarController.php @@ -70,7 +70,7 @@ class FixCarController extends BaseController if($car_phone != '') { $query = $query->andWhere('phone like "'.$car_phone.'"'); } - $items = $query->all(); + $items = $query->asArray()->all(); return $this->render('my-search-result',[ 'items' => $items @@ -105,6 +105,8 @@ class FixCarController extends BaseController $data['rows'] = []; foreach($items as $item) { $row = $item->toArray(); + $row['show_name'] = $item->user->getShowName(); + $row['status_txt'] = $item->getStatus(); $data['rows'][] = $row; } return $data; @@ -114,7 +116,6 @@ class FixCarController extends BaseController return $this->render('my-list-finish'); } - public function actionMyListFinishJson() { Yii::$app->response->format = Response::FORMAT_JSON; @@ -140,6 +141,8 @@ class FixCarController extends BaseController $data['rows'] = []; foreach($items as $item) { $row = $item->toArray(); + $row['show_name'] = $item->user->getShowName(); + $row['status_txt'] = $item->getStatus(); $data['rows'][] = $row; } return $data; @@ -211,8 +214,11 @@ class FixCarController extends BaseController //礼品 $gift_items = CarGiftT::find() + ->with('user') + ->with('gift') ->where('car_id='.$car_info->id) ->orderBy('strategy_id DESC') + ->asArray() ->all(); $direction_items = DirectionT::find()->all(); @@ -237,6 +243,7 @@ class FixCarController extends BaseController $log_items = CarLogT::find() ->where('car_id='.$info->car_id.' and type=2') ->orderBy('id DESC') + ->asArray() ->all(); return $this->render('my-list-edit',[ @@ -537,7 +544,7 @@ class FixCarController extends BaseController } $fix_id = $request->get('fix_id'); $fix_info = FixCarT::findOne(['id'=>$fix_id]); - return $this->renderPartial('add-item',[ + return $this->render('add-item',[ 'fix_info' => $fix_info ]); } @@ -553,30 +560,32 @@ class FixCarController extends BaseController $big_type_id = $request->get('big_type_id'); $type1_items = FixItemT::find() ->where('fix_id='.$fix_id.' and big_type_id='.$big_type_id.' and small_type_id=1') + ->asArray() ->all(); $type2_items = FixItemT::find() ->where('fix_id='.$fix_id.' and big_type_id='.$big_type_id.' and small_type_id=2') + ->asArray() ->all(); $type3_items = FixItemT::find() ->where('fix_id='.$fix_id.' and big_type_id='.$big_type_id.' and small_type_id=3') + ->asArray() ->all(); $type4_items = FixItemT::find() ->where('fix_id='.$fix_id.' and big_type_id='.$big_type_id.' and small_type_id=4') + ->asArray() ->all(); $type5_items = FixItemT::find() ->where('fix_id='.$fix_id.' and big_type_id='.$big_type_id.' and small_type_id=5') + ->asArray() ->all(); - $html = $this->renderPartial('ajax-item-list',[ - 'type1_items' => $type1_items, - 'type2_items' => $type2_items, - 'type3_items' => $type3_items, - 'type4_items' => $type4_items, - 'type5_items' => $type5_items - ]); - $result['success'] = true; - $result['msg'] = '读取成功'; - $result['html'] = $html; - return $result; + + return MyLib::ok3([ + 'type1' => ['更换清单', $type1_items], + 'type2' => ['维修清单', $type2_items], + 'type3' => ['待定清单', $type3_items], + 'type4' => ['配件清单', $type4_items], + 'type5' => ['工时清单', $type5_items] + ], '操作成功'); } public function actionStep1List() @@ -604,15 +613,18 @@ class FixCarController extends BaseController $data['rows'] = []; foreach($items as $item) { $row = $item->toArray(); + $row['brand'] = $item->brand?$item->brand->name:''; + $row['series'] = $item->series?$item->series->name:''; + $row['show_name'] = $item->user->getShowName(); + $row['status_txt'] = $item->getStatus(); $data['rows'][] = $row; } return $data; } - public function actionStep1ListFinish() { - return $this->render('step1-list'); + return $this->render('step1-list-finish'); } public function actionStep1ListFinishJson() @@ -635,6 +647,7 @@ class FixCarController extends BaseController $data['rows'] = []; foreach($items as $item) { $row = $item->toArray(); + $row['user'] = $item->getUser()->asArray()->one(); $data['rows'][] = $row; } return $data; @@ -665,6 +678,12 @@ class FixCarController extends BaseController public function actionStep2List() { + return $this->render('step2-list'); + } + + public function actionStep2ListJson() + { + Yii::$app->response->format = Response::FORMAT_JSON; $request = Yii::$app->request; $car_no = $request->get('car_no'); @@ -673,13 +692,23 @@ class FixCarController extends BaseController if($car_no != '') { $query = $query->andWhere(['like','car_no',$car_no]); } + + $total = $query->count(); $query = $query->orderBy('status ASC'); $items = $query->all(); - return $this->render('step2-list',[ - 'items' => $items, - 'car_no' => $car_no - ]); + $data = []; + $data['total'] = $total; + $data['rows'] = []; + foreach($items as $item) { + $row = $item->toArray(); + $row['brand'] = $item->brand?$item->brand->name:''; + $row['series'] = $item->series?$item->series->name:''; + $row['show_name'] = $item->user->getShowName(); + $row['status_txt'] = $item->getStatus(); + $data['rows'][] = $row; + } + return $data; } public function actionStep2ListFinish() @@ -703,6 +732,12 @@ class FixCarController extends BaseController public function actionStep3List() { + return $this->render('step3-list'); + } + + public function actionStep3ListJson() + { + Yii::$app->response->format = Response::FORMAT_JSON; $request = Yii::$app->request; $car_no = $request->get('car_no'); @@ -711,17 +746,33 @@ class FixCarController extends BaseController if($car_no != '') { $query = $query->andWhere(['like','car_no',$car_no]); } + + $total = $query->count(); $query = $query->orderBy('status ASC,updated_at DESC'); $items = $query->all(); - return $this->render('step3-list',[ - 'items' => $items, - 'car_no' => $car_no - ]); + $data = []; + $data['total'] = $total; + $data['rows'] = []; + foreach($items as $item) { + $row = $item->toArray(); + $row['brand'] = $item->brand?$item->brand->name:''; + $row['series'] = $item->series?$item->series->name:''; + $row['show_name'] = $item->user->getShowName(); + $row['status_txt'] = $item->getStatus(); + $data['rows'][] = $row; + } + return $data; } public function actionStep4List() { + return $this->render('step4-list'); + } + + public function actionStep4ListJson() + { + Yii::$app->response->format = Response::FORMAT_JSON; $request = Yii::$app->request; $car_no = $request->get('car_no'); @@ -730,6 +781,7 @@ class FixCarController extends BaseController if($car_no != '') { $query = $query->andWhere(['like','car_no',$car_no]); } + $total = $query->count(); $query = $query->orderBy('status ASC'); $items = $query->all(); @@ -741,10 +793,18 @@ class FixCarController extends BaseController } } - return $this->render('step4-list',[ - 'items' => $lists, - 'car_no' => $car_no - ]); + $data = []; + $data['total'] = $total; + $data['rows'] = []; + foreach($lists as $item) { + $row = $item->toArray(); + $row['brand'] = $item->brand->name; + $row['series'] = $item->series->name; + $row['show_name'] = $item->user->getShowName(); + $row['status_txt'] = $item->getStatus(); + $data['rows'][] = $row; + } + return $data; } public function actionStep5List() diff --git a/frontend/views/fix-car/add-item.php b/frontend/views/fix-car/add-item.php index 305360b..f4f617b 100644 --- a/frontend/views/fix-car/add-item.php +++ b/frontend/views/fix-car/add-item.php @@ -1,94 +1,98 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
名称： -
- + +beginBlock('header_css'); ?> +endBlock(); ?> + +
+
+
+
维修明细 - 新增
+
+
+
+
+ + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+
+
-
价格： -
- -
-
数量： -
- -
-
分类： -
- -
-
大类： -
- -
-
小类： -
- -
-
备注： -
- -
-
- -
- - - \ No newline at end of file + } + +endBlock('footer_js'); ?> \ No newline at end of file diff --git a/frontend/views/fix-car/ajax-item-list.php b/frontend/views/fix-car/ajax-item-list.php index ab853b4..ecad3ee 100644 --- a/frontend/views/fix-car/ajax-item-list.php +++ b/frontend/views/fix-car/ajax-item-list.php @@ -1,187 +1,177 @@ - - 0) { - ?> - - - - - - - - - - - - - - - - $item) { - ?> - - - - - - - - - - - - - +beginBlock('header_css'); ?> +endBlock(); ?> + +
+
+
+
更换清单
+
+
+
+
+
更换清单
序号名称价格数量合计结算方式实收分类维修人备注
name?>price?>元count?>total?>元type?>fix_remark?>
+ + + + + + + + + + + + + + +
ID名称价格数量合计结算方式实收分类维修人备注
+ + + + +
+
+
维修清单
+
+
+
+
+ + + + + + + + + + + + + + + +
ID名称价格数量合计结算方式实收分类维修人备注
+
+
+
+
+
+
+
待定清单
+
+
+
+
+ + + + + + + + + + + + + + + +
ID名称价格数量合计结算方式实收分类维修人备注
+
+
+
+
+
+
+
配件清单
+
+
+
+
+ + + + + + + + + + + + + + + +
ID名称价格数量合计结算方式实收分类维修人备注
+
+
+
+
+
+
+
工时清单
+
+
+
+
+ + + + + + + + + + + + + + + +
ID名称价格数量合计结算方式实收分类维修人备注
+
+
+
+
+ + +beginBlock('footer_js'); ?> + +endBlock('footer_js'); ?> \ No newline at end of file diff --git a/frontend/views/fix-car/my-list-edit.php b/frontend/views/fix-car/my-list-edit.php index f5d183a..ead2187 100644 --- a/frontend/views/fix-car/my-list-edit.php +++ b/frontend/views/fix-car/my-list-edit.php @@ -2,8 +2,16 @@ use \common\libs\MyLib; ?> beginBlock('header_css'); ?> - + endBlock(); ?>
@@ -23,7 +31,7 @@ use \common\libs\MyLib;
- +
@@ -38,7 +46,7 @@ use \common\libs\MyLib;
- + - - - - - - - - - - - - - - - $item) { - ?> - - - - - - - - - - -
排序车牌号车主电话发动机号车架号操作
car_no?>car_man?>phone?>engine_no?>car_frame_no?> - [添加修车记录] -
+endBlock(); ?> \ No newline at end of file diff --git a/frontend/views/fix-car/my-search.php b/frontend/views/fix-car/my-search.php index 141b845..76821b7 100644 --- a/frontend/views/fix-car/my-search.php +++ b/frontend/views/fix-car/my-search.php @@ -7,46 +7,47 @@ use \common\libs\MyLib;
-
销售提单 - 新增
+
维修提单 - 新增
-
-
-
- + +
+ +
-
- +
+
+ +
-
- +
+
+ +
-
-
- +
+ +
-
- +
+
+ +
-
-
- -
-
- +
+
+
+ +
diff --git a/frontend/views/fix-car/step1-list.php b/frontend/views/fix-car/step1-list.php index 66eb465..b2a0f0e 100644 --- a/frontend/views/fix-car/step1-list.php +++ b/frontend/views/fix-car/step1-list.php @@ -39,7 +39,7 @@ use \common\libs\MyLib; 事故类型 责任 提单者 - 状态 + 状态 操作 diff --git a/frontend/views/fix-car/step2-list.php b/frontend/views/fix-car/step2-list.php index cddadd1..0f83018 100644 --- a/frontend/views/fix-car/step2-list.php +++ b/frontend/views/fix-car/step2-list.php @@ -1,69 +1,92 @@ - - - +beginBlock('header_css'); ?> + +endBlock(); ?> + +
+
+
+
司机接车
+
+ + 刷新 + +
+
+
+
+
+ + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + +
ID联系人车牌号品牌车型地址代步车接车日期事故类型责任提单者状态操作
+
+
+
+
+
+ +beginBlock('footer_js'); ?> + + + - - - - - - -
- 车牌号： - -
- - - - - - - - - - - - - - - - $item) { - ?> - - - - - - - - - - - - - - - -
排序联系人车牌号品牌车型地址代步车事故类型责任提单者状态操作
link_man?>car_no?>brand?$item->brand->name:''?>series?$item->series->name:''?>address?>accident_type?>responsibility?>user->getShowName()?>getStatus()?> - [详情] -
+endBlock(); ?> \ No newline at end of file diff --git a/frontend/views/fix-car/step3-list.php b/frontend/views/fix-car/step3-list.php index 0595f35..c6ab3ba 100644 --- a/frontend/views/fix-car/step3-list.php +++ b/frontend/views/fix-car/step3-list.php @@ -1,69 +1,92 @@ - - - +beginBlock('header_css'); ?> + +endBlock(); ?> + +
+
+
+
前台派工
+
+ + 刷新 + +
+
+
+
+
+ + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + +
ID联系人车牌号品牌车型地址代步车接车日期事故类型责任提单者状态操作
+
+
+
+
+
+ +beginBlock('footer_js'); ?> + + + - - - - - - -
- 车牌号： - -
- - - - - - - - - - - - - - - - $item) { - ?> - - - - - - - - - - - - - - - -
排序联系人车牌号品牌车型地址代步车事故类型责任提单者状态操作
link_man?>car_no?>brand?$item->brand->name:''?>series?$item->series->name:''?>address?>accident_type?>responsibility?>user->getShowName()?>getStatus()?> - [详情] -
+endBlock(); ?> \ No newline at end of file diff --git a/frontend/views/fix-car/step4-list.php b/frontend/views/fix-car/step4-list.php index 6dc0fa3..59dfd13 100644 --- a/frontend/views/fix-car/step4-list.php +++ b/frontend/views/fix-car/step4-list.php @@ -1,69 +1,92 @@ - - - +beginBlock('header_css'); ?> + +endBlock(); ?> + +
+
+
+
查勘定损
+
+ + 刷新 + +
+
+
+
+
+ + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + +
ID联系人车牌号品牌车型地址代步车接车日期事故类型责任提单者状态操作
+
+
+
+
+
+ +beginBlock('footer_js'); ?> + + + - - - - - - -
- 车牌号： - -
- - - - - - - - - - - - - - - - $item) { - ?> - - - - - - - - - - - - - - - -
排序联系人车牌号品牌车型地址代步车事故类型责任提单者状态操作
link_man?>car_no?>brand?$item->brand->name:''?>series?$item->series->name:''?>address?>accident_type?>responsibility?>user->getShowName()?>getStatus()?> - [详情] -
+endBlock(); ?> \ No newline at end of file