更新联营物料

app/Http/Controllers/ApiController.php

@@ -191,9 +191,11 @@ class ApiController extends Controller
         $res = (new ServerFoostoneModel($request->appid,$request->key))->uploadComSkulog([$request->input("id")],2);
         $res = (new ServerFoostoneModel($request->appid,$request->key))->uploadComSkulog([$request->input("id")],2);
         $status = @$res['data']['list'][0]['status'];
         $status = @$res['data']['list'][0]['status'];
         if($status == 2){ //成功
         if($status == 2){ //成功
-            Export(0,'成功');
+            Export(0,$res['data']['list'][0]['file_name']['down']);
         }elseif ($status == 3){ //失败
         }elseif ($status == 3){ //失败
             Export(1,"任务失败：".implode(',',@$res['data']['list'][0]['log']));
             Export(1,"任务失败：".implode(',',@$res['data']['list'][0]['log']));
+        }else{
+            Export(2,"没完成");
         }
         }
     }
     }
 
 

public/pc/js/controller/GoodsComList.js

@@ -109,8 +109,8 @@
                     if(res.code == 0){
                     if(res.code == 0){
                         window.clearInterval(t2)
                         window.clearInterval(t2)
                         layer.closeAll();
                         layer.closeAll();
-                        alert_succ("导入成功",function () {
-                            window.location.reload()
+                        alert_succ('上传成功，点击确定下载上传结果...',function () {
+                            window.location.href = res.msg
                         })
                         })
                     }
                     }
                     if(res.code == 1){
                     if(res.code == 1){

public/pc/js/controller/UploadLogList.js

@@ -25,7 +25,7 @@
             ,cols: [[ //
             ,cols: [[ //
                 {field:'id', title: 'ID',align:'center'}
                 {field:'id', title: 'ID',align:'center'}
                 ,{field:'create_name', title: '上传人',align:'center'}
                 ,{field:'create_name', title: '上传人',align:'center'}
-                ,{field:'status', title: '状态',align:'center'}
+                ,{field:'status', title: '上传状态',align:'center'}
                 ,{field:'log', title: '日志',align:'center'}
                 ,{field:'log', title: '日志',align:'center'}
                 ,{field:'create_time', title: '上传时间',align:'center'}
                 ,{field:'create_time', title: '上传时间',align:'center'}
                 ,{field:'', title: '操作',fixed: 'right',align:'center',templet: function(d){
                 ,{field:'', title: '操作',fixed: 'right',align:'center',templet: function(d){