admin/liche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edit-admin-order_list

Browse Source
This commit is contained in:
lccsw
2022-04-18 17:37:54 +08:00
parent d0f34871d6
commit 026f10911a
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/controllers/receiver/orderv2/Orders.php
+6 -1
View File
@@ -65,7 +65,9 @@ class Orders extends HD_Controller
if($key2){
$where_s = [];
$key==1 && $where_s["{$t1}.payway"] = 0;//分期
$key==3 && $where_s["{$t1}.id in (select o_id from lc_receiver_order_status where pid_status=0 and status=2)"] = null;
if($key==4){ //交付需要开票后才显示
$where_s["{$t1}.id in (select o_id from lc_receiver_order_status where pid_status=3 and status=1)"] = null;
}
if($key2){
$where_s["{$t2}.pid_status"] = $value['pid_status'];
$up_key = $key2+1;
@@ -83,6 +85,9 @@ class Orders extends HD_Controller
];
$key==1 && $where_s['payway'] = 0;
$key==3 && $where_s['id in (select o_id from lc_receiver_order_status where pid_status=0 and status=2)'] = null;
if($key==4){ //交付需要开票后才显示
$where_s["{$t1}.id in (select o_id from lc_receiver_order_status where pid_status=3 and status=1)"] = null;
}
$where_s = array_merge($where,$where_s);
$count2 = $this->receiver_orders_v2_model->count($where_s);
}
admin/libraries/Ordersv2List.php
+14 -8
View File
@@ -70,10 +70,6 @@ class Ordersv2List
$_title = '全部订单';
$view = 'receiver/orderv2/lists';
$params['status_pid']==1 && $where["{$this->t1}.payway"] = 0;
// if(strlen($params['status_pid']) && $params['status']){
// $where["{$this->t2}.pid_status"] = $params['status_pid'];
// $where["{$this->t2}.status"] = $params['status'];
// }
if(is_product()){
$where["{$this->t1}.biz_id<>"] = 1;
}
@@ -204,16 +200,19 @@ class Ordersv2List
{$this->t1}.cor_id,{$this->t1}.incor_id,{$this->t1}.money_json,{$this->t1}.payway,{$this->t1}.status,{$this->t1}.c_time,
{$this->t1}.biz_id,{$this->t1}.bill_time,{$this->t1}.customer_id,{$this->t1}.owner_name,{$this->t1}.owner_mobile,{$this->t1}.main_type,{$this->t1}.info_json,
{$this->t1}.order_time,{$this->t1}.bill_time,{$this->t1}.item_id";
if($params['status_pid']==3){
$where["{$this->t1}.id in (select o_id from lc_receiver_order_status where pid_status=0 and status=2)"] = null;
if($params['status_pid']==3 && strlen($params['status'])){ //开票
}
if($params['status_pid']==4){ //交付需要开票后才显示
$where["{$this->t1}.id in (select o_id from lc_receiver_order_status where pid_status=3 and status=1)"] = null;
}
if(strlen($params['status_pid'])){
$where["{$this->t1}.id>="] = Orders_v2_entity::V2_START_ID;
}
if(strlen($params['status_pid']) && !$params['status_pid']){
if(strlen($params['status_pid']) && !$params['status_pid']){ //付款列表 下定时间排序
$orderby = "{$this->t1}.order_time desc";
}elseif ($params['status_pid']==3){
}elseif ($params['status_pid']==3){ // 开票列表 开票时间排序
$orderby = "{$this->t1}.bill_time desc";
}else{
$orderby = "{$this->t1}.c_time desc";
@@ -232,6 +231,13 @@ class Ordersv2List
if(strlen($params['status'])){
$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){ //开票
if(strlen($params['status'])){ //待开票
$where['id in (select o_id from lc_receiver_order_status where pid_status=0 and status=2)'] = null;
}else{ //全部
$where['id in (select o_id from lc_receiver_order_status where (pid_status=0 and status=2) or (pid_status=3 and status=1))'] = null;
}
}
$count = $this->ci->mdOrders->count($where);
$rows = $this->ci->mdOrders->select($where, $orderby, $page, $size,$fileds);
}
admin/views/receiver/orderv2/lists.php
+3 -15
View File
@@ -73,11 +73,11 @@
<div class="am-form-group fl">
<div class="am-form-group" style="margin-bottom: 0px;"></div>
<label class="am-para-label w100">订单时间：</label>
<label class="am-para-label w100">下定时间：</label>
<div class="am-form-group fl">
<div class="am-para-inline w300">
<input id="id-create-time" name="c_time" type="text" value="<?= $params['c_time'] ?>"
placeholder="订单时间范围" autocomplete="off"/>
<input id="id-create-time" name="order_time" type="text" value="<?= $params['order_time'] ?>"
placeholder="下定时间范围" autocomplete="off"/>
</div>
<div class="am-para-inline" style="padding-top: 5px;">
<a class="mr10 id-day-btn" href="javascript:void (0);" data-date="today">今天</a>
@@ -218,18 +218,6 @@
<input name="vin" type="text" value="<?= $params['vin'] ?>"/>
</div>
</div>
<?if(strlen($params['status_pid']) && $params['status_pid']==0){?>
<div class="am-form-group fl">
<div class="am-form-group" style="margin-bottom: 0px;"></div>
<label class="am-para-label w100">下定时间：</label>
<div class="am-form-group fl">
<div class="am-para-inline w300">
<input id="order-time" name="order_time" type="text" value="<?= $params['order_time'] ?>"
placeholder="下定时间范围" autocomplete="off"/>
</div>
</div>
</div>
<?}?>
<?if($params['status_pid']==3 && $params['status']==1){?>
<div class="am-form-group fl">
<label class="am-para-label w100">开票时间：</label>