前端

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -982,6 +982,7 @@ export default {
           }
         }
       this.contractNo = e
+      this.currentPage=1
       this.getList()
     },
 
@@ -1020,10 +1021,18 @@ export default {
           sums[index] = '--'
         }
       })
-      // sums[sums.length-3]=sums[sums.length-3].toFixed(2)
-      // sums[sums.length-4]=sums[sums.length-4].toFixed(2)
-			// sums[sums.length-5]=sums[sums.length-5].toFixed(2)
-      // sums[sums.length-6]=sums[sums.length-6].toFixed(2)
+      if(typeof sums[sums.length-3]=='number'){
+        sums[sums.length-3]=sums[sums.length-3].toFixed(2)
+      }
+      if(typeof sums[sums.length-4]=='number'){
+        sums[sums.length-4]=sums[sums.length-4].toFixed(2)
+      }
+      if(typeof sums[sums.length-5]=='number'){
+        sums[sums.length-5]=sums[sums.length-3].toFixed(2)
+      }
+      if(typeof sums[sums.length-7]=='number'){
+        sums[sums.length-7]=sums[sums.length-7].toFixed(2)
+      }
       return sums
     },
     getList() {

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -226,6 +226,7 @@ export default {
             goodsNameKey: row.goodsNameKey,
             grade: row.grade,
             outType:row.outType,
+            addressUrl:row.addressUrl,
             grossWeight: row.grossWeight,
             inOutDate: row.inOutDate,
             inOutFlag: row.inOutFlag,
@@ -268,6 +269,7 @@ export default {
             goodsNameKey: row.goodsNameKey,
             outType:row.outType,
             grade: row.grade,
+            addressUrl:row.addressUrl,
             grossWeight: row.grossWeight,
             inOutDate: row.inOutDate,
             inOutFlag: row.inOutFlag,

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -702,6 +702,12 @@ export default {
     this.dataList.netWeight = Number(this.$route.query.netWeight).toFixed(2)
     this.dataList.grade = this.$route.query.grade
     this.dataList.agent = this.$route.query.agent
+    if(this.$route.query.addressUrl.indexOf(',')!=-1){
+      this.dataList.addressUrl=this.$route.query.addressUrl.split(',')
+    }else{
+      this.dataList.addressUrl=this.$route.query.addressUrl
+    }
+    
     this.dataList.carNo = this.$route.query.carNo
     this.dataList.outType = this.$route.query.outType
     this.dataList.inOutDate = this.$route.query.inOutDate

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -829,6 +829,11 @@ export default {
     this.dataList.tare = this.$route.query.tare
     this.dataList.netWeight = this.$route.query.netWeight
     this.dataList.grade = this.$route.query.grade
+    if(this.$route.query.addressUrl.indexOf(',')!=-1){
+      this.dataList.addressUrl=this.$route.query.addressUrl.split(',')
+    }else{
+      this.dataList.addressUrl=this.$route.query.addressUrl
+    }
     this.dataList.agent = this.$route.query.agent
     this.dataList.carNo = this.$route.query.carNo
     this.dataList.outType = this.$route.query.outType