diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index 7ca26eff..de0548cc 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -99,6 +99,7 @@ class Orders extends HD_Controller
return $this->show_json(SYS_CODE_FAIL, '订单不存在!');
}
$money_json = json_decode($row['money_json'], true);
+ $jsondata = $row['jsondata'] ? json_decode($row['jsondata'], true) : '';
$row['info_json'] = json_decode($row['info_json'], true);
$row['status'] = intval($row['status']);
$row['price'] = number_format($row['price'], 2);
@@ -115,6 +116,7 @@ class Orders extends HD_Controller
$row['credit'] = $row['info_json']['c_credit'] ? $row['info_json']['c_credit'] : '';
$row['business_licence'] = $row['info_json']['business_licence'] ? array('value' => $row['info_json']['business_licence']
, 'src' => build_qiniu_image_url($row['info_json']['business_licence'])) : array('value' => '', 'src' => '');
+ $row['note'] = $jsondata['note'] ? $jsondata['note'] : '';
//获取车信息
$brand = $this->auto_brand_model->get(['id' => $row['brand_id']], 'name');
$serie = $this->auto_series_model->get(['id' => $row['s_id']], 'name');
@@ -183,11 +185,27 @@ class Orders extends HD_Controller
//获取代办信息
$agent = $this->order_agents_model->get(['o_id' => $row['id']]);
- $imgs = [];
- $car_imgs = [];
+ $imgs = $car_imgs = $register_img = [];
+ $company = $ins_risk = $business_risk = '';
+ $if_agent = 0;
if ($agent) {
$agent['if_ins'] = intval($agent['if_ins']);
$agent['ins_time'] = $agent['ins_time'] != '0000-00-00 00:00:00' ? date('Y-m-d', strtotime($agent['ins_time'])) : '';
+ $agent_jsondata = $agent['jsondata'] ? json_decode($agent['jsondata'], true) : '';
+ if ($agent_jsondata) {
+ $company = $agent_jsondata['company'];
+ $ins_risk = $agent_jsondata['ins_risk'];
+ $business_risk = $agent_jsondata['business_risk'];
+ $if_agent = intval($agent_jsondata['if_agent']);
+ if ($agent_jsondata['register_img']) {
+ $file_name = substr($agent_jsondata['register_img'], strrpos($agent['car_img'], '/') + 1);
+ $register_img[] = array(
+ 'src' => build_qiniu_image_url($agent_jsondata['register_img']),
+ 'value' => $agent_jsondata['register_img'],
+ 'title' => $file_name
+ );
+ }
+ }
if ($agent['car_img']) {
$file_name = substr($agent['car_img'], strrpos($agent['car_img'], '/') + 1);
$car_imgs[] = array(
@@ -212,9 +230,14 @@ class Orders extends HD_Controller
$agent['car_img_src'] = '';
$agent['car_img'] = '';
}
+ $agent['company'] = $company;
+ $agent['ins_risk'] = $ins_risk;
+ $agent['business_risk'] = $business_risk;
+ $agent['if_agent'] = $if_agent;
$row['agent'] = $agent;
$row['bx_imgs'] = $imgs;
$row['car_imgs'] = $car_imgs;
+ $row['register_img'] = $register_img;
$info = $row;
$this->data['info'] = $info;
@@ -230,6 +253,20 @@ class Orders extends HD_Controller
//编辑单条数据
public function edit()
{
+ $params = $this->input->post();
+ $re = $this->orders_model->get(['id' => $params['id']]);
+ $result = '';
+ if ($params['type'] == 1) {//修改备注
+ $jsondata = json_decode($re['jsondata'], true);
+ $jsondata['note'] = $params['note'];
+ $upd = array('jsondata' => json_encode($jsondata, JSON_UNESCAPED_UNICODE));
+ $result = $this->orders_model->update($upd, ['id' => $params['id']]);
+ }
+ if ($result) {
+ return $this->show_json(SYS_CODE_SUCCESS, '保存成功');
+ } else {
+ return $this->show_json(SYS_CODE_FAIL, '保存失败');
+ }
}
/**
@@ -524,6 +561,14 @@ class Orders extends HD_Controller
$params['e_time'] && $update['ins_time'] = date('Y-m-d H:i:s', strtotime($params['e_time']));
$params['car_img'] && $update['car_img'] = $params['car_img'];
$update['if_ins'] = $params['if_ins'] ? 1 : 0;
+
+ $jsondata['if_agent'] = intval($params['if_agent']);
+ $jsondata['company'] = $params['company'];
+ $jsondata['ins_risk'] = $params['ins_risk'];
+ $jsondata['business_risk'] = $params['business_risk'];
+ $jsondata['register_img'] = $params['register_img'];
+ $update['jsondata'] = json_encode($jsondata, JSON_UNESCAPED_UNICODE);
+
if ($params['bx_imgs']) {
$imgs = explode(',', $params['bx_imgs']);
$update['ins_img'] = json_encode($imgs, JSON_UNESCAPED_UNICODE);
diff --git a/admin/views/receiver/orders/agentinfo.php b/admin/views/receiver/orders/agentinfo.php
index 0e5a8d16..8530ab77 100644
--- a/admin/views/receiver/orders/agentinfo.php
+++ b/admin/views/receiver/orders/agentinfo.php
@@ -21,15 +21,65 @@
-
+
+
+
+
@@ -282,6 +282,7 @@
page: [],
bx_imgs: [],
car_imgs: [],
+ register_img: [],
brand_list: [],
series_list: [],
v_list: [],
@@ -302,8 +303,9 @@
that.v_id = ,
that.cor_id = ,
that.incor_id = ,
- that.bx_imgs = ;
- that.car_imgs = ;
+ that.bx_imgs = ,
+ that.car_imgs = ,
+ that.register_img =
},
computed: {},
created: function () {
@@ -488,6 +490,18 @@
});
}
post_data += "&car_img=" + imgs;
+ //登记证
+ imgs = '';
+ if (this.register_img) {
+ jQuery.each(this.register_img, function (i, val) {
+ if (imgs) {
+ imgs += "," + val['value'];
+ } else {
+ imgs += val['value'];
+ }
+ });
+ }
+ post_data += "®ister_img=" + imgs;
$.post("/receiver/orders/edit_agent", post_data, function (data) {
if (data.code) {
layer.msg(data.msg, {time: 2000, icon: 1}, function () {
@@ -514,6 +528,22 @@
, anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
});
},
+ save_edit: function (type) {
+ var that = this;
+ var data_post;
+ if (type == 1) {
+ data_post = {type: type, id: that.info.id, note: that.info.note};
+ }
+ $.post("/receiver/orders/edit", data_post, function (data) {
+ if (data.code) {
+ layer.msg(data.msg, {time: 2000, icon: 1}, function () {
+ $.form.reload();
+ });
+ } else {
+ layer.msg(data.msg, {icon: 2});
+ }
+ }, 'json');
+ },
//保存
save_cardID: function () {
var that = this;
diff --git a/admin/views/receiver/orders/oinfo.php b/admin/views/receiver/orders/oinfo.php
index cbd36cff..05838337 100644
--- a/admin/views/receiver/orders/oinfo.php
+++ b/admin/views/receiver/orders/oinfo.php
@@ -84,12 +84,21 @@
-