1.0

app/Http/Controllers/HandleController.php

@@ -94,6 +94,9 @@ class HandleController extends Controller
     }
 
     private function c(){
+        $s = (new JopExportAbnormlList($_GET['id']))->handle();
+        print_r($s);
+        die();
         $s = (new JopExportPutawayList($_GET['id']))->handle();
         print_r($s);
         die();

app/Jobs/JopExportAbnormlList.php

@@ -75,7 +75,7 @@ class JopExportAbnormlList extends Job implements ShouldQueue
                    'currency'=>$v['currency'],
                    'supplier_goods_id'=>$v['supplier_goods_id'],
                    'goods_name'=>$v['goods_name'],
-                   'supplier_brand_name'=>$v['supplier_brand_name'],
+                   'brand_name'=>$v['brand_name'],
                    'encap'=>$v['encap'],
                    'packing_id'=>$v['packing_id'],
                    'mpq'=>$v['mpq'],

app/Model/Server/ServerPurModel.php

@@ -33,15 +33,17 @@ class ServerPurModel
             die();
         }
         $p = json_decode($res,true);
-        if (array_key_exists('errcode',$p)){
-            $p['code'] = $p['errcode'];
+        if ($p){
+            if (array_key_exists('errcode',$p)){
+                $p['code'] = $p['errcode'];
+                unset($p['errcode']);
+            }
+            if (array_key_exists('errmsg',$p)){
+                $p['msg'] = $p['errmsg'];
+                unset($p['errmsg']);
+            }
             unset($p['errcode']);
         }
-        if (array_key_exists('errmsg',$p)){
-            $p['msg'] = $p['errmsg'];
-            unset($p['errmsg']);
-        }
-        unset($p['errcode']);
         if ($type == 1){
             echo  json_encode($p);
         }else{

public/pc/js/controller/AbnormalDetail.js

@@ -23,9 +23,10 @@
                 html += "<tr class=\"you\"> " +
                     "<td><span class=\"t1\">"+s.supplier_goods_id+"</span></td>" +
                     "<td><span class=\"t1\">"+s.goods_name+"</span></td>" +
-                    "<td><span class=\"t1\">"+s.supplier_brand_name+"</span></td>" +
+                    "<td><span class=\"t1\">"+s.brand_name+"</span></td>" +
                     "<td><span class=\"t1\">"+s.encap+"</span></td>" +
                     "<td><span class=\"t1\">"+s.mpq+"</span></td>" +
+                    "<td><span class=\"t1\">"+s.packing_id+"</span></td>" +
                     "<td><span class=\"t1\">"+s.real_number+"</span></td>" +
                     "<td><span class=\"t1\">"+s.initial_price+"</span></td>" +
                     "</tr>"

resources/views/pc/AbnormalDetail.blade.php

@@ -39,6 +39,7 @@
                     <th>型号<b></b></th>
                     <th>品牌<b></b></th>
                     <th>封装</th>
+                    <th>MPQ</th>
                     <th>包装方式</th>
                     <th>数量</th>
                     <th>单价</th>

resources/views/pc/AbnormalList.blade.php

@@ -19,9 +19,9 @@
                 <div class="lineBlock input-inline va-m">
                     <label class="tag">状态：</label>
                     <select class="sel w180" name="status">
-                        <option value=""></option>
+                        <option value="-10,2">全部</option>
                         <option value="-10">已取消</option>
-                        <option value="4" selected>已完成</option>
+                        <option value="2" >已完成</option>
                     </select>
                 </div>
                 <div class="lineBlock input-inline va-m">