1.0

public/pc/js/controller/GoodsList.js

@@ -185,6 +185,7 @@ function initSelectTelephone() {
     selectTelehone.on("select2:unselect", function (evt) {
     selectTelehone.on("select2:unselect", function (evt) {
         //这里是取消选中触发的事件
         //这里是取消选中触发的事件
         //如配置allowClear: true后，触发
         //如配置allowClear: true后，触发
+        $("#brand_name").empty(); //清空select2数据
     });
     });
 }
 }
 function formatTelehoneNumber(item) {
 function formatTelehoneNumber(item) {

public/pc/js/controller/OrderDetail.js

@@ -13,7 +13,7 @@
             var other = res.other;
             var other = res.other;
             $(".order_sn").html(other.order_sn);
             $(".order_sn").html(other.order_sn);
             $(".putaway_time").html(other.putaway_time);
             $(".putaway_time").html(other.putaway_time);
-            $(".day_num").html(other.day_num);
+            $(".pay_type_name").html(other.pay_type_name);
             $(".status").html(other.status);
             $(".status").html(other.status);
             $(".settle").html(other.settle);
             $(".settle").html(other.settle);
             $(".currency").html(other.currency);
             $(".currency").html(other.currency);
@@ -27,6 +27,7 @@
                     "<td><span class=\"t1\">"+s.supplier_brand_name+"</span></td>" +
                     "<td><span class=\"t1\">"+s.supplier_brand_name+"</span></td>" +
                     "<td><span class=\"t1\">"+s.encap+"</span></td>" +
                     "<td><span class=\"t1\">"+s.encap+"</span></td>" +
                     "<td><span class=\"t1\">"+s.mpq+"</span></td>" +
                     "<td><span class=\"t1\">"+s.mpq+"</span></td>" +
+                    "<td><span class=\"t1\">"+s.packing_id+"</span></td>" +
                     "<td><span class=\"t1\">"+s.putaway_number+"</span></td>" +
                     "<td><span class=\"t1\">"+s.putaway_number+"</span></td>" +
                     "<td><span class=\"t1\">"+s.initial_price+"</span></td>" +
                     "<td><span class=\"t1\">"+s.initial_price+"</span></td>" +
                     "</tr>"
                     "</tr>"

resources/views/pc/OrderDetail.blade.php

@@ -20,7 +20,7 @@
             <div class="mt20">
             <div class="mt20">
                 <div class="lineBlock va-m mr26">
                 <div class="lineBlock va-m mr26">
                     <span class="lineBlock t3">结算方式：</span>
                     <span class="lineBlock t3">结算方式：</span>
-                    <span class="lineBlock t4 day_num"></span>
+                    <span class="lineBlock t4 pay_type_name"></span>
                 </div>
                 </div>
                 <div class="lineBlock va-m mr33">
                 <div class="lineBlock va-m mr33">
                     <span class="lineBlock t3">付款状态：</span>
                     <span class="lineBlock t3">付款状态：</span>
@@ -43,6 +43,7 @@
                     <th>型号<b></b></th>
                     <th>型号<b></b></th>
                     <th>品牌<b></b></th>
                     <th>品牌<b></b></th>
                     <th>封装</th>
                     <th>封装</th>
+                    <th>MPQ</th>
                     <th>包装方式</th>
                     <th>包装方式</th>
                     <th>入库数量</th>
                     <th>入库数量</th>
                     <th>单价</th>
                     <th>单价</th>