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

src/components/ImageAndVideoUpload/index.vue

@@ -5,10 +5,11 @@
      <el-image @click="dialogImageUrl = item.url; dialogVisible = true; "    style="height: 148px; width:148px;" fit="fit" :src="item.url">
        <video controls width="148px" height="148px" slot="error" :src="item.url" ></video>
      </el-image>
-     <div @click="handleRemove(index)" class="el-icon-error" style="font-size: 25px;cursor: pointer;position: absolute;right: -10px; top: -10px" ></div>
+     <div v-if="!readonly" @click="handleRemove(index)" class="el-icon-error" style="font-size: 25px;cursor: pointer;position: absolute;right: -10px; top: -10px" ></div>
    </div>
   <div>
     <el-upload
+      v-if="!readonly"
       multiple
       :action="uploadImgUrl"
       list-type="picture-card"
@@ -23,7 +24,7 @@
       <i class="el-icon-plus"></i>
     </el-upload>
     <!-- 上传提示 -->
-    <div class="el-upload__tip" slot="tip" v-if="showTip">
+    <div class="el-upload__tip" slot="tip" v-if="showTip && !readonly">
       {{ $t('请上传') }}
       <template v-if="fileSize">{{ $t('大小不超过') }}<b style="color: #f56c6c">{{ fileSize }}MB</b> </template> <br>
       <template v-if="fileType">{{ $t('格式为') }}<b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>{{ $t('的文件') }}</div>
@@ -63,6 +64,10 @@ export default {
     isShowTip: {
       type: Boolean,
       default: true
+    },
+    readonly: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

src/views/ecw/order/warehousing/index.vue

@@ -158,6 +158,15 @@
           <span slot="append">kg</span>
         </el-input>
       </el-form-item>
+
+      <el-card style="margin-top: 15px;">
+        <div slot="header" class="clearfix">
+          <span style="font-size: 18px">{{$t('入仓影像')}}</span>
+        </div>
+        <div>
+          <image-and-video-upload readonly :fileSize="50" :isShowTip="true" :value="[...form.urls, ...this.orderItemList.map(e => e.pictureUrls).flat()]" ></image-and-video-upload>
+        </div>
+      </el-card>
       <div style="text-align: center;margin-top: 15px" v-if="!(order.status !== 3 && isEdit)">
         <el-button @click="escapeBol = true;" type="primary">{{$t('转异')}}</el-button>
         <el-button type="primary" @click="finishVisible = true">{{$t('完成入仓')}}</el-button>
@@ -222,6 +231,7 @@ import PrintTag from "@/views/ecw/order/components/PrintTag"
 import PrintWarehouseReceipt from "@/views/ecw/order/components/PrintWarehouseReceipt"
 import imageUpload from "@/components/ImageUpload";
 import {parseTime} from "@/utils/ruoyi"
+import ImageAndVideoUpload from '@/components/ImageAndVideoUpload'
 import Warehouse from "@/views/ecw/order/warehousing/components/Warehouse"
 export default {
   name: "Warehousing",
@@ -232,6 +242,7 @@ export default {
     PrintTag,
     PrintWarehouseReceipt,
     imageUpload,
+    ImageAndVideoUpload,
     Warehouse
   },