From a16a7006603e4b68b52689e88479881bff8c6106 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期六, 26 七月 2025 17:06:44 +0800
Subject: [PATCH] 维修工单修改
---
src/views/eam/repair/modules/EamRepairPersonForm.vue | 4 ++--
src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue | 2 +-
src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue | 5 +++--
src/views/eam/repair/modules/EamRepairPersonModal.vue | 10 +++++-----
src/views/eam/repair/EamReportRepairList.vue | 30 ++++++++++++++++++++++++++----
src/views/eam/repair/EamRepairPersonList.vue | 8 ++++----
6 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/src/views/eam/repair/EamRepairPersonList.vue b/src/views/eam/repair/EamRepairPersonList.vue
index ad4b55a..cb4bd52 100644
--- a/src/views/eam/repair/EamRepairPersonList.vue
+++ b/src/views/eam/repair/EamRepairPersonList.vue
@@ -28,8 +28,8 @@
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="缁翠慨鏃堕暱">
- <a-input placeholder="璇疯緭鍏ョ淮淇椂闀�" v-model="queryParam.repairDuration"></a-input>
+ <a-form-item label="缁翠慨鏃堕暱(灏忔椂)">
+ <a-input placeholder="璇疯緭鍏ョ淮淇椂闀�(灏忔椂)" v-model="queryParam.repairDuration"></a-input>
</a-form-item>
</a-col>
</template>
@@ -155,7 +155,7 @@
dataIndex: 'repairPrimary'
},
{
- title: '缁翠慨鏃堕暱',
+ title: '缁翠慨鏃堕暱(灏忔椂)',
align:"center",
dataIndex: 'repairDuration'
},
@@ -186,7 +186,7 @@
}
},
methods: {
-
+
}
}
</script>
diff --git a/src/views/eam/repair/EamReportRepairList.vue b/src/views/eam/repair/EamReportRepairList.vue
index d040048..228bbd0 100644
--- a/src/views/eam/repair/EamReportRepairList.vue
+++ b/src/views/eam/repair/EamReportRepairList.vue
@@ -98,6 +98,24 @@
<a>浣滃簾</a>
</a-popconfirm>
</span>
+
+ <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="faultDescription" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="accidentPhenomenon" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="measure" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="causingResults" slot-scope="text">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+
</a-table>
</div>
<!-- table鍖哄煙-end -->
@@ -179,7 +197,8 @@
{
title: '鏁呴殰鐜拌薄',
align: 'center',
- dataIndex: 'faultDescription'
+ dataIndex: 'faultDescription',
+ scopedSlots: { customRender: 'faultDescription' }
},
{
title: '鏄惁鍋滄満',
@@ -243,17 +262,20 @@
{
title: '浜嬫晠鐜拌薄',
align: 'center',
- dataIndex: 'accidentPhenomenon'
+ dataIndex: 'accidentPhenomenon',
+ scopedSlots: { customRender: 'accidentPhenomenon' }
},
{
title: '閲囧彇鎺柦',
align: 'center',
- dataIndex: 'measure'
+ dataIndex: 'measure',
+ scopedSlots: { customRender: 'measure' }
},
{
title: '閫犳垚缁撴灉',
align: 'center',
- dataIndex: 'causingResults'
+ dataIndex: 'causingResults',
+ scopedSlots: { customRender: 'causingResults' }
}
],
faultTimeRange: [],
diff --git a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
index 3a07eb3..85057ab 100644
--- a/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
+++ b/src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
@@ -101,7 +101,8 @@
spinning: false,
validatorRules: {
actualStartTime: [{ required: true, message: '璇烽�夋嫨缁翠慨寮�濮嬫椂闂�', trigger: 'change' }],
- actualEndTime: [{ required: true, message: '璇烽�夋嫨缁翠慨缁撴潫鏃堕棿', trigger: 'change' }]
+ actualEndTime: [{ required: true, message: '璇烽�夋嫨缁翠慨缁撴潫鏃堕棿', trigger: 'change' }],
+ faultType: [{ required: true, message: '璇烽�夋嫨鏁呴殰绫诲瀷' }]
},
detail: {
dataSource: [],
@@ -129,7 +130,7 @@
validateRules: [{ required: true, message: '璇烽�夋嫨${title}' }]
},
{
- title: '缁翠慨鏃堕暱',
+ title: '缁翠慨鏃堕暱(灏忔椂)',
key: 'repairDuration',
align: 'center',
placeholder: '璇疯緭鍏�${title}',
diff --git a/src/views/eam/repair/modules/EamRepairPersonForm.vue b/src/views/eam/repair/modules/EamRepairPersonForm.vue
index 8d21893..6d3f3f7 100644
--- a/src/views/eam/repair/modules/EamRepairPersonForm.vue
+++ b/src/views/eam/repair/modules/EamRepairPersonForm.vue
@@ -19,8 +19,8 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="缁翠慨鏃堕暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairDuration">
- <a-input v-model="model.repairDuration" placeholder="璇疯緭鍏ョ淮淇椂闀�" ></a-input>
+ <a-form-model-item label="缁翠慨鏃堕暱(灏忔椂)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairDuration">
+ <a-input v-model="model.repairDuration" placeholder="璇疯緭鍏ョ淮淇椂闀�(灏忔椂)" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
diff --git a/src/views/eam/repair/modules/EamRepairPersonModal.vue b/src/views/eam/repair/modules/EamRepairPersonModal.vue
index 6b91787..09359f3 100644
--- a/src/views/eam/repair/modules/EamRepairPersonModal.vue
+++ b/src/views/eam/repair/modules/EamRepairPersonModal.vue
@@ -8,10 +8,10 @@
@ok="handleOk"
@cancel="handleCancel"
cancelText="鍏抽棴">
-
+
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
-
+
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="鍒犻櫎鏍囪">
<a-input-number v-model="model.delFlag"/>
</a-form-model-item>
@@ -24,13 +24,13 @@
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairPrimary" label="鏄惁鏄富缁翠慨浜�;鏄� 鍚�">
<a-input placeholder="璇疯緭鍏ユ槸鍚︽槸涓荤淮淇汉;鏄� 鍚�" v-model="model.repairPrimary" />
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairDuration" label="缁翠慨鏃堕暱">
- <a-input placeholder="璇疯緭鍏ョ淮淇椂闀�" v-model="model.repairDuration" />
+ <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="repairDuration" label="缁翠慨鏃堕暱(灏忔椂)">
+ <a-input placeholder="璇疯緭鍏ョ淮淇椂闀�(灏忔椂)" v-model="model.repairDuration" />
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="澶囨敞">
<a-input placeholder="璇疯緭鍏ュ娉�" v-model="model.remark" />
</a-form-model-item>
-
+
</a-form-model>
</a-spin>
</j-modal>
diff --git a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
index c06cbab..3e86632 100644
--- a/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
+++ b/src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
@@ -174,7 +174,7 @@
type: JVXETypes.normal
},
{
- title: '缁翠慨鏃堕暱',
+ title: '缁翠慨鏃堕暱(灏忔椂)',
key: 'repairDuration',
align: 'center',
type: JVXETypes.normal
--
Gitblit v1.9.3