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

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

@@ -25,7 +25,7 @@
               <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="()=>tallyClick('batch')">{{$t('批量理货')}}</el-button>
               <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="()=>removeClick('batch')">{{$t('批量移出')}}</el-button>
             </div>
-            <div v-if="false">
+            <div>
               <template>
                 <el-input v-model="qrCode" :placeholder="$t('请输入二维码/条码编号')" clearable></el-input>
                 <el-button type="primary" @click="handlerBatchCreate()">{{$t('确定')}}</el-button>

src/views/ecw/order/stocking/components/MediaDialog.vue

@@ -40,7 +40,7 @@ export default {
 </script>
 
 <template>
-  <el-dialog :visible.sync="show" :before-close="onBeforeClose" append-to-body title="$t('查看影像')">
+  <el-dialog :visible.sync="show" :before-close="onBeforeClose" append-to-body :title="$t('查看影像')">
     <image-and-video-upload v-model="pictureUrls" readonly></image-and-video-upload>
   </el-dialog>
 </template>