修正售后的导出问题

core/CoreApp/controllers/Returngoodsexcel.php

@@ -127,7 +127,7 @@ class Returngoodsexcel extends Start_Controller {
                     $tmp_cate_name .= $tmp_one;
                 }
                 if(!empty($tmp_two)){
-                    $tmp_cate_name .=$tmp_two;
+                    $tmp_cate_name .=  "-".$tmp_two;
                 }
                 $tmp['登记原因'] = $tmp_cate_name;
                 $tmp['备注信息'] = $value['remark'];
@@ -181,6 +181,7 @@ class Returngoodsexcel extends Start_Controller {
         $cate_one = $this->input->post('cate_one',true);
         $cate_two = $this->input->post('cate_two',true);
         $number = $this->input->post('number',true);
+        $sid = $this->input->post("sid",true);
         $where = " status >=  20  and is_back = 1  ";
         try{
 
@@ -219,6 +220,9 @@ class Returngoodsexcel extends Start_Controller {
             {
                 $where  .= " and cate_two = '$cate_two'";
             }
+            if($sid){
+                $where = "id in (".implode(",",$sid).")";
+            }
             //数据排序
             $order_str = "id asc";
 
@@ -240,21 +244,26 @@ class Returngoodsexcel extends Start_Controller {
                 $tmp['订单编码'] = $value['number'];
                 $tmp['店铺名称'] = $value['shopname'];
                 $tmp['状态'] = isset($status_show[$value['status']])?$status_show[$value['status']]:"异常";
-                $tmp['登记一级分类'] = isset($cate_one_show[$value['cate_one']])?$cate_one_show[$value['cate_one']]:"";
-                $tmp['登记二级分类'] = isset($cate_two_show[$value['cate_one']][$value['cate_two']])?$cate_two_show[$value['cate_one']][$value['cate_two']]:'';
+
+
+                $tmp_cate_name = "";
+                $tmp_one = isset($cate_one_show[$value['cate_one']])?$cate_one_show[$value['cate_one']]:"";
+                
+                $tmp_two = isset($cate_two_show[$value['cate_one']][$value['cate_two']])?$cate_two_show[$value['cate_one']][$value['cate_two']]:'';
+                if(!empty($tmp_one)){
+                    $tmp_cate_name .= $tmp_one;
+                }
+                if(!empty($tmp_two)){
+                    $tmp_cate_name .= "-".$tmp_two;
+                }
+                $tmp['登记原因'] = $tmp_cate_name;
                 
                 
                 $tmp['售后类型'] = isset($back_status_show[$value['back_type']])?$back_status_show[$value['back_type']]: '';
 
                 $tmp['重发单号'] = empty($value['back_no'])?"":$value['back_no'];
                 $tmp['退款金额'] = $value['back_money'];
-                if($value['currency'] == 1){
-                    $tmp['货币单位'] = "CNY";
-                }else if($value['currency'] == 2){
-                    $tmp['货币单位'] = "USD";
-                }else{
-                    $tmp['货币单位'] = "";
-                }
+              
                 
                 $tmp['登记时间'] = $value['create_time'];
                 
@@ -282,6 +291,7 @@ class Returngoodsexcel extends Start_Controller {
         $cate_two = $this->input->post('cate_two',true);
         $number = $this->input->post('number',true);
         $where = " is_caiwu = 1 and status >=30  and is_back = 1 ";
+        $sid = $this->input->post("sid",true);
         try{
 
             if($orderinfo)
@@ -319,6 +329,9 @@ class Returngoodsexcel extends Start_Controller {
             {
                 $where  .= " and cate_two = '$cate_two'";
             }
+            if($sid){
+                $where = "id in (".implode(",",$sid).")";
+            }
             //数据排序
             $order_str = "id asc";
 
@@ -340,21 +353,24 @@ class Returngoodsexcel extends Start_Controller {
                 $tmp['订单编码'] = $value['number'];
                 $tmp['店铺名称'] = $value['shopname'];
                 $tmp['状态'] = isset($status_show[$value['status']])?$status_show[$value['status']]:"异常";
-                $tmp['登记一级分类'] = isset($cate_one_show[$value['cate_one']])?$cate_one_show[$value['cate_one']]:"";
-                $tmp['登记二级分类'] = isset($cate_two_show[$value['cate_one']][$value['cate_two']])?$cate_two_show[$value['cate_one']][$value['cate_two']]:'';
+              
+                $tmp_cate_name = "";
+                $tmp_one = isset($cate_one_show[$value['cate_one']])?$cate_one_show[$value['cate_one']]:"";
                 
+                $tmp_two = isset($cate_two_show[$value['cate_one']][$value['cate_two']])?$cate_two_show[$value['cate_one']][$value['cate_two']]:'';
+                if(!empty($tmp_one)){
+                    $tmp_cate_name .= $tmp_one;
+                }
+                if(!empty($tmp_two)){
+                    $tmp_cate_name .= "-".$tmp_two;
+                }
+                $tmp['登记原因'] = $tmp_cate_name;
                 
                 $tmp['售后类型'] = isset($back_status_show[$value['back_type']])?$back_status_show[$value['back_type']]: '';
 
                 $tmp['重发单号'] = empty($value['back_no'])?"":$value['back_no'];
                 $tmp['退款金额'] = $value['back_money'];
-                if($value['currency'] == 1){
-                    $tmp['货币单位'] = "CNY";
-                }else if($value['currency'] == 2){
-                    $tmp['货币单位'] = "USD";
-                }else{
-                    $tmp['货币单位'] = "";
-                }
+               
                 
                 $tmp['登记时间'] = $value['create_time'];
                 

template/erp/returngoods_caiwu.html

@@ -113,7 +113,17 @@ var dataurl = "/returngoods/caiwudata";
 function excelexport(){
     layx.load('loadId','请求中',{shadable:0.6});
    // return console.log($("form").serialize())
-   $.post("/returngoodsexcel/caiwuexcel",$("form").serialize(),function(a){
+   let select_list = [];
+   $("input[name=check]").each(function(){
+        if($(this).prop('checked')){
+            select_list.push($(this).val())
+        }
+   })
+   let form_data = $("form").serialize();
+   if(select_list.length > 0){
+        form_data = {sid:select_list}
+   }
+   $.post("/returngoodsexcel/caiwuexcel",form_data,function(a){
         layx.destroy('loadId');
             if (a && a.success) {
                 if (a.data.length > 0){

template/erp/returngoods_check.html

@@ -197,7 +197,17 @@ function fuzhushenhe(id){
 function excelexport(){
     layx.load('loadId','请求中',{shadable:0.6});
    // return console.log($("form").serialize())
-   $.post("/returngoodsexcel/checkexcel",$("form").serialize(),function(a){
+   let select_list = [];
+   $("input[name=check]").each(function(){
+        if($(this).prop('checked')){
+            select_list.push($(this).val())
+        }
+   })
+   let form_data = $("form").serialize();
+   if(select_list.length > 0){
+        form_data = {sid:select_list}
+   }
+   $.post("/returngoodsexcel/checkexcel",form_data,function(a){
         layx.destroy('loadId');
             if (a && a.success) {
                 if (a.data.length > 0){