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') && boxBackVO.pictures" style="marginTop:15px">
+      <h1>{{$t('图片')}}</h1>
+      <ImagePreview :src="boxBackVO.pictures" :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,28 +96,28 @@
 
 <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 {
       approvalInfo: {},
-      boxBackVO: {},
+      boxBackVO: { pictures: "" },
       loadDetail: {},
       // 柜型
       cabinetLabel: "",
@@ -155,7 +160,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 +195,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");
           }
         }
       };