-
- 返回
-
+
+
diff --git a/frontend/views/fix-car/step1-list.php b/frontend/views/fix-car/step1-list.php
index 66eb465..f56c1fb 100644
--- a/frontend/views/fix-car/step1-list.php
+++ b/frontend/views/fix-car/step1-list.php
@@ -38,8 +38,8 @@ use \common\libs\MyLib;
接车日期
事故类型
责任
-
提单者
-
状态
+
提单者
+
状态
操作
@@ -85,6 +85,40 @@ use \common\libs\MyLib;
return false;
}
+ function showNameFormatter(value){
+ return value.username + '(' + value.name + ')';
+ }
+
+ function statusFormatter(value){
+ var result = '';
+ switch(+value) {
+ case 1:
+ result = '维修调度';
+ break;
+ case 2:
+ result = '司机接车';
+ break;
+ case 3:
+ result = '前台派工';
+ break;
+ case 4:
+ result = '查勘定损';
+ break;
+ case 5:
+ result = '技工维修';
+ break;
+ case 6:
+ result = '总检';
+ break;
+ case 7:
+ result = '财务结算';
+ break;
+ default:
+ result = '';
+ }
+ return result;
+ }
+
$(function() {
search();
});
diff --git a/frontend/views/fix-car/step2-list.php b/frontend/views/fix-car/step2-list.php
index cddadd1..d602b73 100644
--- a/frontend/views/fix-car/step2-list.php
+++ b/frontend/views/fix-car/step2-list.php
@@ -1,69 +1,122 @@
-
-
-
+beginBlock('header_css'); ?>
+
+endBlock(); ?>
+
+
+
+
+
+
+
+
+
+
+
+ ID
+ 联系人
+ 车牌号
+ 品牌
+ 车型
+ 地址
+ 代步车
+ 接车日期
+ 事故类型
+ 责任
+ 提单者
+ 状态
+ 操作
+
+
+
+
+
+
+
+
+
+beginBlock('footer_js'); ?>
+
+
+
-
-
-
- 排序
- 联系人
- 车牌号
- 品牌
- 车型
- 地址
- 代步车
- 事故类型
- 责任
- 提单者
- 状态
- 操作
-
- $item) {
- ?>
-
- =$index+1?>
- =$item->link_man?>
- =$item->car_no?>
- =$item->brand?$item->brand->name:''?>
- =$item->series?$item->series->name:''?>
- =$item->address?>
-
- =$item->accident_type?>
- =$item->responsibility?>
- =$item->user->getShowName()?>
- =$item->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) {
- ?>
-
- =$index+1?>
- =$item->link_man?>
- =$item->car_no?>
- =$item->brand?$item->brand->name:''?>
- =$item->series?$item->series->name:''?>
- =$item->address?>
-
- =$item->accident_type?>
- =$item->responsibility?>
- =$item->user->getShowName()?>
- =$item->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) {
- ?>
-
- =$index+1?>
- =$item->link_man?>
- =$item->car_no?>
- =$item->brand?$item->brand->name:''?>
- =$item->series?$item->series->name:''?>
- =$item->address?>
-
- =$item->accident_type?>
- =$item->responsibility?>
- =$item->user->getShowName()?>
- =$item->getStatus()?>
-
- [详情 ]
-
-
-
-
+endBlock(); ?>
\ No newline at end of file
From f38f5e51bee02087bd11de42de902d2e7ab16c93 Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Sat, 12 Oct 2019 10:31:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=B4=E4=BF=AE?=
=?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/controllers/FixCarController.php | 14 ++---
frontend/views/fix-car/my-list-edit.php | 67 ++++++++++++++++++++---
2 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/frontend/controllers/FixCarController.php b/frontend/controllers/FixCarController.php
index 076a074..c34e720 100644
--- a/frontend/controllers/FixCarController.php
+++ b/frontend/controllers/FixCarController.php
@@ -578,13 +578,13 @@ class FixCarController extends BaseController
->asArray()
->all();
- return [
- 'type1_items' => $type1_items,
- 'type2_items' => $type2_items,
- 'type3_items' => $type3_items,
- 'type4_items' => $type4_items,
- 'type5_items' => $type5_items
- ];
+ return MyLib::ok3([
+ 'type1' => ['更换清单', $type1_items],
+ 'type2' => ['维修清单', $type2_items],
+ 'type3' => ['待定清单', $type3_items],
+ 'type4' => ['配件清单', $type4_items],
+ 'type5' => ['工时清单', $type5_items]
+ ], '操作成功');
}
public function actionStep1List()
diff --git a/frontend/views/fix-car/my-list-edit.php b/frontend/views/fix-car/my-list-edit.php
index 6f79f32..525b16a 100644
--- a/frontend/views/fix-car/my-list-edit.php
+++ b/frontend/views/fix-car/my-list-edit.php
@@ -498,18 +498,71 @@ use \common\libs\MyLib;
// 动态加载html
function reloadItems() {
var id = $('#id').val();
+ var lists = {
+ 'list3': '/fix-car/ajax-item-list?fix_id=' + id + '&big_type_id=1',
+ 'list4': '/fix-car/ajax-item-list?fix_id=' + id + '&big_type_id=2',
+ 'list5': '/fix-car/ajax-item-list?fix_id=' + id + '&big_type_id=3',
+ 'list6': '/fix-car/ajax-item-list?fix_id=' + id + '&big_type_id=4',
+ };
if(id > 0) {
- getPage('/fix-car/ajax-item-list?fix_id=' + id + '&big_type_id=1','list3');
- getPage('/fix-car/ajax-item-list?fix_id=' + id + '&big_type_id=2','list4');
- getPage('/fix-car/ajax-item-list?fix_id=' + id + '&big_type_id=3','list5');
- getPage('/fix-car/ajax-item-list?fix_id=' + id + '&big_type_id=4','list6');
+ $.each(lists,function(i,d){
+ $.get(d,{},function(res){
+ console.log(res);
+ if(res.code == 200){
+ renderData(res.data, i);
+ }else {
+ alert(res.msg)
+ }
+ },'json');
+ })
}
}
- function getPage(url,idname) {
- $.get(url,{},function(html){
- html&&$('#' + idname).html(html);
+ function renderData(data, id) {
+ var html = '';
+ var table_data = [];
+ $.each(data,function(name,item){
+ if (item[1].length) {
+ table_data.push(item[1]);
+ html += '
' +
+ '
' +
+ '
'+ item[0] +' ' +
+ ' ' +
+ '
' +
+ '
' +
+ '
' +
+ '
' +
+ ' ' +
+ ' ' +
+ ' ID ' +
+ ' 名称 ' +
+ ' 价格 ' +
+ ' 数量 ' +
+ ' 合计 ' +
+ ' 结算方式 ' +
+ ' 实收 ' +
+ ' 分类 ' +
+ ' 维修人 ' +
+ ' 备注 ' +
+ ' ' +
+ ' ' +
+ '
' +
+ '
' +
+ '
' +
+ '
' +
+ '
';
+ }
});
+ $('#'+ id).html(html).find('table').each(function(i,target){
+ $(target).bootstrapTable("destroy");
+ $(target).bootstrapTable({
+ data: table_data[i],
+ pagination: false,
+ queryParams: function (params) {
+ return params;
+ }
+ });
+ }).show();
}
// 保存维修信息
From 099be1c84f0b01a6b97e094b88e62b8070f49ec4 Mon Sep 17 00:00:00 2001
From: zhaocheng <578322713@qq.com>
Date: Sat, 12 Oct 2019 11:18:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE?=
=?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
frontend/controllers/FixCarController.php | 13 ++++++--
frontend/views/fix-car/my-list-edit.php | 6 ++--
frontend/views/fix-car/my-list.php | 38 ++---------------------
frontend/views/fix-car/step1-list.php | 38 ++---------------------
frontend/views/fix-car/step2-list.php | 32 +------------------
5 files changed, 18 insertions(+), 109 deletions(-)
diff --git a/frontend/controllers/FixCarController.php b/frontend/controllers/FixCarController.php
index c34e720..6630309 100644
--- a/frontend/controllers/FixCarController.php
+++ b/frontend/controllers/FixCarController.php
@@ -105,7 +105,8 @@ class FixCarController extends BaseController
$data['rows'] = [];
foreach($items as $item) {
$row = $item->toArray();
- $row['user'] = $item->getUser()->asArray()->one();
+ $row['show_name'] = $item->user->getShowName();
+ $row['status_txt'] = $item->getStatus();
$data['rows'][] = $row;
}
return $data;
@@ -612,7 +613,10 @@ class FixCarController extends BaseController
$data['rows'] = [];
foreach($items as $item) {
$row = $item->toArray();
- $row['user'] = $item->getUser()->asArray()->one();
+ $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;
@@ -698,7 +702,10 @@ class FixCarController extends BaseController
$data['rows'] = [];
foreach($items as $item) {
$row = $item->toArray();
- $row['user'] = $item->getUser()->asArray()->one();
+ $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;
diff --git a/frontend/views/fix-car/my-list-edit.php b/frontend/views/fix-car/my-list-edit.php
index 525b16a..ead2187 100644
--- a/frontend/views/fix-car/my-list-edit.php
+++ b/frontend/views/fix-car/my-list-edit.php
@@ -523,7 +523,7 @@ use \common\libs\MyLib;
var table_data = [];
$.each(data,function(name,item){
if (item[1].length) {
- table_data.push(item[1]);
+ table_data[name] = item[1];
html += '
' +
'
' +
'
'+ item[0] +' ' +
@@ -531,7 +531,7 @@ use \common\libs\MyLib;
'
' +
'
' +
'
' +
- '
' +
+ ' ' +
' ' +
' ' +
' ID ' +
@@ -556,7 +556,7 @@ use \common\libs\MyLib;
$('#'+ id).html(html).find('table').each(function(i,target){
$(target).bootstrapTable("destroy");
$(target).bootstrapTable({
- data: table_data[i],
+ data: table_data[$(target).data('name')],
pagination: false,
queryParams: function (params) {
return params;
diff --git a/frontend/views/fix-car/my-list.php b/frontend/views/fix-car/my-list.php
index ec9f0d2..1e418b3 100644
--- a/frontend/views/fix-car/my-list.php
+++ b/frontend/views/fix-car/my-list.php
@@ -37,8 +37,8 @@ use \common\libs\MyLib;
联系人
电话
提单日期
- 提单者
- 状态
+ 提单者
+ 状态
操作
@@ -103,40 +103,6 @@ use \common\libs\MyLib;
return false;
}
- function showNameFormatter(value){
- return value.username + '(' + value.name + ')';
- }
-
- function statusFormatter(value){
- var result = '';
- switch(+value) {
- case 1:
- result = '维修调度';
- break;
- case 2:
- result = '司机接车';
- break;
- case 3:
- result = '前台派工';
- break;
- case 4:
- result = '查勘定损';
- break;
- case 5:
- result = '技工维修';
- break;
- case 6:
- result = '总检';
- break;
- case 7:
- result = '财务结算';
- break;
- default:
- result = '';
- }
- return result;
- }
-
$(function() {
search();
});
diff --git a/frontend/views/fix-car/step1-list.php b/frontend/views/fix-car/step1-list.php
index f56c1fb..b2a0f0e 100644
--- a/frontend/views/fix-car/step1-list.php
+++ b/frontend/views/fix-car/step1-list.php
@@ -38,8 +38,8 @@ use \common\libs\MyLib;
接车日期
事故类型
责任
- 提单者
- 状态
+ 提单者
+ 状态
操作
@@ -85,40 +85,6 @@ use \common\libs\MyLib;
return false;
}
- function showNameFormatter(value){
- return value.username + '(' + value.name + ')';
- }
-
- function statusFormatter(value){
- var result = '';
- switch(+value) {
- case 1:
- result = '维修调度';
- break;
- case 2:
- result = '司机接车';
- break;
- case 3:
- result = '前台派工';
- break;
- case 4:
- result = '查勘定损';
- break;
- case 5:
- result = '技工维修';
- break;
- case 6:
- result = '总检';
- break;
- case 7:
- result = '财务结算';
- break;
- default:
- result = '';
- }
- return result;
- }
-
$(function() {
search();
});
diff --git a/frontend/views/fix-car/step2-list.php b/frontend/views/fix-car/step2-list.php
index d602b73..0f83018 100644
--- a/frontend/views/fix-car/step2-list.php
+++ b/frontend/views/fix-car/step2-list.php
@@ -39,7 +39,7 @@ use \common\libs\MyLib;
事故类型
责任
提单者
- 状态
+ 状态
操作
@@ -85,36 +85,6 @@ use \common\libs\MyLib;
return false;
}
- function statusFormatter(value){
- var result = '';
- switch(+value) {
- case 1:
- result = '维修调度';
- break;
- case 2:
- result = '司机接车';
- break;
- case 3:
- result = '前台派工';
- break;
- case 4:
- result = '查勘定损';
- break;
- case 5:
- result = '技工维修';
- break;
- case 6:
- result = '总检';
- break;
- case 7:
- result = '财务结算';
- break;
- default:
- result = '';
- }
- return result;
- }
-
$(function() {
search();
});