add-admin-order_status
This commit is contained in:
@@ -124,6 +124,7 @@ class Business extends HD_Controller{
|
||||
's_effect_time' => $v['s_effect_time'] ? date('Y-m-d',$v['s_effect_time']) : '',
|
||||
'effect_status' => $v['if_effect'] ? '生效中' : '未生效',
|
||||
'if_effect' => $v['if_effect'],
|
||||
'delivery_day' => $v['delivery_day']
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -229,7 +229,7 @@ class Ordersv2List
|
||||
} else {
|
||||
$orderby = "{$this->t1}.c_time desc";
|
||||
}
|
||||
if (strlen($params['status_pid']) && $params['status'] && $params['status_pid']!=21) {
|
||||
if (strlen($params['status_pid']) && $params['status'] && $params['status_pid']!=21 &&$params['status']<21) {
|
||||
$where["{$this->t2}.pid_status"] = $params['status_pid'];
|
||||
$up_key = $params['status'] + 1;
|
||||
$where["{$this->t2}.status in ({$params['status']},{$up_key})"] = null;
|
||||
@@ -240,7 +240,7 @@ class Ordersv2List
|
||||
$count = $this->ci->mdOrders->selectOrders($where, '', '', '', 1, '', $having);
|
||||
$rows = $this->ci->mdOrders->selectOrders($where, $orderby, $page, $size, '', $fileds, $having);
|
||||
} else {
|
||||
if (strlen($params['status'])) {
|
||||
if (strlen($params['status']) && $params['status']<21) {
|
||||
$where["id not in (select o_id from lc_receiver_order_status where pid_status={$params['status_pid']} and status=1)"] = null;
|
||||
}
|
||||
if ($params['status_pid'] == 3) { //开票
|
||||
@@ -251,6 +251,10 @@ class Ordersv2List
|
||||
}
|
||||
}
|
||||
$params['status_pid'] == 21 && $where['status'] = 2; //退款
|
||||
if($params['status']==21){ //特殊需求
|
||||
$where["id in (select o_id from lc_receiver_order_status where pid_status=0 and status=1)"] = null; //已付定金
|
||||
$where["id not in (select o_id from lc_receiver_order_status where pid_status=0 and status=2)"] = null; //尾款未支付
|
||||
}
|
||||
$count = $this->ci->mdOrders->count($where);
|
||||
$rows = $this->ci->mdOrders->select($where, $orderby, $page, $size, $fileds);
|
||||
}
|
||||
|
||||
@@ -96,6 +96,7 @@
|
||||
<th width="10%"><span>颜色加价</span></th>
|
||||
-->
|
||||
<th width="7%"><span>城市</span></th>
|
||||
<th width="7%"><span>交车时长</span></th>
|
||||
<th width="7%"><span>时间</span></th>
|
||||
<th width="10%"><span>生效时间</span></th>
|
||||
<th width="7%"><span>是否生效</span></th>
|
||||
@@ -105,7 +106,7 @@
|
||||
<tbody>
|
||||
<template v-for="(v,i) in lists">
|
||||
<tr class="tl">
|
||||
<td colspan="12">车型:<span style="font-weight: 600;color:#FF7F50;">{{v.title}}</span></td>
|
||||
<td colspan="13">车型:<span style="font-weight: 600;color:#FF7F50;">{{v.title}}</span></td>
|
||||
</tr>
|
||||
<tr >
|
||||
<td>
|
||||
@@ -123,6 +124,7 @@
|
||||
<td>{{v.price_color}}</td>
|
||||
-->
|
||||
<td>{{v.city_cn}}</td>
|
||||
<td>{{v.delivery_day}}</td>
|
||||
<td>{{v.month}}</td>
|
||||
<td>{{v.s_effect_time}}</td>
|
||||
<td>{{v.effect_status}}</td>
|
||||
|
||||
@@ -38,7 +38,7 @@ class Receiver_order_status_model extends HD_Model
|
||||
{
|
||||
$status_ary[12] = array('name' => '意向金', 'show' => true, 'list' => array(), 'menu_list' => array(),'pid_status'=>'');
|
||||
|
||||
$status_ary[0] = array('name' => '付款', 'show' => true, 'list' => array(0 => '未付款', 1 => '已下定', 2 => '已付款'),
|
||||
$status_ary[0] = array('name' => '付款', 'show' => true, 'list' => array(0 => '未付款', 1 => '已下定',21=>'未付尾款', 2 => '已付款'),
|
||||
'menu_list' => array(0 => '未付款', 1 => '已付款'), 'menu_default' => 0,'pid_status'=>0);
|
||||
$status_ary[1] = array('name' => '分期办理', 'show' => true, 'list' => array(0 => '分期办理中', 1 => '等待放款' , 2 => '完成按揭'),
|
||||
'menu_list' => array(0 => '分期办理中', 1 => '等待放款' , 2 => '完成按揭'), 'menu_default' => 0,'pid_status'=>1);
|
||||
|
||||
Reference in New Issue
Block a user