Commit 9a544b3b authored by dcy's avatar dcy

审批流程,组件展示

parent 04e69419
...@@ -69,7 +69,24 @@ ...@@ -69,7 +69,24 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-descriptions v-else :column="4" border> <el-descriptions v-else-if="type === 2" :column="4" border>
<el-descriptions-item label="订单号">{{FeeDetails.orderBackVO.orderNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="FeeDetails.orderBackVO.transportId"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="出货方式">
{{selectChannel(FeeDetails.channelId)}}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<dict-tag :type="DICT_TYPE.ORDER_ABNORMAL_STATE" :value="FeeDetails.orderBackVO.abnormalState"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="唛头">
{{FeeDetails.orderBackVO.marks}}
</el-descriptions-item>
<el-descriptions-item label="始发仓">{{FeeDetails.startWarehouse}}</el-descriptions-item>
<el-descriptions-item label="目的仓">{{FeeDetails.destWarehouse}}</el-descriptions-item>
</el-descriptions>
<el-descriptions v-else-if="type === 3" :column="4" border>
<el-descriptions-item label="订单号">{{FeeDetails.orderNo}}</el-descriptions-item> <el-descriptions-item label="订单号">{{FeeDetails.orderNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式"> <el-descriptions-item label="运输方式">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="FeeDetails.transportId"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="FeeDetails.transportId"></dict-tag>
...@@ -83,8 +100,8 @@ ...@@ -83,8 +100,8 @@
<el-descriptions-item label="唛头"> <el-descriptions-item label="唛头">
{{FeeDetails.marks}} {{FeeDetails.marks}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="始发仓">{{FeeDetails.startWarehouse}}</el-descriptions-item> <el-descriptions-item label="始发仓">{{FeeDetails.logisticsInfoDto.startTitleZh}}</el-descriptions-item>
<el-descriptions-item label="目的仓">{{FeeDetails.destWarehouse}}</el-descriptions-item> <el-descriptions-item label="目的仓">{{FeeDetails.logisticsInfoDto.destTitleZh}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<div v-if="type === 1"> <div v-if="type === 1">
<p> <p>
...@@ -134,7 +151,10 @@ export default { ...@@ -134,7 +151,10 @@ export default {
name: "warehouseDetails", name: "warehouseDetails",
data(){ data(){
return{ return{
FeeDetails:{}, FeeDetails:{
orderBackVO:{},
logisticsInfoDto:{}
},
transfer:{}, transfer:{},
warehouseList:[], warehouseList:[],
channelList:[], channelList:[],
...@@ -189,6 +209,7 @@ export default { ...@@ -189,6 +209,7 @@ export default {
// 费用申请 // 费用申请
applicationGetOrderByProcessId({processId:this.processInstanceID}).then(r => { applicationGetOrderByProcessId({processId:this.processInstanceID}).then(r => {
this.FeeDetails = r.data this.FeeDetails = r.data
console.log(this.FeeDetails,'FeeDetails')
}) })
break; break;
case 3: case 3:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment