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

src/views/ecw/box/shippingDetail.vue

@@ -31,9 +31,9 @@
       </div>
     </div>
 
-    <div v-if="(type === 'unload_container' || type === 'close_container') && boxBackVO.pictures" style="marginTop:15px">
+    <div v-if="(type === 'unload_container' || type === 'close_container') && srcStrs" style="marginTop:15px">
       <h1>{{$t('图片')}}</h1>
-      <ImagePreview :src="boxBackVO.pictures" :width="146" :height="146" />
+      <ImagePreview :src="srcStrs" :width="146" :height="146" />
     </div>
 
     <el-dialog :title="dialogConfig.title" :visible.sync="dialogConfig.visible" fullscreen :modal-append-to-body=false append-to-body>
@@ -117,7 +117,7 @@ export default {
   data() {
     return {
       approvalInfo: {},
-      boxBackVO: { pictures: "" },
+      boxBackVO: {},
       loadDetail: {},
       // 柜型
       cabinetLabel: "",
@@ -128,6 +128,7 @@ export default {
         title: "",
         visible: false,
       },
+      srcStrs: "",
     };
   },
   created() {
@@ -141,6 +142,15 @@ export default {
         this.approvalInfo = res.data.approvalInfo;
         this.boxBackVO = res.data.boxBackVO;
         this.loadDetail = res.data.loadDetail;
+        if (this.type === "close_container" && res.data.cabinetVO) {
+          const ldPictures = res.data.cabinetVO.ldPictures
+            ? JSON.parse(res.data.cabinetVO.ldPictures)
+            : [];
+          this.srcStrs = ldPictures.map((item) => item.url).join(",");
+        }
+        if (this.type === "unload_container" && res.data.cabinetUnloadVO) {
+          this.srcStrs = res.data.cabinetUnloadVO.ulImgs ?? '';
+        }
       });
     },
     /* 获取柜型 */

src/views/ecw/order/batchSingleApplication.vue

@@ -118,6 +118,10 @@
                 <warehouse-video-list :modal="false" :status="3" :item ="row"></warehouse-video-list>
               </template>
             </el-table-column>
+            <el-table-column :label="$t('调拨出仓备注')" prop="arrivalRemark">
+            </el-table-column>
+            <el-table-column :label="$t('调拨到仓备注')" prop="deliveryRemark">
+            </el-table-column>
           </el-table>
       </el-card>
       <el-divider contentPosition="left">{{$t('审批流程')}}</el-divider>

src/views/ecw/order/transferWarehousing.vue

@@ -74,6 +74,10 @@
           <warehouse-video-list :status="3" :item ="row"></warehouse-video-list>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('调拨出仓备注')" prop="arrivalRemark">
+      </el-table-column>
+      <el-table-column :label="$t('调拨到仓备注')" prop="deliveryRemark">
+      </el-table-column>
     </el-table>
     <el-descriptions style="margin-top: 20px" :column="4" border>
       <el-descriptions-item :label="$t('集运仓库')">{{ warehouseDetails && warehouseDetails.warehouseOutName  ?  warehouseDetails.warehouseOutName : '' }}</el-descriptions-item>