From 52e18000ace434b2acdebce5e118c45c337a3fe7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 28 五月 2024 13:31:54 +0800
Subject: [PATCH] 合并冲突
---
src/views/quality/processconfiguration/index.vue | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 6d53f3e..197b3f4 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -47,6 +47,7 @@
<el-radio label="鎶ュ簾">鎶ュ簾</el-radio>
</div>
<div style="padding: 20px;">
+ <el-radio label="杩斿伐">杩斿伐</el-radio>
<el-radio label="闄嶄负浠栫敤">闄嶄负浠栫敤</el-radio>
</div>
</el-row>
@@ -169,6 +170,18 @@
// render: { fun: this.addOrUpdateHandle }
}
},
+ {
+ minWidth: '120',
+ prop: 'state',
+ label: '鐘舵��',
+ isTrue: true,
+ isSearch: true,
+ searchInfoType: 'select',
+ formatter: this.formatInsState,
+ optList: () => {
+ return this.StateList
+ }
+ },
// 妫�楠岀紪鍙�
{
minWidth: '140',
@@ -263,18 +276,7 @@
searchInfoType: 'datetimerange',
formatter: this.formatDateTime,
},
- {
- minWidth: '120',
- prop: 'state',
- label: '鐘舵��',
- isTrue: true,
- isSearch: true,
- searchInfoType: 'select',
- formatter: this.formatInsState,
- optList: () => {
- return this.StateList
- }
- },
+
// {
// minWidth: '120',
// prop: '',
@@ -349,10 +351,11 @@
type: 'text',
size: 'small',
fun: this.Submitreview,
- show: {
- key: 'state',
- val: [0]
- }
+ // show: {
+ // key: 'state',
+ // val: [0]
+ // },
+ showFun: (row)=>{return row.type == '鍘熸潗鏂欐楠�'&&row.state==0}
})
}
if(this.permissions.quality_processconfiguration_result){
--
Gitblit v1.9.3