From 2637821cb7466330f5c612be809531cb65790219 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 04 七月 2025 20:01:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/modules/EamInspectionOrderModal.vue | 54 +++++++++++++++++-------------------------------------
1 files changed, 17 insertions(+), 37 deletions(-)
diff --git a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
index 61258e3..8a81706 100644
--- a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
@@ -1,40 +1,31 @@
<template>
- <j-modal
- :title="title"
- :width="1200"
- :visible="visible"
- :confirmLoading="confirmLoading"
- switchFullscreen
- centered
- :mask-closable="false"
- @ok="handleOk"
- @cancel="handleCancel"
- cancelText="鍏抽棴">
+ <j-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen centered
+ :mask-closable="false" @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<a-spin :spinning="spinning">
<a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="standardCode" label="宸ュ崟鍙�">
- <a-input placeholder="宸ュ崟鍙疯嚜鍔ㄧ敓鎴�" v-model="model.orderNum" readOnly/>
+ <a-input placeholder="宸ュ崟鍙疯嚜鍔ㄧ敓鎴�" v-model="model.orderNum" disabled/>
</a-form-model-item>
</a-col>
<a-col :span="8">
- <a-form-model-item prop="equipmentId" label="璁惧缂栧彿">
- <MaintenanceEquipmentSelect placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储" v-model="model.equipmentId"
+ <a-form-model-item prop="equipmentId" label="缁熶竴缂栫爜">
+ <MaintenanceEquipmentSelect placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="model.equipmentId"
:maintenanceCategory="maintenanceCategory" :disabled="disabled"
@autocompleteForm="autocompleteForm"/>
</a-form-model-item>
</a-col>
<a-col :span="8">
- <a-form-model-item prop="standardName" label="鏍囧噯鍚嶇О">
+ <a-form-model-item prop="standardName" label="瑙勮寖鍚嶇О">
<a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" readOnly v-model="model.standardName"/>
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="8">
- <a-form-model-item prop="standardCode" label="鏍囧噯缂栫爜">
+ <a-form-model-item prop="standardCode" label="瑙勮寖缂栫爜">
<a-input placeholder="閫夋嫨璁惧鍚庤嚜鍔ㄥ甫鍑�" readOnly v-model="model.standardCode"/>
</a-form-model-item>
</a-col>
@@ -73,19 +64,9 @@
</a-col>
</a-row>
<a-row :gutter="24">
- <j-vxe-table
- ref="editableDetailTable"
- :rowNumber="true"
- :rowSelection="true"
- :bordered="true"
- :alwaysEdit="true"
- :toolbar="true"
- keep-source
- :height="300"
- :loading="detail.loading"
- :dataSource="detail.dataSource"
- :columns="detail.columns"
- style="margin-top: 8px;"/>
+ <j-vxe-table ref="editableDetailTable" :rowNumber="true" :rowSelection="true" :bordered="true"
+ :alwaysEdit="true" :toolbar="true" keep-source :height="300" :loading="detail.loading"
+ :dataSource="detail.dataSource" :columns="detail.columns" style="margin-top: 8px;"/>
</a-row>
</a-form-model>
</a-spin>
@@ -123,16 +104,16 @@
disabled: false,
validatorRules: {
// standardName: [
- // { required: true, message: '璇疯緭鍏ユ爣鍑嗗悕绉�!' }
+ // { required: true, message: '璇疯緭鍏ヨ鑼冨悕绉�!' }
// ],
inspectionDate: [
- { required: true, message: '璇烽�夋嫨鐐规鏃ユ湡!' }
+ { required: true, message: '璇烽�夋嫨鐐规鏃ユ湡', trigger: 'change' }
],
// maintenancePeriod: [
// { required: true, message: '璇疯緭鍏ヤ繚鍏诲懆鏈燂紝鍗曚綅锛氬ぉ!' }
// ],
equipmentId: [
- { required: true, message: '璇烽�夋嫨璁惧!' }
+ { required: true, message: '璇烽�夋嫨璁惧', trigger: 'change' }
]
},
url: {
@@ -157,7 +138,8 @@
width: '10%',
align: 'center',
validateRules: [
- { required: true, unique: true, message: '搴忓彿涓嶈兘閲嶅' }
+ { required: true, message: '璇疯緭鍏�${title}' },
+ { unique: true, message: '搴忓彿涓嶈兘閲嶅' }
]
},
{
@@ -167,7 +149,7 @@
width: '20%',
align: 'center',
validateRules: [
- { required: true, message: '淇濆吇椤逛笉鑳戒负绌猴紒' }
+ { required: true, message: '璇疯緭鍏�${title}' }
]
},
{
@@ -177,14 +159,12 @@
width: '30%',
align: 'center',
validateRules: [
- { required: true, message: '淇濆吇瑕佹眰涓嶈兘涓虹┖锛�' }
+ { required: true, message: '璇疯緭鍏�${title}' }
]
}
]
}
}
- },
- created() {
},
methods: {
add() {
--
Gitblit v1.9.3