From cae8d43ff22d0c75952ad869cadb9654dc929f2f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 11:09:00 +0800
Subject: [PATCH] art: 选择设别-列表 列 错位 修改
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 69 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 6714376..02ef678 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -33,7 +33,7 @@
placeholder='璇烽�夋嫨璁惧鎵�灞炲垎绫�'
:disabled='formDisabled'
:triggerChange='true'
- :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
+ :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
v-model='model.equipmentCategoryId'
@change='categoryChange'
/>
@@ -395,7 +395,7 @@
<a-row>
<a-col :span='6'>
<a-form-model-item
- label='鎿嶄綔绯荤粺'
+ label='鏄惁鏈夋搷浣滅郴缁�'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
prop='operatingSystem'
@@ -415,7 +415,7 @@
v-if="model.operatingSystem=='yes'"
>
<a-form-model-item
- label='绯荤粺'
+ label='绯荤粺淇℃伅'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
prop='system'
@@ -488,19 +488,21 @@
style='width: 100%;'
v-model='model.acceptanceCheckDate'
@change='dateChange'
+ valueFormat="YYYY-MM-DD"
+ format="YYYY-MM-DD"
/>
</a-form-model-item>
</a-col>
<a-col :span='6'>
<a-form-model-item
- label='鎶�鏈姸鎬佹瀹氬懆鏈�'
+ label='鎶�鏈姸鎬侀壌瀹氬懆鏈�'
:labelCol='labelCol'
:wrapperCol='wrapperCol'
prop='checkPeriod'
>
<j-dict-select-tag
allow-clear
- placeholder='璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈� '
+ placeholder='璇烽�夋嫨鎶�鏈姸鎬侀壌瀹氬懆鏈� '
:triggerChange='true'
dictCode='check_period'
v-model='model.checkPeriod'
@@ -521,6 +523,56 @@
placeholder='璇烽�夋嫨鏃ユ湡'
class='query-group-cust'
v-model='model.nextTechnologyStatusQualificationTime'
+ ></j-date>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span='6'>
+ <a-form-model-item
+ label='浜屼繚鏃ユ湡'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ prop='secondMaintenanceTime'
+ >
+ <j-date
+ :disabled='true'
+ style='width: 100%;'
+ placeholder='璇烽�夋嫨浜屼繚鏃ユ湡'
+ class='query-group-cust'
+ v-model='model.secondMaintenanceTime'
+ ></j-date>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span='6'>
+ <a-form-model-item
+ label='涓変繚鏃ユ湡'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ prop='thirdMaintenanceTime'
+ >
+ <j-date
+ :disabled='true'
+ style='width: 100%;'
+ placeholder='璇烽�夋嫨涓変繚鏃ユ湡'
+ class='query-group-cust'
+ v-model='model.thirdMaintenanceTime'
+ ></j-date>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span='6'>
+ <a-form-model-item
+ label='涓嬫涓変繚鏃ユ湡'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ prop='nextThirdMaintenanceTime'
+ >
+ <j-date
+ :disabled='true'
+ style='width: 100%;'
+ placeholder='璇烽�夋嫨涓嬫涓変繚鏃ユ湡'
+ class='query-group-cust'
+ v-model='model.nextThirdMaintenanceTime'
></j-date>
</a-form-model-item>
</a-col>
@@ -1078,7 +1130,7 @@
{ required: true, message: '璇烽�夋嫨璁惧鐘舵��!' }
],
workCenterId: [
- { required: false, message: '璇烽�夋嫨涓績!' }
+ { required: true, message: '璇烽�夋嫨涓績!' }
],
factoryModelId: [
{ required: false, message: '璇烽�夋嫨宸ュ尯!' }
@@ -1159,12 +1211,13 @@
if (res.success) {
that.$message.success(res.message)
that.$emit('ok')
+ that.close()
} else {
- that.$message.warning(res.message)
+ that.$message.error(res.message)
}
}).finally(() => {
that.confirmLoading = false
- that.close()
+ // that.close()
})
} else {
return false
--
Gitblit v1.9.3