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

Reviewed-on: #3
Merge branch 'master' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin into lixuan
2023-02-28 03:22:52 +00:00 · 2023-02-28 11:22:18 +08:00 · 2023-02-28 11:22:08 +08:00
2 changed files with 2 additions and 2 deletions
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -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
--- a/src/views/refineryAccount/index.vue
+++ b/src/views/refineryAccount/index.vue
@@ -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"
Author	SHA1	Message	Date
李轩	2f54891e52	Merge pull request 'lixuan' (#3 ) from lixuan into master Reviewed-on: #3	2023-02-28 03:22:52 +00:00
lixuan	f1155ab567	Merge branch 'master' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin into lixuan	2023-02-28 11:22:18 +08:00
lixuan	f0013e66a4	xiugai	2023-02-28 11:22:08 +08:00