提交导入excel的问题

core/CoreApp/controllers/Returns.php

@@ -733,7 +733,7 @@ class Returns extends Start_Controller {
 					'xh'=>isset($value['退货箱号'])?$value['退货箱号']:'',
 				];
 			}
-
+			$count_i = 0;
 			foreach($list as $key => $value){
 				$info = $this->returns->get_torderinfo($value[0]['torderinfo']);
 				if(empty($info)){
@@ -795,9 +795,15 @@ class Returns extends Start_Controller {
 					'received' => $received_str,
 					'xh' => $xh_str,
 				],$info['id']);
+				$count_i++;
 
 			}
-			echo json_encode(array('msg'=>'提交完成','success'=>true,'data'=>$err_list));exit;
+			if(!empty($err_list)){
+				$msg = $count_i."条已导入成功，".count($err_list)."条导入失败！下载导入失败清单。";
+			}else{
+				$msg = "全部数据导入成功";
+			}
+			echo json_encode(array('msg'=>$msg,'success'=>true,'data'=>$err_list));exit;	
 		}else{
 			echo json_encode(array('msg'=>'参数错误','success'=>false));exit;
 		}

template/erp/returns.html

@@ -178,7 +178,7 @@ function  doSendExcel(jsonData){
             layx.destroy('loadId');
             if (a && a.success) {
                 if(a.data.length >  0){
-                    layx.confirm('提示','是否下载不符合条件的数据',null,{
+                    layx.confirm('提示',a.msg,null,{
                         buttons:[
                             {
                                 label:'确定',