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

src/api/ecw/order.js

@@ -498,3 +498,10 @@ export function updateApply(data){
     data
   })
 }
+export function warehousePictureList(data){
+  return request({
+    url:'/order/warehouse-picture/list',
+    method:'post',
+    data
+  })
+}

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>
@@ -145,7 +145,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize" @pagination="getList" @current-change="pageChange" />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="dialogCfg.title" :visible.sync="dialogCfg.open" :width="dialogCfg.width" :fullscreen="dialogCfg.fullscreen" append-to-body class="shippingSea-dialog">
@@ -258,7 +258,7 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-        pageSize: 10,
+        rows: 10,
       },
       cabinetList: [],
       warehouseList: [],

src/views/ecw/box/indexSeaAir.vue

@@ -137,7 +137,7 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize" @pagination="getList" @current-change="pageChange" />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" @pagination="getList" />
 
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="dialogCfg.title" :visible.sync="dialogCfg.open" :width="dialogCfg.width" :fullscreen="dialogCfg.fullscreen" append-to-body class="shippingSea-dialog">
@@ -250,7 +250,7 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-        pageSize: 10,
+        rows: 10,
       },
       cabinetList: [],
       channelList: [],

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>
@@ -157,9 +157,9 @@
                   <dict-tag :type="DICT_TYPE.BOX_SHIPPING_TICKET_EXCEPTION" :value="scope.row.billAbnId" />
                 </template>
               </el-table-column>
-              <el-table-column prop="abnDetail" :label="$t('异常描述')" align="center" width="700"></el-table-column>
+              <el-table-column prop="abnDetail" :label="$t('异常描述')" align="center" width="300"></el-table-column>
               <el-table-column prop="delayDays" :label="$t('异常延迟天数')" align="center"></el-table-column>
-              <el-table-column prop="" :label="$t('异常时间')" align="center" width="300">
+              <el-table-column prop="" :label="$t('异常时间')" align="center" width="200">
                 <template slot-scope="scope">
                   <span v-if="scope.row.abnStartTime">{{formatDate(scope.row.abnStartTime)}} - </span>
                   <span v-if="scope.row.abnEndTime">{{formatDate(scope.row.abnEndTime)}}</span>

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/batchSingleApplication.vue

@@ -108,6 +108,20 @@
                 {{STATUS[row.status]}}
               </template>
             </el-table-column>
+            <el-table-column :label="$t('出仓影像')">
+              <template v-slot="{row}">
+                <warehouse-video-list :modal="false" :status="2" :item ="row"></warehouse-video-list>
+              </template>
+            </el-table-column>
+            <el-table-column :label="$t('入仓影像')">
+              <template v-slot="{row}">
+                <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>
@@ -145,6 +159,7 @@ import workFlow from "@/components/WorkFlow";
 import Template from "@/views/cms/template";
 import {arrryToKeyedObjectBy} from "@/utils";
 import {getChannelList} from "@/api/ecw/channel";
+import WarehouseVideoList from "@/views/ecw/order/components/warehouse-video-list.vue";
 
 export default {
   name: "batchSingleApplication",
@@ -156,6 +171,7 @@ export default {
     }
   },
   components: {
+    WarehouseVideoList,
     Template,
     warehouseDetails,
     workFlow

src/views/ecw/order/components/warehouse-video-list.vue

+<template>
+<div v-if="list.length">
+  <el-button type="text" @click="dialogVisible = true">查看图片</el-button>
+  <el-dialog
+    :modal="modal"
+    title="提示"
+    :visible.sync="dialogVisible"
+    width="50%">
+    <div style="display: flex;flex-wrap: wrap;">
+      <div v-for="item in list" style="padding: 10px"><el-image
+        style="width: 100px; height: 100px"
+        :src="item"
+        :preview-src-list="list">
+      </el-image></div>
+    </div>
+  </el-dialog>
+
+</div>
+</template>
+
+<script>
+import {warehousePictureList} from "@/api/ecw/order";
+
+export default {
+  props:{
+    item:{
+      type:Object,
+      default:{}
+    },
+    status:Number,
+    modal:{
+      type:Boolean,
+      default: true,
+    }
+  },
+  name: "warehouse-video-list",
+  data(){
+    return {
+      dialogVisible:false,
+      list:[],
+    }
+  },
+  mounted() {
+    this.warehousePictureListFn()
+    },
+  methods:{
+    warehousePictureListFn(){
+      let p = {bizId:this.item.id,type:this.status}
+      warehousePictureList(p).then(r =>{
+         this.list = r.data.map(i =>i.url)
+      })
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/order/components/warehouseDetails.vue

@@ -138,7 +138,7 @@
       <ol>
         <template v-for="item in FeeDetails.details.applyInfoVOList">
           <li v-if="item.orgValue === undefined">{{ item.name }}：{{ item.newValue }}</li>
-          <li v-else-if="item.newValue === undefined">{{ $t('删除入仓') }}</li>
+          <li v-else-if="item.newValue === undefined">{{ $t('删除入仓') }} 【{{ item.orgValue }}】</li>
           <li v-else-if="item.newValue !== item.orgValue">{{ item.name }}从【{{ item.orgValue }}】改为【{{ item.newValue }}】</li>
         </template>
       </ol>

src/views/ecw/order/transferWarehousing.vue

@@ -64,6 +64,20 @@
             {{STATUS[row.status]}}
         </template>
       </el-table-column>
+      <el-table-column :label="$t('出仓影像')">
+        <template v-slot="{row}">
+          <warehouse-video-list :status="2" :item ="row"></warehouse-video-list>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('到仓影像')">
+        <template v-slot="{row}">
+          <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>
@@ -164,9 +178,11 @@ import warehouseLocation from "@/components/WarehouseAreaDialog";
 import imageUpload from "@/components/ImageUpload";
 import {getProductBrankPage} from "@/api/ecw/productBrank";
 import {parseTime} from "@/utils/ruoyi";
+import WarehouseVideoList from "@/views/ecw/order/components/warehouse-video-list.vue";
 export default {
   name: "transferWarehousing",
   components: {
+    WarehouseVideoList,
     ImageAndVideoUpload,
     Template,
     ordeDetailsForm,

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(){