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

src/views/ecw/channel/componrnts/packaging-type.vue

@@ -4,7 +4,7 @@
     <el-row type="flex" align="align" :gutter="10" >
       <el-col :span="6">{{$t('空运订单重量上限')}}(kg)</el-col>
       <el-col :span="6" >
-        <el-input-number v-model="value1.airWeightLimit"  controls-position="right"   :max="screenCom"></el-input-number>
+        <el-input-number v-model="value1.airWeightLimit"  controls-position="right"  ></el-input-number>
 <!--        <el-input type="number" :max="2000"   v-model="value1.airWeightLimit"></el-input>-->
       </el-col>
       <el-col :span="6">

src/views/ecw/order/components/PackHistoryDetail.vue

@@ -75,12 +75,16 @@
                 {{getLocationName(row.orderLocationBackVOList)}}
               </template>
             </el-table-column>
-            <el-table-column :label="$t('入仓影像')" prop="orderLocationBackVOList" >
+<!--            <el-table-column :label="$t('入仓影像')" prop="orderLocationBackVOList" >
               <template slot-scope="{row}">
                <el-button type="primary" @click="seeMv(orderWarehouseInContent.pictureUrls)">{{$t('查看')}}</el-button>
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
+          <div  style="margin:20px 0;font-size:16px;font-weight:600">
+            {{$t('打包前入仓影像')}}
+          </div>
+          <image-and-video-upload v-if="orderWarehouseInContent.pictureUrls" readonly :fileSize="50" :isShowTip="true" :value="orderWarehouseInContent.pictureUrls" ></image-and-video-upload>
       </el-card>
       <el-card style="margin-bottom:10px">
           <div slot="header" class="card-title">
@@ -131,12 +135,16 @@
                 {{getLocationName(row.orderLocationBackVOList)}}
               </template>
             </el-table-column>
-            <el-table-column :label="$t('入仓影像')" prop="orderLocationBackVOList" >
+ <!--           <el-table-column :label="$t('入仓影像')" prop="orderLocationBackVOList" >
               <template slot-scope="{row}">
                 <el-button type="primary" @click="seeMv(warehouseItem.pictureUrls)">{{$t('查看')}}</el-button>
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
+          <div  style="margin:20px 0;font-size:16px;font-weight:600">
+             {{$t('打包后入仓影像')}}
+          </div>
+          <image-and-video-upload v-if="warehouseItem.pictureUrls" readonly :fileSize="50" :isShowTip="true" :value="warehouseItem.pictureUrls" ></image-and-video-upload>
       </el-card>
       <el-card style="margin-bottom:10px">
         <el-descriptions :title="$t('打包数据')" :column="2" :labelStyle="{width:'120px'}">
@@ -151,8 +159,8 @@
       <el-button type="primary" @click="closeDialog">{{$t('关闭窗口')}}</el-button>
 
     </el-dialog>
-    <el-dialog :title="$t('入仓影像')" :visible.sync="mvShow" :before-close="closeMv" :close-on-click-modal="false" width="600px">
-      <div style="display:flex;flex-wrap:wrap">
+    <el-dialog :title="$t('入仓影像')" :visible.sync="mvShow" :before-close="closeMv" :close-on-click-modal="false">
+<!--      <div style="display:flex;flex-wrap:wrap">
         <div v-for="(item, index) in pictureUrls" :index="index" :key="index" style="width:80px;height:80px">
             <img v-if="item.type === 'image'" :src="item.url" mode="scaleToFill" style="height: 100%" @tap="previewImage(item.url)" />
             <video v-else-if="item.type === 'video'" :id="`video_${index}`" style="width: 100%;height: 100%" :src="item.url" @play="playVideo(index)" @tap="playVideo(index)" @fullscreenchange="fullscreenchange"></video>
@@ -160,7 +168,8 @@
       </div>
       <div v-if="pictureUrls.length==0">
         <span>{{$t('暂无影像')}}</span>
-      </div>
+      </div> -->
+      <image-and-video-upload readonly :fileSize="50" :isShowTip="true" :value="pictureUrls" ></image-and-video-upload>
     </el-dialog>
     <el-dialog :title="$t('箱明细')" :visible.sync="boxShow" :before-close="closeBox" :close-on-click-modal="false" width="800px">
        <el-form>
@@ -180,10 +189,11 @@ import { DICT_TYPE } from '@/utils/dict'
 import { parseTime } from '@/utils/ruoyi'
 import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
 import {getProductAttrList} from '@/api/ecw/productAttr'
+import ImageAndVideoUpload from '@/components/ImageAndVideoUpload'
 import WarehouseRecordDetailItem from "@/views/ecw/order/warehousing/components/WarehouseRecordDetailItem.vue";
 export default {
   components: {
-    WarehouseAreaSelect,WarehouseRecordDetailItem
+    WarehouseAreaSelect,WarehouseRecordDetailItem,ImageAndVideoUpload
   },
     filters: {parseTime},
     props:{
@@ -289,12 +299,7 @@ export default {
         seeMv(list){
           this.mvShow=true
           if(list){
-            this.pictureUrls = list.map(e => {
-              return {
-                url: e,
-                type: this.isImageFile(e) ? 'image' : 'video',
-              }
-            })
+            this.pictureUrls = list
           }else{
             this.pictureUrls = []
           }