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

src/views/bpm/processInstance/detail.vue

@@ -256,10 +256,12 @@ export default {
         unload_container: {
           component: "shippingDetail",
           processId: this.processInstance.businessKey,
+          type: "unload_container",
         },
         close_container: {
           component: "shippingDetail",
           processId: this.processInstance.businessKey,
+          type: "close_container",
         },
         shipment_preassemble: {
           component: "shippingDetail",

src/views/ecw/box/indexSea.vue

@@ -119,7 +119,7 @@
               {{$t('操作')}}<i class="el-icon-arrow-down el-icon--right"></i>
             </el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit">{{$t('编辑')}}</el-dropdown-item>
+              <!-- <el-dropdown-item :disabled="scope.row.ldStatus>=46" command="edit">{{$t('编辑')}}</el-dropdown-item> -->
               <el-dropdown-item command="sea">{{$t('操作-海运')}}</el-dropdown-item>
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>

src/views/ecw/box/query.vue

@@ -5,7 +5,7 @@
         <div style="display: flex; justify-content: space-between;align-items: flex-end;">
           <h2>{{$t('出货详情')}}</h2>
           <div>
-            <el-button size="small" @click="handleCommand('edit')">{{$t('编辑')}}</el-button>
+            <!-- <el-button size="small" @click="handleCommand('edit')">{{$t('编辑')}}</el-button> -->
             <el-button size="small" @click="handleCommand('router')">{{$t('操作')}}</el-button>
             <el-button type="primary" size="small" @click="handleCommand('error')">{{$t('异常登记')}}</el-button>
             <el-button type="primary" size="small" @click="handleCommand('cost')">{{$t('费用登记')}}</el-button>

src/views/ecw/box/shippingDetail.vue

@@ -31,6 +31,11 @@
       </div>
     </div>
 
+    <div v-if="(type === 'unload_container' || type === 'close_container') && srcStrs" style="marginTop:15px">
+      <h1>{{$t('图片')}}</h1>
+      <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>
       <el-descriptions :column="6" border>
         <el-descriptions-item :label="$t('自编号')">{{boxBackVO.selfNo}}</el-descriptions-item>
@@ -91,23 +96,23 @@
 
 <script>
 import { approvalDetail } from "@/api/ecw/box";
-import {
-  getSeaStatus,
-  getTotlContent,
-} from "./shippingSea/utils";
+import { getSeaStatus, getTotlContent } from "./shippingSea/utils";
 import { getCabinetPage } from "@/api/ecw/cabinet";
 import { getChannelList } from "@/api/ecw/channel";
 import Decimal from "decimal.js";
+import ImagePreview from "@/components/ImagePreview";
 
 /**
  * 出货审核详情
  */
 export default {
   name: "shippingDetail",
+  components: { ImagePreview },
   props: {
     processId: {
       type: [Number, String],
     },
+    type: String,
   },
   data() {
     return {
@@ -123,6 +128,7 @@ export default {
         title: "",
         visible: false,
       },
+      srcStrs: "",
     };
   },
   created() {
@@ -136,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 ?? '';
+        }
       });
     },
     /* 获取柜型 */
@@ -155,7 +170,7 @@ export default {
       this.$set(
         this.dialogConfig,
         "title",
-        `${this.boxBackVO.selfNo} ` + this.$t('订单列表')
+        `${this.boxBackVO.selfNo} ` + this.$t("订单列表")
       );
       this.$set(this.dialogConfig, "visible", true);
     },
@@ -190,7 +205,7 @@ export default {
       return (shippingChannelId) => {
         for (const channelItem of this.channelList) {
           if (channelItem.channelId == shippingChannelId) {
-            return this.$l(channelItem, 'name');
+            return this.$l(channelItem, "name");
           }
         }
       };

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

@@ -201,7 +201,7 @@ import {
   getOrderWarehouseIn,
   getSpecialListByOrderId, listByOrderId,
   orderWarehouseInFinish, orderWarehouseInUpdateLabel,
-  rollbackDelete
+  rollbackDelete, warehousePictureList
 } from '@/api/ecw/order'
 import orderBaseInfo from "@/components/OrderBaseInfo"
 import WarehouseAreaDialog from '@/components/WarehouseAreaDialog'
@@ -286,6 +286,14 @@ export default {
   },
 
   methods: {
+    getWarehousePictureList(){
+      return warehousePictureList({
+        bizId: this.order.orderId,
+        type: 1
+      }).then(r =>{
+        this.form.urls = r.data.map(i =>i.url)
+      })
+    },
     include(){
       return (state, arr) => {
         return arr.indexOf(state) > -1
@@ -345,6 +353,7 @@ export default {
         this.getTowSum()
       }).then(() => {
         this.getLabelByOrder()
+        this.getWarehousePictureList()
       })
     },
     specialHas0(){