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/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue | 10 +++++-----
src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue | 14 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
index 3c7529d..ac8cacc 100644
--- a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
+++ b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
@@ -40,27 +40,27 @@
</a-col>
<a-col :span="customSpan">
<a-form-model-item label="鏁呴殰鐜拌薄">
- <a-textarea placeholder="璇疯緭鍏ユ晠闅滅幇璞�" v-model="model.faultPhenomenon"/>
+ <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>
@@ -88,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 },
diff --git a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
index 0a6dee2..8c9382e 100644
--- a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
+++ b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
@@ -41,27 +41,27 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="鏁呴殰鐜拌薄">
- <a-textarea v-model="model.faultPhenomenon" readOnly/>
+ <a-textarea :rows="5" v-model="model.faultPhenomenon" readOnly/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="鏁呴殰鍘熷洜">
- <a-textarea v-model="model.faultReason" readOnly/>
+ <a-textarea :rows="5" v-model="model.faultReason" readOnly/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="鏁呴殰鍒嗘瀽">
- <a-textarea v-model="model.faultAnalysis" readOnly/>
+ <a-textarea :rows="5" v-model="model.faultAnalysis" readOnly/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="鎺掓晠杩囩▼">
- <a-textarea v-model="model.faultProcess" readOnly/>
+ <a-textarea :rows="5" v-model="model.faultProcess" readOnly/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="棰勯槻鎺柦">
- <a-textarea v-model="model.faultPrevent" readOnly/>
+ <a-textarea :rows="5" v-model="model.faultPrevent" readOnly/>
</a-form-model-item>
</a-col>
</a-row>
--
Gitblit v1.9.3