调仓详情

src/views/ecw/order/batchSingleApplication.vue

@@ -79,6 +79,7 @@
       <el-button style="margin-right: 50px" @click="submit"  :disabled="isSubmit">提交申请</el-button>
       <el-button @click="$router.push('/order/order')">取消</el-button>
     </div>
+<!--    <warehouseDetails></warehouseDetails>-->
   </div>
 </template>
 
@@ -91,6 +92,7 @@ import {
 } from "@/api/ecw/batchSingleApplication";
 import {getProcessDefinitionBpmnXMLByKey} from "@/api/bpm/definition";
 import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
+import {getOrderPage} from "@/api/ecw/order";
 export default {
   name: "batchSingleApplication",
   props:{
@@ -100,8 +102,10 @@ export default {
     warehouseDetails
   },
   created() {
-      this.list = JSON.parse(this.orderList);
+    getOrderPage({orderIdList:this.orderList}).then(r =>{
+      this.list = r.data.list
       warehouseAdjustmentList({id:this.list[0].startWarehouseId}).then( r =>  this.availableWarehouse = r.data)
+    })
      getProcessDefinitionBpmnXMLByKey("warehouse_transfer").then(response => {
       this.bpmnXML = response.data
     })

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

@@ -3,42 +3,67 @@
   <h1>
     申请信息【订单信息】
   </h1>
-  <el-table  v-if="type === 1">
+  <el-table :data="list"  v-if="type === 1">
     <el-table-column
+      prop="orderNo"
       label="订单编号">
     </el-table-column>
     <el-table-column
+      prop="marks"
       label="唛头">
     </el-table-column>
     <el-table-column
       label="已到箱数/总箱数">
+       <template v-slot="{row}">
+        {{row.sumNum}}/{{row.totalNum}}
+       </template>
     </el-table-column>
     <el-table-column
       label="下单统计">
+      <template v-slot="{row}">
+        <div v-if="row.costVO">
+          箱数：{{row.costVO.totalNum}}
+          {{row.costVO.totalVolume}}m³
+          {{row.costVO.totalWeight}}kg
+        </div>
+      </template>
     </el-table-column>
     <el-table-column
       label="入仓统计">
+       <template v-slot="{row}">
+         <div>总箱数：{{row.totalNum}}</div>
+         <div>体积：{{row.sumVolume}}CBM </div>
+         <div>重量：{{row.sumWeight}}kg</div>
+       </template>
     </el-table-column>
     <el-table-column
       label="入仓时间">
     </el-table-column>
     <el-table-column
       label="运输方式">
+      <template v-slot = {row}>
+        <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
+      </template>
     </el-table-column>
     <el-table-column
       label="出货渠道">
+
     </el-table-column>
-    <el-table-column
-    label="始发仓">
-  </el-table-column>
-    <el-table-column
-    label="目的地">
-  </el-table-column>
+    <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>
+    <el-table-column label="目的地" prop="objectiveName"></el-table-column>
     <el-table-column
     label="发货人">
   </el-table-column>
     <el-table-column
       label="收货人">
+      <template v-slot="{row}">
+        <p>
+          {{row.consigneeName}}
+        </p>
+        <p>
+          {{row.consigneePhone}}
+        </p>
+      </template>
     </el-table-column>
   </el-table>
   <el-descriptions  v-else :column="4" border>
@@ -88,9 +113,11 @@ import {
   warehouseApprovalGetById,
   warehouseAreaPositionList
 } from "@/api/ecw/batchSingleApplication";
-import {applicationGetOrderByProcessId, feeApplicationGet, getOrder,} from "@/api/ecw/order";
+import {applicationGetOrderByProcessId, feeApplicationGet, getOrder, getOrderPage,} from "@/api/ecw/order";
 import { getChannelList } from '@/api/ecw/channel';
+import Template from "@/views/cms/template";
 export default {
+  components: {Template},
   props:{
     type:{
       type: Number,
@@ -107,13 +134,13 @@ export default {
       transfer:{},
       warehouseList:[],
       channelList:[],
-      processInstanceID:undefined
+      processInstanceID:undefined,
+      list:[]
     }
   },
   created() {
     getChannelList().then(r => this.channelList = r.data);
     warehouseAreaPositionList().then(r => this.warehouseList = r.data)
-
        if(this.type === 2){
          feeApplicationGet({id:this.processId}).then(r => {
            if(r.code === 0){
@@ -148,6 +175,9 @@ export default {
           warehouseApprovalGetByFormId({formId:this.processInstanceID}).then( r => {
             this.FeeDetails = r.data
             this.FeeDetails.details = JSON.parse(r.data.details)
+            getOrderPage({orderIdList:r.data.orderIds}).then(res=>{
+              this.list = res.data.list
+            })
 
           });
           break;

src/views/ecw/order/index.vue

@@ -200,7 +200,7 @@
                 v-hasPermi="['ecw:order:update']">入仓</el-button>
               <el-button size="mini" type="text" icon="el-icon-edit" @click= "$router.push(`/order/withdrawal/${scope.row.orderId}`)"
                 v-hasPermi="['ecw:order:update']">退仓</el-button>
-              <el-button type="text" v-if="scope.row.status === 5"  size="mini" @click="$router.push({path:'/order/batch-single-application',query:{list:JSON.stringify([scope.row])}})" >调仓</el-button>
+              <el-button type="text" v-if="scope.row.status === 5"  size="mini" @click="$router.push({path:'/order/batch-single-application',query:{list:scope.row.orderId}})" >调仓</el-button>
             </div>
 
           </el-popover>
@@ -452,12 +452,11 @@ export default {
       this.ids = selection.map(item => item.orderId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
-      this.adjustmentList = selection;
     },
     handleEdit() {
       this.$router.push({
         path:'/order/batch-single-application',
-        query:{list:JSON.stringify(this.adjustmentList)}
+        query:{list:this.ids.join(',')}
       })
     },
     moleculeChange() { },