|
|
@@ -176,7 +176,7 @@ class Beihuogl extends Start_Controller {
|
|
|
$start = ($page - 1)*$perpage;
|
|
|
}
|
|
|
|
|
|
- $list = $this->bhsq->find_all($where,"id,shop_id,plat_id,title,sku,sqr,sq_num,sq_status,add_time,update_time,bh_no,u9sc_no",$order_str,$start,$perpage);
|
|
|
+ $list = $this->bhsq->find_all($where,"id,shop_id,plat_id,title,sku,sqr,sq_num,sq_status,add_time,update_time,bh_no,u9sc_no,is_cx",$order_str,$start,$perpage);
|
|
|
|
|
|
if(empty($list)){
|
|
|
$rows = array('total'=>0,'over'=>1,'pagenum'=>0,'rows'=>([]));
|
|
|
@@ -204,13 +204,14 @@ class Beihuogl extends Start_Controller {
|
|
|
if($v['sq_status'] == 0){
|
|
|
$str .= "<a href='javascript:void(0)' style='margin-right:4px;color: #fff;background-color: #DC143C;padding:4px 10px;border-radius:5px;font-size:15px' data-id='".$v['id']."' data-type='0' onclick='del_bhsq(this)'>删除</a>";
|
|
|
}
|
|
|
- if(!empty($v['u9sc_no'])){
|
|
|
+ if(!empty($v['u9sc_no']) && ($v['is_cx'] != 1)){
|
|
|
$str .= "<a href='javascript:void(0)' style='margin-right:4px;color: #fff;background-color: #9400D3;padding:4px 10px;border-radius:5px;font-size:15px' data-title='".$v['title']."' data-id='".$v['id']."' data-u9sc_no='".$v['u9sc_no']."' data-bh_no='".$v['bh_no']."' onclick='cx_bhsq(this)'>生产撤销</a>";
|
|
|
}
|
|
|
$str .= "</div>";
|
|
|
$list[$k]['update_time'] = $str;
|
|
|
unset($list[$k]['bh_no']);
|
|
|
unset($list[$k]['u9sc_no']);
|
|
|
+ unset($list[$k]['is_cx']);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -2339,6 +2340,7 @@ class Beihuogl extends Start_Controller {
|
|
|
'add_time'=>time(),
|
|
|
'update_time'=>time()
|
|
|
]);
|
|
|
+ $this->bhsq->save(['is_cx'=>1],$id);
|
|
|
if ($this->db->trans_status() === TRUE) {
|
|
|
$this->db->trans_commit();
|
|
|
} else {
|
