From 34c7760746a49b90fa290bb3b342dbc1f51ed8ac Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 14 十二月 2023 10:18:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/stock/procure/purchaseOrder/index.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/index.vue b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
index 13d4749..008f32d 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/index.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
@@ -10,7 +10,8 @@
<el-col>
<!--鍒楄〃-->
<div class="table-tool-bar" style="margin-bottom: 15px">
- <my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
+<!-- <my-button name="鏂板" check-permission="procure:order:add" @click="handleAdd" site="tools" size="medium" />-->
+ <my-button name="鏂板" check-permission="procure:order:add" @click="handleAdd" site="tools" size="medium" />
<my-button name="瀵煎叆" @click="importSetting.dialogShow = true" site="tools" size="medium" />
</div>
<div v-loading="loading" style="margin-bottom: 15px">
@@ -50,7 +51,7 @@
</div>
</div>
<div class="one-hed">
- <div class="box"><span class="span-two">鏈烘瀯锛�</span>{{ item.agencyId }}</div>
+ <div class="box"><span class="span-two">鏈烘瀯锛�</span>{{ item.agencyName }}</div>
<div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.buyerName }}</div>
<div class="box">
<span class="span-two">閲囪喘鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
--
Gitblit v1.9.1