Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/static/css/supplier-center/saleslist.css

@@ -1,15 +1,17 @@
 .sales-list{
-    width: 842px;
+    width: 1056px;
     margin: 0 auto;
-    background: #fafafa;
+}
+#saleslist{
+    background: #fff;
 }
 .sales-list>.sales-list-title{
     width: 100%;
     height: 120px;
     line-height: 120px;
     text-align: center;
-    color: #333;
-    font-size: 30px;
+    font-size: 32px;
+    color: #22272e;
 }
 .sales-list>.sales-list-cantent{
     width: 96%;
@@ -80,7 +82,6 @@
 }
 .print-time{
     width: 100%;
-    background: #fafafa;
     height: 150px;
     position: relative;
 }

src/main/resources/static/js/supplier-center/delivergoods.js

@@ -18,38 +18,32 @@ var delivergoods = new Vue({
         },
         computedPrice: function (order) { //单选
             var _self = this;
-            var productsCheckedLength=0;
-            this.$nextTick(function () {
                     if(event.target.checked){
                          _self.submitIds.push(order);
-                         productsCheckedLength++;
                     }else {
                       _self.submitIds.splice(_self.submitIds.indexOf(order), 1);
                     }
-                    if(productsCheckedLength==_self.productList.length){
+                    console.log(_self.submitIds)
+                    if(_self.submitIds.length==_self.productList.length){
                         _self.allChecked=true;
                     }else {
-                       _self.allChecked=false
+                       _self.allChecked=false;
                     }
-            });
         },
         ckeckAll: function () { //全選
             var _self = this;
-            this.$nextTick(function(){
                 if (_self.allChecked) {
                     _self.submitIds = [];
                     _self.productList.forEach(function (order) {
-                            _self.check = true;
+                            order.check = true;
                             _self.submitIds.push(order);
                         })
                 }else{
-                        _self.submitIds = [];
-                    _self.productList.forEach(function(order){
-                        _self.check = false;
+                     _self.productList.forEach(function(order){
+                          order.check = false;
                     });
+                    _self.submitIds = [];
                 }
-
-            });
         },
         delivery:function () {
         var _this = this;

src/main/resources/static/js/supplier-center/orderlist.js

@@ -112,7 +112,7 @@ var orderList = new Vue({
         window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+shopOrderID;
     },
     Checklist:function (shopOrderID) {//售货清单
-        window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+shopOrderID;
+         window.open('/supplier/order/sales.html?shopOrderID='+shopOrderID)
     },
     seedetail:function (shopOrderID) {
         window.location.href = '/supplier/order/detail.html?shopOrderID='+shopOrderID;

src/main/resources/static/js/supplier-center/record.js

@@ -61,10 +61,10 @@ var deliveryRecode = new Vue({
                 var logisticsBatchPage = res.data.logisticsBatchPage;
                 if(logisticsBatchPage.results==''){
                      _this.logisticsList = [];
-                     _this.isShow = true
+                     // _this.isShow = true
                 }else {
                     _this.logisticsList = logisticsBatchPage.results;
-                    _this.isShow = false
+                    // _this.isShow = false
                 }
             }
          })

src/main/resources/templates/supplier-center/order/delivery.html

@@ -48,7 +48,7 @@
                     <form action="">
                         <div class="goods-list" v-for="order in productList">
                             <div class="goods-btn">
-                                <input type="checkbox" name="goodList" class="goods-inp"  v-model="check"
+                                <input type="checkbox" name="goodList" class="goods-inp" v-model="order.check"
                                        @change="computedPrice(order)"/>
                             </div>
                             <div class="goods">

src/main/resources/templates/supplier-center/order/list.html

@@ -99,7 +99,7 @@
                                    <div>
                                         <a class="btn" href="javascript: void(0);" v-if="order.sendOutStatus!=3" :value="order.shopOrderID" @click="delivery(order.shopOrderID)">发货</a>
                                         <a class="btn" href="javascript: void(0);" @click="record(order.shopOrderID)">发货记录</a>
-                                        <a class="btn" href="javascript: void(0);" @click="Checklist(order.shopOrderID)">售货清单</a>
+                                        <a class="btn" href="javascript: void(0);" @click="Checklist(order.shopOrderID)" target="_blank">售货清单</a>
                                         <a class="btn deatil" href="javascript: void(0);" @click="seedetail(order.shopOrderID)" >查看详情</a>
                                    </div>
 

src/main/resources/templates/supplier-center/order/sales-list.html

@@ -13,7 +13,6 @@
 <!-- 我的采美 -->
 <div id="saleslist">
     <div class="sales-list">
-        <script type="text/template" id="tp1">
             <div class="sales-list-title">售货清单</div>
                 <div class="sales-list-cantent">
                 <div class="number-time">
@@ -47,7 +46,6 @@
             <div class="print-time">
                 <button type="button" class="print">打印</button>
             </div>
-        </script>
 
     </div>
 </div>