订单详情-增加查看入仓影像功能 / dev按品名入仓记录上传影像功能合并到release2.2-

https://zentao.test.jdshangmen.com/task-view-2633.html

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/components/Warehouse.vue

@@ -202,6 +202,16 @@
 
             </el-form>
           </el-card>
+
+
+          <el-card style="margin-top: 15px;">
+            <div slot="header" class="clearfix">
+              <span style="font-size: 18px">{{$t('入仓影像')}}</span>
+            </div>
+            <div>
+              <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form.pictureUrls" ></image-and-video-upload>
+            </div>
+          </el-card>
         </el-tab-pane>
 
 
@@ -407,6 +417,15 @@
             </el-form>
           </el-card>
 
+
+          <el-card style="margin-top: 15px;">
+            <div slot="header" class="clearfix">
+              <span style="font-size: 18px">{{$t('入仓影像')}}</span>
+            </div>
+            <div>
+              <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form1.pictureUrls" ></image-and-video-upload>
+            </div>
+          </el-card>
         </el-tab-pane>
       </el-tabs>
 
@@ -474,11 +493,13 @@ import {orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api/ecw/order"
 import {getProductAttrList} from "@/api/ecw/productAttr"
 import {getProductTypeList} from "@/api/ecw/productType"
 import {addProduct} from "@/api/ecw/product"
+import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index.vue"
 
 export default {
   name: "Warehouse",
 
   components: {
+    ImageAndVideoUpload,
     ProductSelector,
     WarehouseAreaSelect,
     WorkFlow
@@ -624,7 +645,8 @@ export default {
         prodType: undefined,
         type: undefined,
         feeType: undefined,
-        recordMode: undefined
+        recordMode: undefined,
+        pictureUrls: []
       },
       form1: {
         table: [],
@@ -642,7 +664,8 @@ export default {
         prodType: undefined,
         type: 1,
         feeType: undefined,
-        recordMode: undefined
+        recordMode: undefined,
+        pictureUrls: []
       },
       brandList: [],
       brandList1: [],
@@ -712,6 +735,7 @@ export default {
       this.form.prodType = this.warehousing.prodType
       this.form.type = this.warehousing.type
       this.form.feeType = this.warehousing.feeType
+      this.form.pictureUrls = this.warehousing.pictureUrls
 
       this.warehousing.orderWarehouseInBackItemDoList.forEach(e => {
         let bg = {}
@@ -943,11 +967,10 @@ export default {
       const form = val === 1 ? this.form1 : this.form
       const formLength = form.table.length
       let orderLocationBackVOList = []
-      // 不默认使用上一条记录的储位 https://zentao.test.jdshangmen.com/bug-view-3344.html
-      // 上面弄错了，默认使用上一条记录的储位 https://zentao.test.jdshangmen.com/bug-view-3484.html
+      /* // 不默认使用上一条记录的储位 https://zentao.test.jdshangmen.com/bug-view-3344.html
       if (formLength > 0) {
         orderLocationBackVOList = JSON.parse(JSON.stringify(form.table[formLength - 1].orderLocationBackVOList))
-      }
+      }*/
       form.table.push({
         "boxGauge1": this.isJiyun ? 0 : '',
         "boxGauge2": this.isJiyun ? 0 : '',

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

@@ -164,7 +164,7 @@
           <span style="font-size: 18px">{{$t('入仓影像')}}</span>
         </div>
         <div>
-          <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form.urls" ></image-and-video-upload>
+          <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)">