调仓明细列表

src/views/ecw/order/batchSingleApplication.vue

@@ -88,10 +88,26 @@
                      :key="index"></el-option>
         </el-select></el-col>
       </el-row>
-      <el-divider></el-divider>
-      <h1 class="title">
-        审批流程
-      </h1>
+      <el-divider contentPosition="left">调仓明细</el-divider>
+      <el-card class="box-card">
+          <el-table :data="warehouseList">
+            <el-table-column label="调仓编号" prop="id"></el-table-column>
+            <el-table-column label="调出仓库" prop="warehouseOutName" ></el-table-column>
+            <el-table-column label="调入仓库" prop="warehouseInName"></el-table-column>
+            <el-table-column label="申请人" prop="creatorName"></el-table-column>
+            <el-table-column label="申请时间">
+              <template v-slot="{row}">
+                {{parseTime(row.createTime)}}
+              </template>
+            </el-table-column>
+            <el-table-column label="状态">
+              <template v-slot="{row}">
+                {{STATUS[row.status]}}
+              </template>
+            </el-table-column>
+          </el-table>
+      </el-card>
+      <el-divider contentPosition="left">审批流程</el-divider>
       <div style="padding: 20px">
         <work-flow xmlkey="warehouse_transfer" v-model="params.copyUserId"/>
       </div>
@@ -120,7 +136,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";
+import {getAdjustInfo, getOrderPage} from "@/api/ecw/order";
 import workFlow from "@/components/WorkFlow";
 import Template from "@/views/cms/template";
 import {arrryToKeyedObjectBy} from "@/utils";
@@ -142,11 +158,16 @@ export default {
   },
   created() {
     getChannelList().then(res => this.channelList = res.data)
+
     },
+
   watch: {
     dialogVisible(val) {
       if (val) {
         this.getOrderListFn()
+        getAdjustInfo({orderId:this.orderList,lang:0}).then(r => {
+          this.warehouseList = r.data
+        })
       } else {
         this.params = {
           orderIds: undefined,
@@ -175,6 +196,7 @@ export default {
   },
   data() {
     return {
+      STATUS : {1:'申请中', 2:'通过', 3:'不通过', 4:'已取消', 5:'已出仓',6:'已到仓'},
       list: [],
       selectedUsers: [],
       availableWarehouse: [],
@@ -188,7 +210,8 @@ export default {
         copyUserId: [],
       },
       applyStatus:{},//调仓-查看状态,
-      channelList:[]
+      channelList:[],
+      warehouseList:[]
 
     }
   },