From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
index 70eaaa5..ac8cacc 100644
--- a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
+++ b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
@@ -5,37 +5,62 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row>
<a-col :span="customSpan">
- <a-form-model-item label="缁翠慨寮�濮嬫椂闂�" prop="actualStartTime" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="缁熶竴缂栫爜">
+ <lx-search-equipment-select v-model="model.equipmentId" disabled/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
+ <a-form-model-item label="宸ュ崟鍙�">
+ <a-input v-model="model.repairCode" readOnly/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
+ <a-form-model-item label="鏁呴殰绫诲瀷">
+ <j-dict-select-tag dict-code="fault_type" placeholder="璇烽�夋嫨鏁呴殰绫诲瀷" v-model="model.faultType"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
+ <a-form-model-item label="鎶ヤ慨浜�">
+ <a-input placeholder="璇疯緭鍏ユ姤淇汉" v-model="model.reportPerson"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
+ <a-form-model-item label="缁翠慨寮�濮嬫椂闂�" prop="actualStartTime">
<a-date-picker show-time v-model="model.actualStartTime" :allowClear="false"
value-format="YYYY-MM-DD HH:mm:ss"
style="width:100%"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
- <a-form-model-item label="缁翠慨缁撴潫鏃堕棿" prop="actualEndTime" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item label="缁翠慨缁撴潫鏃堕棿" prop="actualEndTime">
<a-date-picker show-time v-model="model.actualEndTime" :allowClear="false"
value-format="YYYY-MM-DD HH:mm:ss"
style="width:100%"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
+ <a-form-model-item label="鏁呴殰鐜拌薄">
+ <a-textarea :rows="3" placeholder="璇疯緭鍏ユ晠闅滅幇璞�" v-model="model.faultPhenomenon"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="customSpan">
<a-form-model-item label="鏁呴殰鍘熷洜">
- <a-textarea placeholder="璇疯緭鍏ユ晠闅滃師鍥�" v-model="model.faultReason"/>
+ <a-textarea :rows="3" placeholder="璇疯緭鍏ユ晠闅滃師鍥�" v-model="model.faultReason"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鏁呴殰鍒嗘瀽">
- <a-textarea placeholder="璇疯緭鍏ユ晠闅滃垎鏋�" v-model="model.faultAnalysis"/>
+ <a-textarea :rows="3" placeholder="璇疯緭鍏ユ晠闅滃垎鏋�" v-model="model.faultAnalysis"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鎺掓晠杩囩▼">
- <a-textarea placeholder="璇疯緭鍏ユ帓鏁呰繃绋�" v-model="model.faultProcess"/>
+ <a-textarea :rows="3" placeholder="璇疯緭鍏ユ帓鏁呰繃绋�" v-model="model.faultProcess"/>
</a-form-model-item>
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="棰勯槻鎺柦">
- <a-textarea placeholder="璇疯緭鍏ラ闃叉帾鏂�" v-model="model.faultPrevent"/>
+ <a-textarea :rows="3" placeholder="璇疯緭鍏ラ闃叉帾鏂�" v-model="model.faultPrevent"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -63,10 +88,10 @@
title: '鎿嶄綔',
visible: false,
model: {},
- customSpan: 12,
+ customSpan: 8,
labelCol: {
xs: { span: 24 },
- sm: { span: 6 }
+ sm: { span: 8 }
},
wrapperCol: {
xs: { span: 24 },
--
Gitblit v1.9.3