Merge pull request 'lixuan' (#3) from lixuan into master
Reviewed-on: #3
This commit was merged in pull request #3.
This commit is contained in:
@@ -134,7 +134,7 @@
|
||||
<el-link type="primary" :underline="false" @click="detail(row)"
|
||||
>详情</el-link
|
||||
>
|
||||
<el-link v-show="row.orderStatus!=='SUBMITED'&&row.orderStatus!=='ORDER_LOCKED'&&row.payStatus!=='REFUNDED'" type="primary" :underline="false" @click="billOfLading(row)"
|
||||
<el-link v-show="row.orderStatus!=='SUBMITED'&&row.orderStatus!=='ORDER_LOCKED'" type="primary" :underline="false" @click="billOfLading(row)"
|
||||
>提货单</el-link
|
||||
>
|
||||
<el-popconfirm
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
<div class="table">
|
||||
<div class="operation">
|
||||
<!-- <el-button @click="addition">新增炼厂账户</el-button> -->
|
||||
<el-button @click="addition">充值</el-button>
|
||||
<!-- <el-button @click="addition">充值</el-button> -->
|
||||
</div>
|
||||
<el-table
|
||||
v-if="tableHeight"
|
||||
|
||||
Reference in New Issue
Block a user