From dd882d827e101e85cf1806284d1e3e76d3466ecb Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 11 七月 2025 20:18:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/base/modules/EamTechnicalStatusEvaluationStandardModal.vue | 40 ++++------------------------------------
1 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/src/views/eam/base/modules/EamTechnicalStatusEvaluationStandardModal.vue b/src/views/eam/base/modules/EamTechnicalStatusEvaluationStandardModal.vue
index b7ce926..bc37560 100644
--- a/src/views/eam/base/modules/EamTechnicalStatusEvaluationStandardModal.vue
+++ b/src/views/eam/base/modules/EamTechnicalStatusEvaluationStandardModal.vue
@@ -23,40 +23,8 @@
</a-col>
</a-row>
-<!-- <a-row>-->
-<!-- <a-col :span="8">-->
-<!-- <a-form-model-item label="閴村畾鍛ㄦ湡(骞�)">-->
-<!-- <a-input-number v-model="model.evaluationPeriod" :min="1" placeholder="璇疯緭鍏ラ壌瀹氬懆鏈�(骞�)" style="width: 100%"/>-->
-<!-- </a-form-model-item>-->
-<!-- </a-col>-->
-<!-- </a-row>-->
-
<a-row>
- <!--<a-col :span="8">-->
- <!--<a-form-model-item label="瀹夊叏瑁呯疆妫�鏌�">-->
- <!--<j-dict-select-tag @change="handleCheckListChange($event,1)" dict-code="yn " type="radio"-->
- <!--:disabled="model.hasPrecisionCheck=='0'&&model.hasOtherCheck=='0'"-->
- <!--v-model="model.hasSafetyEquipmentCheck"/>-->
- <!--</a-form-model-item>-->
- <!--</a-col>-->
-
- <!--<a-col :span="8">-->
- <!--<a-form-model-item label="璁惧绮惧害妫�鏌�">-->
- <!--<j-dict-select-tag @change="handleCheckListChange($event,2)" dict-code="yn " type="radio"-->
- <!--:disabled="model.hasSafetyEquipmentCheck=='0'&&model.hasOtherCheck=='0'"-->
- <!--v-model="model.hasPrecisionCheck"/>-->
- <!--</a-form-model-item>-->
- <!--</a-col>-->
-
- <!--<a-col :span="8">-->
- <!--<a-form-model-item label="鍏朵粬妫�鏌�">-->
- <!--<j-dict-select-tag @change="handleCheckListChange($event,3)" dict-code="yn " type="radio"-->
- <!--:disabled="model.hasPrecisionCheck=='0'&&model.hasSafetyEquipmentCheck=='0'"-->
- <!--v-model="model.hasOtherCheck"/>-->
- <!--</a-form-model-item>-->
- <!--</a-col>-->
-
- <a-col :span="8" v-for="item in checkList">
+ <a-col :span="8" v-for="item in checkList" :key="item.key">
<a-form-model-item :label="item.label">
<j-dict-select-tag @change="handleCheckListChange($event,item.key)" dict-code="yn" type="radio"
:disabled="checkList.filter(i=>i.key!=item.key).every(i=>i.value=='0')"
@@ -213,7 +181,7 @@
width: 150,
validateRules: [
{ required: true, message: '璇疯緭鍏�${title}' },
- { unique: true, message: '${title}涓嶈兘閲嶅' }
+ { unique: false, message: '${title}涓嶈兘閲嶅' }
]
},
{
@@ -230,7 +198,7 @@
placeholder: '璇疯緭鍏�${title}',
type: JVXETypes.textarea,
align: 'center',
- validateRules: [{ required: true, message: '璇疯緭鍏�${title}' }]
+ validateRules: [{ required: false, message: '璇疯緭鍏�${title}' }]
},
{
title: '鍏佸樊鍊�',
@@ -342,7 +310,7 @@
if (tableData.length == 0) {
this.$notification.warning({
message: '娑堟伅',
- description: hasCheckedCheckList[index].label + '蹇呭～椤逛笉鑳戒负绌�'
+ description: hasCheckedCheckList[index].label + '涓嶈兘涓虹┖'
})
return
}
--
Gitblit v1.9.3