1、更新中通快递

src/views/modules/prod/post-product/postProduct.vue

@@ -415,12 +415,13 @@ export default {
         return
       }
       //skuMap拼接
-      debugger
       let skuPicMapArr = this.cartesianProduct(this.skuTags);
       if(skuPicMapArr.length > 0){
         for(let i = 0; i < this.dataForm.skuList.length; i++){
-          this.dataForm.skuList[i].skuPicMap = skuPicMapArr[i]
-          this.dataForm.skuList[i].pic = skuPicMapArr[i].split(",")[0]
+          if(skuPicMapArr[i]){
+            this.dataForm.skuList[i].skuPicMap = skuPicMapArr[i]
+            this.dataForm.skuList[i].pic = skuPicMapArr[i].split(",")[0]
+          }
         }
       }
       this.dataForm.prodName = this.dataForm.prodNameCn
@@ -524,18 +525,22 @@ export default {
         return result;
       } else {
         let tempResult = skuTags[0].tagItems.map(item => item.pic);
-        for (let i = 1; i < skuTags.length; i++) {
-          let newResult = [];
-          tempResult.forEach(arr =>{
-            skuTags[i].tagItems.forEach(item =>{
-              if(!item.pic){
-                item.pic = ''
-              }
-              let newArr = arr.concat(',').concat(item.pic);
-              newResult.push(newArr);
+        if(tempResult.length > 0){
+          for (let i = 1; i < skuTags.length; i++) {
+            let newResult = [];
+            tempResult.forEach(arr =>{
+              skuTags[i].tagItems.forEach(item =>{
+                if(!item.pic){
+                  item.pic = ''
+                }
+                if(arr){
+                  let newArr = arr.concat(',').concat(item.pic);
+                  newResult.push(newArr);
+                }
+              })
             })
-          })
-          tempResult = newResult;
+            tempResult = newResult;
+          }
         }
         return tempResult;
       }

src/views/modules/settlement/third-print-settlement.vue

@@ -86,7 +86,8 @@
               <div>
                 <span style="font-size: 16px">待结算人工(快递)金额</span>
                 <div style="margin-top: 5px">
-                  <span v-if="stat.settleLaborAmount" style="color: green; font-weight: bold;font-size: 20px;">+ ¥{{parseFloat(stat.settleLaborAmount).toFixed(2)}}</span>
+                  <span v-if="stat.settleLaborAmount" style="color: green; font-weight: bold;font-size: 20px;">+ ¥{{parseFloat(stat.settleLaborAmount + stat.settleDeliveryAmount).toFixed(2)}}</span>
+                  <span v-else-if="stat.settleDeliveryAmount" style="color: green; font-weight: bold;font-size: 20px;">+ ¥{{parseFloat(stat.settleLaborAmount + stat.settleDeliveryAmount).toFixed(2)}}</span>
                   <span v-else style="color: green; font-weight: bold;font-size: 20px;">+ ¥0</span>
                 </div>
               </div>
@@ -581,7 +582,7 @@
       resetSearchForm (formName) {
         this.$refs[formName].resetFields()
         this.searchForm = {};
-        this.stat = {settleAmount:0, settleSkuAmount:0, settleAfterCostAmount:0, settleLaborAmount:0, settleReduceAmount: 0}
+        this.stat = {settleAmount:0, settleSkuAmount:0, settleAfterCostAmount:0, settleLaborAmount:0, settleReduceAmount: 0, settleDeliveryAmount: 0}
       },
       handleSizeChange (val) {
         this.page.pageSize = val