Authored by htoooth

fix

<template>
<LayoutBody>
<div>
<Button type="primary" @click="back">返回发货物流列表</Button>
<span>物流单号:{{id}}</span>
<span>发货时间:{{sendTime}}</span>
<div class="order-info">
<span>物流单号:{{id}}</span> <span>发货时间:{{sendTime}}</span>
<div>发往:{{storeroomName}} {{address}} {{adminName}}</div>
</div>
<LayoutAction>
发往:{{storeroomName}} {{address}} {{adminName}}
<Button type="primary" @click="back">返回入库物流列表</Button>
</LayoutAction>
<LayoutList>
... ... @@ -125,6 +124,11 @@
};
</script>
<style>
<style lang="scss" scoped>
.order-info {
display: inline-block;
height: 50px;
margin-right: 10px;
font-size: 15px;
}
</style>
... ...
... ... @@ -7,7 +7,8 @@
</LayoutFilter>
<LayoutAction>
<Button type="primary" @click="onClickCreate" :disabled="this.selection.length === 0">发货</Button>
<Button type="error" @click="onClickCreate" :disabled="this.selection.length === 0">发货</Button>
<Button type="primary" @click="back">返回发货入库列表</Button>
</LayoutAction>
<LayoutList>
... ... @@ -69,6 +70,11 @@
},
onOrderChange(data) {
this.info = data;
},
back() {
this.$router.push({
name: 'repository.invoice.list'
});
}
},
components: {
... ...
... ... @@ -76,11 +76,22 @@ let tableCols = function() {
return '发货进度<br/> 已发数/采购数 ';
},
render: (h, params) => {
let percent = 0;
if (params.row.sendNum && params.row.totalNum) {
percent = params.row.sendNum / params.row.totalNum;
if (percent > 1) {
percent = 100;
} else {
percent *= 100;
}
}
return (
<div>
<div><i-progress percent={ params.row.sendNum / params.row.totalNum}
hide-info={true}></i-progress></div>
<div>{params.row.sendNum} / {params.row.totalNum}</div>
<div><i-progress percent={ percent} hide-info={true} ></i-progress></div>
<div>{params.row.sendNum || 0} / {params.row.totalNum || 0}</div>
</div>
);
},
... ... @@ -94,11 +105,23 @@ let tableCols = function() {
return '入库进度<br/> 已入库数/采购数';
},
render: (h, params) => {
let percent = 0;
if (params.row.inStoreNum && params.row.totalNum) {
percent = params.row.inStoreNum / params.row.totalNum;
if (percent > 1) {
percent = 100;
} else {
percent *= 100;
}
}
return (
<div>
<div><i-progress percent={ params.row.inStoreNum / params.row.totalNum}
<div><i-progress percent={ percent }
hide-info={true}></i-progress></div>
<div>{ params.row.inStoreNum } / {params.row.totalNum}</div>
<div>{ params.row.inStoreNum || 0} / {params.row.totalNum || 0}</div>
</div>
);
},
... ...
... ... @@ -84,7 +84,7 @@ let cols = function() {
if (!params.row.hasAdded) {
return (
<div class="action-btn-row">
<i-button type='warning' size="small" onClick={() => this.create(params)}> 加入 </i-button>
<i-button type='warning' size="small" onClick={() => this.create(params)}> 保存 </i-button>
</div>
);
} else {
... ... @@ -95,7 +95,7 @@ let cols = function() {
} else {
return (
<div class="action-btn-row">
<i-button type='primary' size="small" onClick={() => this.update(params)}> 保存 </i-button>
<i-button type='primary' size="small" onClick={() => this.update(params)}> 更新 </i-button>
<i-button type='error' size="small" onClick={() => this.delete(params)}> 删除 </i-button>
</div>
);
... ...