Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/shippingAir/nodePage/tally/batchTally.vue

@@ -83,10 +83,16 @@ export default {
           });
         }
       });
-
       if (orderLocationList.length === 0) {
-        this.$message.error(this.$t("没有需要修改储位的订单"));
-        return;
+        let orderIds = []
+        this.storageList.forEach(item=>{
+          if(!orderIds.includes(item.orderId)){
+            orderIds.push(item.orderId)
+          }
+        })
+        orderIds.forEach(id=>{
+          orderLocationList.push({orderId: id})
+        })
       }
 
       tallyLocationUpdate({

src/views/ecw/productPrice/edit.vue

@@ -264,7 +264,7 @@
       <el-button @click="showLogs" type="primary" v-if="readonly">{{$t('查看价格日志')}}</el-button>
     </div>
 
-    <logs ref="logs"></logs>
+    <logs ref="logs" :unit-map="unitMap" :currency-map="currencyMap"></logs>
   </div>
 </template>
 <script>