From f4ed5ae8873f65c36b5cf37be264f6ec1e154647 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 20 三月 2024 19:36:58 +0800
Subject: [PATCH] 合并分支冲突解决
---
src/views/purchaseManage/purchase/index.vue | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index a553df6..2283fa2 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -53,6 +53,12 @@
<el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
>鏌ョ湅</el-button
>
+ <!-- <el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
+ >鍒拌揣纭</el-button
+ >
+ <el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
+ >鍘昏川妫�</el-button
+ > -->
<el-button
v-if="scope.row.status === 1"
type="text"
--
Gitblit v1.8.0