|
|
@@ -264,7 +264,12 @@ class Returns extends Start_Controller {
|
|
|
$str .= '仓库回执：'.$extra['mc_jiaji']['jiaji_huizhi']."<br/>";
|
|
|
}
|
|
|
$str = trim($str,"<br/>");
|
|
|
- $info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:red;"><i class="method_self fa fa-list-ul" data-t="'.$str.'" style="position: absolute;top: 0;right: 0;"></i> '.$value['number']."</div>";;
|
|
|
+ if($value['jiaji_status'] == 1){
|
|
|
+ $info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:#95f;"><i class="method_self fa fa-list-ul" data-t="'.$str.'" style="position: absolute;top: 0;right: 0;"></i> '.$value['number']."</div>";
|
|
|
+ }else{
|
|
|
+ $info_list[$key]['number'] = '<div style="position: relative;padding-top:10px;color:red;"><i class="method_self fa fa-list-ul" data-t="'.$str.'" style="position: absolute;top: 0;right: 0;"></i> '.$value['number']."</div>";;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
unset($info_list[$key]['is_jiaji']);
|
|
|
unset($info_list[$key]['extra_cont']);
|
|
|
@@ -721,17 +726,23 @@ class Returns extends Start_Controller {
|
|
|
{
|
|
|
$id = $this->input->post('id',true);
|
|
|
$d = $this->returns->read($id);
|
|
|
+ $update_arr = [];
|
|
|
if($d['qr']==1)
|
|
|
{
|
|
|
$qt = '<span class="thqr" data-id="'.$id.'">未处理</span>';
|
|
|
$qr = 0;
|
|
|
+ $update_arr =['qr'=>$qr];
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
$qt = '<span class="thqr" style="background-color:#ccc" data-id="'.$id.'">已处理</span>';
|
|
|
$qr = 1;
|
|
|
+ $update_arr =['qr'=>$qr];
|
|
|
+ if($d['is_jiaji'] == 1){
|
|
|
+ $update_arr['is_jiaji'] = 0;
|
|
|
+ }
|
|
|
}
|
|
|
- if($this->returns->save(array('qr'=>$qr),$id))
|
|
|
+ if($this->returns->save($update_arr,$id))
|
|
|
{
|
|
|
echo json_encode(array('msg'=>'操作成功','id'=>$id,'t'=>$qt,'success'=>true));exit;
|
|
|
}
|
