在线测试加急单展示列表

core/CoreApp/controllers/Returngoods.php

@@ -511,8 +511,8 @@ class Returngoods extends Start_Controller {
                      $tmp['back_money'] = $value['back_money'];
                 }
                 
-                
-                $tmp['create_time'] = $value['create_time'];
+                $time_int = strtotime($value['create_time']);
+                $tmp['create_time'] = date("Y-m-d",$time_int)."<br />".date("H:i:s",$time_int);
                 $tmp['caozuo'] = "";
                 // if($value['status'] == 1){
                 //     $tmp['caozuo'] .= '<a href="javascript:void(0);"   style="margin-right:4px;color: #fff;background-color: #06f !important;border-color: #59f;" data-h="/returngoods/edit/'.$value['id'].'" data-type="2"  class="window btn btn-xs" data-t="退货登记-编辑">编辑</a>';

core/CoreApp/controllers/Transfer.php

@@ -2038,7 +2038,7 @@ class Transfer extends Start_Controller {
                 $start = ($page - 1)*$perpage;
             }
 			
-			$sql_r = "select s.*,c.* from crowd_systemtransfer as s inner join crowd_systemtransfer_cr as c   on c.fid = s.id and c.is_over = 0 and  c.time > ".$timetk ." and c.time < ".$timetj." ";
+			$sql_r = "select s.* from crowd_systemtransfer as s inner join crowd_systemtransfer_cr as c   on c.fid = s.id and c.is_over = 0 and  c.time > ".$timetk ." and c.time < ".$timetj." ";
 			if($transfer){
 				$sql_r .= " and c.lx = ".$transfer." ";
 				
@@ -2055,29 +2055,32 @@ class Transfer extends Start_Controller {
 			$sql_r .=" where s.is_jiaji = 2 and s.rk not like '%|11|%' " ;
 			$rows_r = $this->db->query($sql_r);
 			$get_list = $rows_r->result_array();
-			$total = count($rows_r);
+			
+			$total = count($get_list);
 			
 			$split_list = array_chunk($get_list,$perpage);
+		
 			$pagenum = ceil(count($split_list));
 			$key = $page - 1;
 			$list = isset($split_list[$key])?$split_list[$key]:[];
 			$final_list = [];
 			foreach ($list as $key => $value) {
+			   
 
-				$final_list[$key]['id'] = $value['s.id'];
-				$final_list[$key]['number'] = isset($value['s.number'])?$value['s.number']:'';
+				$final_list[$key]['id'] = $value['id'];
+				$final_list[$key]['number'] = isset($value['number'])?$value['number']:'';
 			
-				if($value['s.is_jiaji'] == 2){
+				if($value['is_jiaji'] == 2){
 		            $final_list[$key]['is_jiaji'] = "<a href='javascript:void(0)' style='color:red'>加急</a>";
 		        }else{
 		            $final_list[$key]['is_jiaji'] = "常规";
 		        }
 			
-				$final_list[$key]['pm'] = $value['s.pm'];
-				$final_list[$key]['shipremarks'] = $value['s.shipremarks'];
-				$final_list[$key]['printtime'] = date('Y-m-d H:i:s',$value['s.printtime']);
+				$final_list[$key]['pm'] = $value['pm'];
+				$final_list[$key]['shipremarks'] = $value['shipremarks'];
+				$final_list[$key]['printtime'] = date('Y-m-d H:i:s',$value['printtime']);
 
-				$data = $this->systemtransfer_cr->find_all("fid = '".$value['s.id']."'");
+				$data = $this->systemtransfer_cr->find_all("fid = '".$value['id']."'");
 				
 				$info_list[$key]['time'] = "订单打印 ：".date('Y-m-d H:i',$value['printtime']).'<br>';
 				foreach ($data as $k=>$v)

template/erp/returngoods.html

@@ -146,16 +146,17 @@ var customon = 1;
 function custom(){
 $(".data tr").each(function() {
 $(this).find('td:eq(0)').css("width","1%");
-$(this).find('td:eq(1)').css("width","6%");
-$(this).find('td:eq(2)').css("width","5%");
+$(this).find('td:eq(1)').css("width","7%");
+$(this).find('td:eq(2)').css("width","7%");
 $(this).find('td:eq(3)').css("width","6%");
 $(this).find('td:eq(4)').css("width","4%");
 $(this).find('td:eq(5)').css("width","10%");
 $(this).find('td:eq(6)').css("width","22%");
-$(this).find('td:eq(7)').css("width","5%");
-$(this).find('td:eq(8)').css("width","5%");
-$(this).find('td:eq(9)').css("width","8%");
+$(this).find('td:eq(7)').css("width","4%");
+$(this).find('td:eq(8)').css("width","7%");
+$(this).find('td:eq(9)').css("width","5%");
 $(this).find('td:eq(10)').css("width","5%");
+// $(this).find('td:eq(11)').css("width","5%");
 
 });}
 function changeCateOne(that){