From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突
---
src/views/quality/teststandard/index.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index 52b4d38..1398ad8 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -24,7 +24,7 @@
<el-col :span="8">
<span>鏍囧噯鍙傛暟</span>
</el-col>
- <el-col :span="8" :offset="4">
+ <!-- <el-col :span="8" :offset="4">
<el-button
v-if="permissions.quality_teststandard_layout"
style="float: right; padding: 3px 0"
@@ -33,8 +33,8 @@
>
甯冨眬
</el-button>
- </el-col>
- <el-col :span="2">
+ </el-col> -->
+ <el-col :span="14">
<el-button
style="float: right; padding: 3px 0"
type="text"
@@ -382,7 +382,7 @@
return this.getInspectionTypeOptionList()
}
},
- {
+ /* {
minWidth: '120',
prop: 'operationName',
label: '宸ュ簭鍚嶇О',
@@ -390,7 +390,7 @@
isTrue: true,
isSearch: true,
searchInfoType: 'text'
- },
+ }, */
{
minWidth: '120',
prop: 'state',
--
Gitblit v1.9.3