From abe84ba77a867d4f755199021f9b6e10e3af971b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 七月 2024 16:29:27 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a6-standard-material-requisition.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/components/view/a6-standard-material-requisition.vue b/src/components/view/a6-standard-material-requisition.vue
index 452fd5d..6fdfaf7 100644
--- a/src/components/view/a6-standard-material-requisition.vue
+++ b/src/components/view/a6-standard-material-requisition.vue
@@ -38,7 +38,7 @@
<div style="width: 100%;height: 100%;">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">鏍囧噯鐗╄川棰嗙敤</el-col>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">鏍囧噯鐗╄川棰嗙敤</el-col>
<el-col :span="12" style="text-align: right;">
<el-button size="medium" type="primary" @click="$refs['ValueTable'].openAddDia('鏂板鎺ュ彛')" v-if="addPower">鏂� 澧�</el-button>
<el-button size="medium" @click="$refs['ValueTable'].openDownDia()">瀵� 鍑�</el-button>
--
Gitblit v1.9.3