diff --git a/app-ht/config/main.php b/app-ht/config/main.php index 6a1de9a..4605928 100644 --- a/app-ht/config/main.php +++ b/app-ht/config/main.php @@ -19,7 +19,12 @@ $config = [ 'runtimePath' => Yii::getAlias('@rootRuntime').'/app-ht/', 'bootstrap' => ['log'], 'modules' => [ - + 'order' => [ + 'class' => 'app\ht\modules\order\Module', + ], + 'maintainer' => [ + 'class' => 'app\ht\modules\maintainer\Module', + ], 'system'=>[ 'class' => 'app\ht\modules\system\Module', ], diff --git a/app-ht/config/params.php b/app-ht/config/params.php index 317a012..8ca189d 100644 --- a/app-ht/config/params.php +++ b/app-ht/config/params.php @@ -1,5 +1,4 @@ 'v0.0.1 build 1', + 'VERSION' => 'v0.0.1 build 2', ]; \ No newline at end of file diff --git a/app-ht/controllers/SiteController.php b/app-ht/controllers/SiteController.php index 02f0dce..9d36817 100644 --- a/app-ht/controllers/SiteController.php +++ b/app-ht/controllers/SiteController.php @@ -183,104 +183,6 @@ class SiteController extends BaseController { $maxSize = 1048576; // 1024 * 1024 = 1MB - //定义允许上传的文件扩展名 - $extArr = array('gif', 'jpg', 'jpeg', 'png', 'bmp'); - - //PHP上传失败 - if (!empty($_FILES['imgFile']['error'])) { - switch ($_FILES['imgFile']['error']) { - case '1': - $error = '图片超过系统允许的大小。'; // php.ini允许的大小(默认2MB) - break; - case '2': - $error = '图片超过表单允许的大小。'; - break; - case '3': - $error = '图片只有部分被上传。'; - break; - case '4': - $error = '请选择图片。'; - break; - case '6': - $error = '找不到临时目录。'; - break; - case '7': - $error = '写文件到硬盘出错。'; - break; - case '8': - $error = 'File upload stopped by extension。'; - break; - case '999': - default: - $error = '未知错误。'; - } - $this->editorAlert($error); - } - - // 确保临时文件夹是否已经创建 - //if (!file_exists($savePath)) { - // mkdir($savePath, 0777, true); - //} - - //有上传文件时 - if (empty($_FILES) === false) { - //原文件名 - $fileName = $_FILES['imgFile']['name']; - //服务器上临时文件名 - $tmpName = $_FILES['imgFile']['tmp_name']; - //文件大小 - $fileSize = $_FILES['imgFile']['size']; - //检查文件名 - if (!$fileName) { - $this->editorAlert("请选择文件。"); - } - - /* - //检查目录 - if (@is_dir($savePath) === false) { - $this->editorAlert("上传目录不存在。"); - } - //检查目录写权限 - if (@is_writable($savePath) === false) { - $this->editorAlert("上传目录没有写权限。"); - } - //检查是否已上传 - if (@is_uploaded_file($tmpName) === false) { - $this->editorAlert("上传失败。"); - } - */ - - //检查文件大小 - if ($fileSize > $maxSize) { - $this->editorAlert("图片大小不能超过" . Utils::formatBytes($maxSize)); - } - - //获得文件扩展名 -// $tempArr = explode(".", $fileName); -// $fileExt = array_pop($tempArr); -// $fileExt = trim($fileExt); -// $fileExt = strtolower($fileExt); - $tmp = explode('.', $fileName); - $fileExt = end($tmp); - - //检查扩展名 - if (in_array($fileExt, $extArr) === false) { - $this->editorAlert("上传文件扩展名是不允许的扩展名。\n只允许" . implode(",", $extArr) . "格式。"); - } - - //新文件名 - $newFileName = date("YmdHis") . '_' . rand(10000, 99999) . '.' . $fileExt; - - $savePath = ImageManager::getTempImgPath($fileExt); - //移动文件 - $filePath = $savePath . '/' . $newFileName; - ImageManager::add($tmpName, $filePath); - - $fileUrl = ImageManager::getUrl($filePath); - - echo json_encode(array('error' => 0, 'url' => $fileUrl)); - exit; - } } /** diff --git a/app-ht/modules/maintainer/BaseModule.php b/app-ht/modules/maintainer/BaseModule.php new file mode 100755 index 0000000..ac737be --- /dev/null +++ b/app-ht/modules/maintainer/BaseModule.php @@ -0,0 +1,17 @@ + + */ +class Module extends BaseModule +{ + public function init() + { + parent::init(); + + //$this->params['perm'] = require(__DIR__ . '/config/perm.php'); + } +} \ No newline at end of file diff --git a/app-ht/modules/maintainer/controllers/UserController.php b/app-ht/modules/maintainer/controllers/UserController.php new file mode 100644 index 0000000..5cdef50 --- /dev/null +++ b/app-ht/modules/maintainer/controllers/UserController.php @@ -0,0 +1,123 @@ +dataList(1); + /** + * 渲染模板 + */ + return $this->render('index', $params); + } + + /** + * 查询数据列表 + */ + protected function dataList($type = '') + { + $request = Yii::$app->request; + $createTime = $request->get('createTime'); + $endTime = $request->get('endTime'); + $mobile = $request->get('mobile'); + $name = $request->get('name'); + + $gets = [ + 'createTime' => $createTime, + 'endTime' => $endTime, + 'mobile' => $mobile, + 'name' => $name, + ]; + + $where = ['and']; + if ($createTime) { + $createTime = strtotime($createTime); + $where[] = ['>=', 'user.created_at', $createTime]; + } + if ($endTime) { + $endTime = strtotime($endTime) + 86400; + $where[] = ['<=', 'user.created_at', $endTime]; + } + if ($mobile) { + $where[] = ['like', 'user.mobile', $mobile]; + } + if ($name) { + $where[] = ['like', 'user.name', $name]; + } + + + if ($type == 0) { + $pageList = UserRepository::getAdminUserList(0, 0, $where); + $pages = null; + } else { + $pageSize = 20; + $pages = new Pagination(['totalCount' => UserRepository::getAdminUserListCount($where), 'pageSize' => $pageSize]); + $pageList = UserRepository::getAdminUserList($pages->offset, $pages->limit, $where); + } + + /** + * 数据整理 + */ + return [ + 'listdata' => $pageList, + 'pages' => $pages, + 'gets' => $gets + ]; + } + /** + * 导出订单数据 + * @return string + */ + public function actionExportDa() + { + $data = $this->dataList(0); + + return $this->renderPartial("exportDa", $data); + } + + /** + * @return string + */ + public function actionInfo() + { + $id = $this->request->get('id'); + + $userModel = UserRepository::findOne(['id' => $id]); + if (empty($userModel)) { + $params = []; + return $this->render('info', $params); + } + + $user = [ + 'id' => $userModel->id, + 'uuid' => $userModel->uuid, + 'mobile' => $userModel->mobile, + 'username' => $userModel->user_name, + 'name' => $userModel->name, + 'licensePic' => ImageManager::getUrl($userModel->license_pic), + 'licensePicMin' => ImageManager::getUrl($userModel->license_pic, 'min'), + 'created_at' => $userModel->created_at + ]; + $params['user'] = $user; + + return $this->render('info', $params); + } +} \ No newline at end of file diff --git a/app-ht/modules/maintainer/views/user/exportDa.php b/app-ht/modules/maintainer/views/user/exportDa.php new file mode 100644 index 0000000..09b2bf2 --- /dev/null +++ b/app-ht/modules/maintainer/views/user/exportDa.php @@ -0,0 +1,55 @@ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
ID维修厂名称维修厂电话注册时间
+
+ + \ No newline at end of file diff --git a/app-ht/modules/maintainer/views/user/index.php b/app-ht/modules/maintainer/views/user/index.php new file mode 100644 index 0000000..3dedb0a --- /dev/null +++ b/app-ht/modules/maintainer/views/user/index.php @@ -0,0 +1,123 @@ +title = '维修厂列表'; +$this->params['breadcrumbs'][] = '维修厂管理'; +$this->params['breadcrumbs'][] = $this->title; + +?> + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + +
维修厂名称：维修厂电话：注册时间（起）：注册时间（止）：
+ + ">重    置 + 导出维修厂名单 + +
+
+
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
ID维修厂名称维修厂电话注册时间操作
+ 查看详情 + +
+
+ +

+ 没有找到数据 +

+ +
+ +
+
+ $pages, + ]); ?> +
+
+
+
+ + \ No newline at end of file diff --git a/app-ht/modules/maintainer/views/user/info.php b/app-ht/modules/maintainer/views/user/info.php new file mode 100644 index 0000000..945c0fc --- /dev/null +++ b/app-ht/modules/maintainer/views/user/info.php @@ -0,0 +1,54 @@ +title = '维修厂详情'; +$this->params['breadcrumbs'][] = '维修厂管理'; +$this->params['breadcrumbs'][] = ['label' => '维修厂列表', 'url' => ['/maintainer/user/index']]; +$this->params['breadcrumbs'][] = $this->title; + + +?> + +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
维修厂信息
维修厂ID维修厂名称
维修厂电话注册时间
营业执照
+
+ + +
diff --git a/app-ht/modules/order/BaseModule.php b/app-ht/modules/order/BaseModule.php new file mode 100755 index 0000000..ac737be --- /dev/null +++ b/app-ht/modules/order/BaseModule.php @@ -0,0 +1,17 @@ + + */ +class Module extends BaseModule +{ + public function init() + { + parent::init(); + + //$this->params['perm'] = require(__DIR__ . '/config/perm.php'); + } +} \ No newline at end of file diff --git a/app-ht/modules/order/config/perm.php b/app-ht/modules/order/config/perm.php new file mode 100644 index 0000000..172fef6 --- /dev/null +++ b/app-ht/modules/order/config/perm.php @@ -0,0 +1,17 @@ + '维修单管理', + 'items' => [ + 'order' => [ + 'label' => '订单管理', + 'items' => [ + 65 => '订单列表', + 66 => '订单详情', + ], + 'path' => 'order/repair-order/*' + ], + + ] + +]; diff --git a/app-ht/modules/order/controllers/RepairOrderController.php b/app-ht/modules/order/controllers/RepairOrderController.php new file mode 100644 index 0000000..e5b1dab --- /dev/null +++ b/app-ht/modules/order/controllers/RepairOrderController.php @@ -0,0 +1,178 @@ +dataList(1); + /** + * 渲染模板 + */ + return $this->render('index', $params); + } + + /** + * 查询数据列表 + */ + protected function dataList($type = '') + { + $request = Yii::$app->request; + $createTime = $request->get('createTime'); + $endTime = $request->get('endTime'); + $contactMobile = $request->get('contactMobile'); + $customer = $request->get('customer'); + $carNo = $request->get('carNo'); + $maintainerMobile = $request->get('maintainerMobile'); + $status = $request->get('status'); + + $gets = [ + 'createTime' => $createTime, + 'endTime' => $endTime, + 'contactMobile' => $contactMobile, + 'customer' => $customer, + 'carNo' => $carNo, + 'maintainerMobile' => $maintainerMobile, + 'status' => $status, + 'statusList' => RepairOrderStatus::getLabels() + ]; + + $where = ['and']; + if ($createTime) { + $createTime = strtotime($createTime); + $where[] = ['>=', 'ord.created_at', $createTime]; + } + if ($endTime) { + $endTime = strtotime($endTime) + 86400; + $where[] = ['<=', 'ord.created_at', $endTime]; + } + if ($contactMobile) { + $where[] = ['like', 'ord.contact_mobile', $contactMobile]; + } + if ($customer) { + $where[] = ['like', 'ord.customer', $customer]; + } + if ($carNo) { + $where[] = ['like', 'ord.car_no', $carNo]; + } + if ($maintainerMobile) { + $where[] = ['like', 'u.mobile', $maintainerMobile]; + } + if ($status) { + $where[] = ['=', 'ord.status', $status]; + } + if ($type == 0) { + $pageList = RepairOrderRepository::getAdminOrderList(0, 0, $where); + $pages = null; + } else { + $pageSize = 20; + $pages = new Pagination(['totalCount' => RepairOrderRepository::getAdminOrderListCount($where), 'pageSize' => $pageSize]); + $pageList = RepairOrderRepository::getAdminOrderList($pages->offset, $pages->limit, $where); + } + + /** + * 数据整理 + */ + return [ + 'listdata' => $pageList, + 'pages' => $pages, + 'gets' => $gets + ]; + } + /** + * 导出订单数据 + * @return string + */ + public function actionExportDa() + { + $data = $this->dataList(0); + + return $this->renderPartial("exportDa", $data); + } + + /** + * @return string + */ + public function actionInfo() + { + $id = $this->request->get('id'); + + $orderModel = RepairOrderRepository::findOne(['id' => $id]); + if (empty($orderModel)) { + $params = []; + return $this->render('info', $params); + } + $orderId = $orderModel->id; + $brokenImageModels = RepairOrderRepository::findOrderImageAll(['repair_order_id' => $orderId]); + $brokenImages = []; + + foreach($brokenImageModels as $k => $v) { + $brokenImages[] = ImageManager::getUrl($v->image_path); + } + $totalPrice = $orderModel->order_price; + $rPlans = RepairOrderRepository::findOrderPlansAll(['repair_order_id' => $orderId]); + $repairPlans = []; + foreach($rPlans as $k => $plan) { + $repairPlans[] = ['plan' => $plan['repair_plan'] ,'price' => $plan['price']]; + } + $fImages = RepairOrderRepository::findOrderFinishImageAll(['repair_order_id' => $orderId]); + $finishImages = []; + foreach($fImages as $k => $image) { + $finishImages[] = ImageManager::getUrl($image['image_path']);; + } + $hasComment = false; + $comments = []; + $rateModel = RepairOrderRateRepository::findOne(['repair_order_id' => $orderId]); + if ($rateModel) { + $hasComment = true; + $comments = ['starTxt' => RepairOrderRate::starLabel($rateModel->star_count), 'comment' => $rateModel->comment]; + } + $user = UserRepository::findOne(['id' => $orderModel->user_id]); + $order = [ + 'id' => $orderId, + 'uuid' => $orderModel->uuid, + 'userId' => $orderModel->user_id, + 'userName' => $user->name, + 'userMobile' => $user->mobile, + 'carNo' => $orderModel->car_no, + 'carModel' => $orderModel->car_model, + 'customer' => $orderModel->customer, + 'contact_mobile'=> $orderModel->contact_mobile, + 'preRepair' => $orderModel->predict_fault, + 'prePrice' => $orderModel->predict_price.'元', + 'preFinishDate' => $orderModel->predict_finish_time? date('Y-m-d H:00', $orderModel->predict_finish_time):'暂无', + 'orderDateTime' => date('Y-m-d H:00', $orderModel->created_at), + 'finishDateTime'=> $orderModel->finish_at? date('Y-m-d H:00', $orderModel->finish_at):'暂无', + 'status' => RepairOrderStatus::getLabels($orderModel->status), + 'hasComment' => $hasComment, + 'comments' => $comments, + 'brokenImages' => $brokenImages, + 'repairPlans' => $repairPlans, + 'totalPrice' => $totalPrice, + 'finishImages' => $finishImages + ]; + $params['order'] = $order; + + return $this->render('info', $params); + } +} \ No newline at end of file diff --git a/app-ht/modules/order/views/repair-order/exportDa.php b/app-ht/modules/order/views/repair-order/exportDa.php new file mode 100644 index 0000000..e1a5bdc --- /dev/null +++ b/app-ht/modules/order/views/repair-order/exportDa.php @@ -0,0 +1,113 @@ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
维修单ID车牌号车型号顾客名顾客手机预修故障预修金额预完成维修时间报修时间维修金额订单状态维修厂名维修厂电话顾客星评顾客评论
+ + + + + + + +
+
+ + \ No newline at end of file diff --git a/app-ht/modules/order/views/repair-order/index.php b/app-ht/modules/order/views/repair-order/index.php new file mode 100644 index 0000000..47b4712 --- /dev/null +++ b/app-ht/modules/order/views/repair-order/index.php @@ -0,0 +1,164 @@ +title = '订单列表'; +$this->params['breadcrumbs'][] = '平台订单管理'; +$this->params['breadcrumbs'][] = $this->title; + +?> + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
维修厂手机：下单时间（起）：下单时间（止）：
客户姓名：客户电话：车牌号：
+ + ">重    置 + 导出订单报表 + +
+
+
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
维修单ID车牌号车型号顾客名顾客手机预修信息报修时间维修金额订单状态维修厂名维修厂电话顾客评论操作
"; + } else { + echo "预维故障:未填
"; + } + if ($order['predict_price']) { + echo "预维修金额:".$order['predict_price']."
"; + } else { + echo "预维修金额:未填
"; + } + if ($order['predict_finish_time']) { + echo "预修完成日期:". date('Y年m月d日 H时',$order['predict_finish_time'])."
"; + } else { + echo "预修完成日期:未填
"; + } + ?>		"; + } else { + echo "车主暂未评价"; + } + if ($order['comment']) { + echo '内容：'.$order['comment']; + } + ?> + 查看详情 + +
+
+ +

+ 没有找到数据 +

+ +
+ +
+
+ $pages, + ]); ?> +
+
+
+
+ + \ No newline at end of file diff --git a/app-ht/modules/order/views/repair-order/info.php b/app-ht/modules/order/views/repair-order/info.php new file mode 100644 index 0000000..30e5bab --- /dev/null +++ b/app-ht/modules/order/views/repair-order/info.php @@ -0,0 +1,154 @@ +title = '维修单详情'; +$this->params['breadcrumbs'][] = '维修单管理'; +$this->params['breadcrumbs'][] = ['label' => '维修单列表', 'url' => ['/order/repair-order/index']]; +$this->params['breadcrumbs'][] = $this->title; + + +?> + +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
订单信息
维修单ID订单状态下单时间维修完成时间 +
车牌号车型车主名称车主电话
预修故障 预修金额 预修完成时间
维修厂名 维修厂电话 车主评星车主评论内容
车损图片 + "; + foreach ($order['brokenImages'] as $k => $image) { + echo "
    • "; + } + echo ""; + } else { + echo "暂无图片"; + } + ?> +
    +
    + + +
    + + + + + + + + + + + + + +
    维修故障明细
    维修故障维修完成图片
    + + + + + + + + + + + +
    故障金额
    元
    维修总金额元
    + +

    还未维修完，没有故障明细

    + +     		+ "; + foreach ($order['finishImages'] as $k => $image) { + echo "
    • "; + } + echo ""; + } else { + echo "暂无图片"; + } + ?> +
    +
    + + + +
    + + diff --git a/app-ht/views/dashboard/index.php b/app-ht/views/dashboard/index.php index 3f4edc0..8b12936 100644 --- a/app-ht/views/dashboard/index.php +++ b/app-ht/views/dashboard/index.php @@ -31,14 +31,7 @@ $this->params['breadcrumbs'][] = '欢迎';

    欢迎 user->identity; $username = $user->username; - if ($user->is_manufacture) { - $manufacturer = ManufacturerRepository::findOne(['sys_user_id' => $user->id]); - if ($manufacturer) { - $username = $manufacturer->name; - } - - } echo $username; - ?> 使用OTA管理后台

    + ?> 使用GK车管家管理后台 diff --git a/app-ht/views/layouts/_main-header.php b/app-ht/views/layouts/_main-header.php index 2a00449..615823f 100644 --- a/app-ht/views/layouts/_main-header.php +++ b/app-ht/views/layouts/_main-header.php @@ -6,7 +6,7 @@ use yii\helpers\Url;