xiaozhiyong/refinery-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'lixuan' (#3) from lixuan into master

Browse Source 
Reviewed-on: #3
This commit was merged in pull request #3.
This commit is contained in:
李轩
2023-02-28 03:22:52 +00:00
parent ecaadfc5d1 f1155ab567
commit 2f54891e52
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/order/index.vue
View File

@@ -134,7 +134,7 @@
<el-link type="primary" :underline="false" @click="detail(row)" <el-link type="primary" :underline="false" @click="detail(row)"
>详情</el-link >详情</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-link
> >
<el-popconfirm <el-popconfirm

2
src/views/refineryAccount/index.vue
View File

@@ -36,7 +36,7 @@
<div class="table"> <div class="table">
<div class="operation"> <div class="operation">
<!-- <el-button @click="addition">新增炼厂账户</el-button> --> <!-- <el-button @click="addition">新增炼厂账户</el-button> -->
<el-button @click="addition">充值</el-button> <!-- <el-button @click="addition">充值</el-button> -->
</div> </div>
<el-table <el-table
v-if="tableHeight" v-if="tableHeight"