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/teststandard/index.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/views/quality/teststandard/index.vue b/src/views/quality/teststandard/index.vue
index 241ac69..7b8f74a 100644
--- a/src/views/quality/teststandard/index.vue
+++ b/src/views/quality/teststandard/index.vue
@@ -497,10 +497,11 @@
},
computed: {
...mapGetters(['permissions']),
- editable: function() {
+ editable : function() {
if (!this.currentTestStandard) {
return true
}
+ console.log('99999999999', this.currentTestStandard)
if (
this.currentTestStandard.id &&
this.currentTestStandard.state === '01draft'
@@ -867,12 +868,10 @@
this.isSubmit = true
if (this.testStandardParams.length > 0) {
this.testStandardParams.map(m=>{
- if(m.referenceValue !== undefined) {
+ if(m.referenceValue != undefined) {
m.referenceValue = m.referenceValue.replace(',','锛�').replace('(','锛�').replace(')','锛�')
return m
- } else{
- this.$message.warning('瑕佹眰鑼冨洿娌℃湁濉啓!')
- }
+ }
})
addTestStandardParam(this.testStandardParams)
.then((response) => {
--
Gitblit v1.9.3