浏览代码

修改物流打印超时·

lvhao 3 月之前
父节点
当前提交
a96a1f92a5
共有 2 个文件被更改,包括 77 次插入6 次删除
  1. 49 6
      core/CoreApp/controllers/Fullordererror.php
  2. 28 0
      template/erp/fullordererror_errshow.html

+ 49 - 6
core/CoreApp/controllers/Fullordererror.php

@@ -6,6 +6,12 @@ class Fullordererror extends Start_Controller {
 		$this->load->_model('Model_message','message');
 		$this->load->_model('Model_shop','shop');
 		$this->load->_model("Model_fullordererrors","fullordererrors");
+		$this->load->_model("Model_fullorder","fullorder");
+		$this->load->_model("Model_fullordersmt","fullordersmt");
+		$this->load->_model("Model_fullordertt","fullordertt");
+		$this->load->_model("Model_fullorderamz","fullorderamz");
+		$this->load->_model("Model_express","express");
+		$this->load->model("Model_warehouse","warehouse");
 	}
 	//定义方法的调用规则 获取URI第二段值
     public function _remap($arg,$arg_array)
@@ -13,6 +19,10 @@ class Fullordererror extends Start_Controller {
 		if($arg == 'outtime')//添加
         {
              $this->_outtime();
+        }
+		else if($arg == 'shanchu')//删除
+        {
+             $this->_shanchu($arg_array);	
         }
 		else
 		{
@@ -72,14 +82,40 @@ class Fullordererror extends Start_Controller {
 		    {
                 $start = ($page - 1)*$perpage;
             }
-            $info_list = $this->fullordererrors->find_all($where,'id,shop,number,error_time',$order_str,$start,$perpage);
+            $info_list = $this->fullordererrors->find_all($where,'*',$order_str,$start,$perpage);
 			 //格式化数据
+			$warehouse_list = $this->warehouse->find_all();
+			$warehouse_list = array_column($warehouse_list,'title','id');
+			$express_list = $this->express->find_all();
+			$express_list = array_column($express_list,'servicename','id');
+			$shop_list = $this->shop->find_all();
+			$shop_list = array_column($shop_list,'shopname','id');
+			$final_data = [];
             foreach ($info_list as $key=>$value) 
 		    {
-				//$ud = $this->fullorder->read($value['id']);
-				$shop = $this->shop->read($value['shop']);
-				$info_list[$key]['shop'] = $shop['shopname'];
-				$info_list[$key]['error_time'] = date("Y-m-d H:i:s",$value['error_time']);
+				$tmp_data = [];
+				$plat = $value['plat'];
+				$ud = $this->$plat->get_number($value['number']);
+				$tmp_data['id'] = $value['id'];
+				$tmp_data['shop'] = isset($shop_list[$value['shop']])?$shop_list[$value['shop']]:'';
+				$tmp_data['warehouse'] = isset($warehouse_list[$ud['type']])?$warehouse_list[$ud['type']]:'无';
+				if($plat == 'fullordertt'){
+					$tmp_data['orderinfo'] = "<h9 class='window' data-h='/fullordertt/readonly/".$ud['id']."' data-t='订单号:".$ud['orderinfo']."'><p>".$ud['orderinfo']."</p></h9>";
+				}elseif($plat == 'fullordersmt'){
+					$tmp_data['orderinfo'] = "<h9 class='window' data-h='/fullordersmt/readonly/".$ud['id']."' data-t='订单号:".$ud['orderinfo']."'><p>".$ud['orderinfo']."</p></h9>";
+				}elseif($plat == 'fullorderamz'){
+					$tmp_data['orderinfo'] = "<h9 class='window' data-h='/fullorderamz/readonly/".$ud['id']."' data-t='订单号:".$ud['orderinfo']."'><p>".$ud['orderinfo']."</p></h9>";
+				}else{
+					$tmp_data['orderinfo'] = "<h9 class='window' data-h='/fullorder/readonly/".$ud['id']."' data-t='订单号:".$ud['orderinfo']."'><p>".$ud['orderinfo']."</p></h9>";
+				}
+				
+				$tmp_data['number'] = $value['number'];
+				$tmp_data['express'] = isset($express_list[$ud['express']])?$express_list[$ud['express']]:'无';
+			    
+				$tmp_data['error_time'] = date("Y-m-d H:i:s",$value['error_time']);
+				$tmp_data['operation'] = "<p class='ckn' onclick='shanchu(".$value['id'].")'><b >删除</b></p>";
+				$final_data[] = $tmp_data;
+				
 				// $info_list[$key]['orderinfo'] = "<h9 class='window' data-h='/fullorder/edit/".$value['id']."' data-t='订单号:".$value['orderinfo']."'>".$value['orderinfo']."<p>";
 				// $warehouse = $this->warehouse->read($value['type']);
 				// $warehousetitle = $warehouse['title'];
@@ -110,7 +146,7 @@ class Fullordererror extends Start_Controller {
 		    $total = $this->fullordererrors->find_count($where);
 		    $pagenum = ceil($total/$perpage);
 		    $over = $total-($start+$perpage);
-		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($info_list));
+		    $rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($final_data));
 		    echo json_encode($rows);exit;
 		}
 		$wlshop = $this->shop->find_all('1=1 and '.rtrim($sid,'or'));
@@ -119,4 +155,11 @@ class Fullordererror extends Start_Controller {
 		$this->_Template('fullordererror_errshow',$this->data);
 	}
 
+
+	public function _shanchu($arg_array){
+		$id = $arg_array[0];
+		$this->fullordererrors->remove($id);
+		exit(json_encode(array('success'=>true,'msg'=>'删除成功')));	
+	}
+
 }

+ 28 - 0
template/erp/fullordererror_errshow.html

@@ -25,8 +25,12 @@
 <tr>
 <td><label onClick="swapCheck()"><input name="checkbox" type="checkbox" class="regular-checkbox"></label></td>
 <td>店铺名称</td>
+<td>发货仓库</td>
+<td>订单号</td>
 <td>编号</td>
+<td>物流方式</td>
 <td>记录时间</td>
+<td>操作</td>
 </tr>
 </table>
 </div>
@@ -47,6 +51,30 @@ $(this).find('td:eq(1)').css("width","8%");
 $(this).find('td:eq(2)').css("width","8%");
 
 });}
+
+function shanchu(id){
+    layx.load('loadId','请求中',{shadable:0.6});
+    $.ajax({
+        url:"/fullordererror/shanchu/"+id,
+        data:{},
+        type:"post",
+        dataType:"json",
+        success:function(a){
+            layx.destroy('loadId');
+            if (a && a.success) {
+			    $(".ts p").html(a.msg);
+                $(".ts").fadeIn();
+                setTimeout('searchspan(2)', 900);
+            }
+            if (a && !a.success) {
+			    $(".ts p").html(a.msg);
+                $(".ts").fadeIn();
+                
+            }
+        }
+    })
+}
+
 </script>
 <script type="text/javascript" src="{$theme}js/time.js"></script>