From 752030a34315629a07810faff9bcd6522c1ebf41 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期五, 23 五月 2025 09:08:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue | 153 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 135 insertions(+), 18 deletions(-)
diff --git a/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue b/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue
index 7623401..e246065 100644
--- a/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue
@@ -57,21 +57,38 @@
</a-form-model-item>
</a-row>
<a-row :gutter="24">
- <a-spin :spinning="detail.loading">
- <j-vxe-table
- ref="editableDetailTable"
- :rowNumber="true"
- :rowSelection="true"
- :bordered="true"
- :alwaysEdit="true"
- :toolbar="true"
- :toolbarConfig="detail.toolbarConfig"
- keep-source
- :height="300"
- :dataSource="detail.dataSource"
- :columns="detail.columns"
- style="margin-top: 8px;" />
- </a-spin>
+ <a-tabs v-model="activeTabKey">
+ <a-tab-pane key="1" tab="淇濆吇椤�" :forceRender="true">
+ <j-vxe-table
+ ref="editableDetailTable"
+ :rowNumber="true"
+ :rowSelection="true"
+ :bordered="true"
+ :alwaysEdit="true"
+ :toolbar="true"
+ :toolbarConfig="detail.toolbarConfig"
+ keep-source
+ :height="300"
+ :dataSource="detail.dataSource"
+ :columns="detail.columns"
+ style="margin-top: 8px;" />
+ </a-tab-pane>
+ <a-tab-pane key="2" tab="绮惧害鍙傛暟" :forceRender="true">
+ <j-vxe-table
+ ref="editablePrecisionDetailTable"
+ :rowNumber="true"
+ :rowSelection="true"
+ :bordered="true"
+ :alwaysEdit="true"
+ :toolbar="false"
+ :toolbarConfig="precisionDetail.toolbarConfig"
+ keep-source
+ :height="300"
+ :dataSource="precisionDetail.dataSource"
+ :columns="precisionDetail.columns"
+ style="margin-top: 8px;" />
+ </a-tab-pane>
+ </a-tabs>
</a-row>
</a-form-model>
</a-spin>
@@ -111,6 +128,8 @@
},
confirmLoading: false,
spinning: false,
+ activeTabKey: '1',
+ maintenanceOperatorOptions: [],
validatorRules: {
equipmentId: [
{ required: true, message: '璇烽�夋嫨璁惧!' }
@@ -124,7 +143,9 @@
edit: '/eam/thirdMaintenanceOrder/edit',
standardDetail: '/eam/eamMaintenanceStandardDetail/queryList',
detail: '/eam/thirdMaintenanceOrderDetail/queryList',
- userSelect: '/eam/user_select/list'
+ userSelect: '/eam/user_select/list',
+ precisionDetail: '/eam/equipmentPrecisionParameters/queryList',
+ precisionCheckDetail: '/eam/precisionCheckDetail/queryList',
},
detail: {
loading: false,
@@ -184,6 +205,59 @@
// add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
btn: ['add', 'remove', 'clearSelection']
}
+ },
+ precisionDetail: {
+ loading: false,
+ dataSource: [],
+ columns: [
+ {
+ title: 'ID',
+ key: 'id',
+ type: JVXETypes.hidden
+ },
+ {
+ title: 'orderId',
+ key: 'orderId',
+ type: JVXETypes.hidden
+ },
+ {
+ title: 'equipmentId',
+ key: 'equipmentId',
+ type: JVXETypes.hidden
+ },
+ {
+ title: 'parameterId',
+ key: 'parameterId',
+ type: JVXETypes.hidden
+ },
+ {
+ title: '妫�娴嬮」鐩�',
+ key: 'parameterId_dictText',
+ type: JVXETypes.normal,
+ width: '25%',
+ align: 'center'
+ },
+ {
+ title: '鍙傛暟缂栫爜',
+ key: 'parameterCode_dictText',
+ type: JVXETypes.normal,
+ width: '20%',
+ align: 'center',
+ },
+ {
+ title: '鍏佸樊鍊�',
+ key: 'parameterValue',
+ type: JVXETypes.normal,
+ width: '30%',
+ align: 'center',
+ }
+ ],
+ toolbarConfig: {
+ // prefix 鍓嶇紑锛泂uffix 鍚庣紑
+ slot: ['prefix', 'suffix'],
+ // add 鏂板鎸夐挳锛況emove 鍒犻櫎鎸夐挳锛沜learSelection 娓呯┖閫夋嫨鎸夐挳
+ btn: ['add', 'remove', 'clearSelection']
+ }
}
}
},
@@ -191,6 +265,7 @@
},
methods: {
add() {
+ this.initParams();
//鍒濆鍖栭粯璁ゅ��
this.model = {}
this.visible = true
@@ -198,11 +273,13 @@
this.detail.dataSource = []
},
edit(record) {
+ this.initParams();
this.model = Object.assign({}, record)
this.visible = true
this.editable = true
this.detail.dataSource = []
this.loadDetail(record.id)
+ this.loadPrecisionDetail(record.id)
},
close() {
this.$emit('close')
@@ -223,6 +300,11 @@
let removeData = that.$refs.editableDetailTable.getDeleteData()
that.model.tableDetailList = [...tableData]
that.model.removeDetailList = [...removeData]
+
+ let precisionDetailList = that.$refs.editablePrecisionDetailTable.getTableData()
+ let removePrecisionDetailList = that.$refs.editablePrecisionDetailTable.getDeleteData()
+ that.model.precisionDetailList = [...precisionDetailList]
+ that.model.removePrecisionDetailList = [...removePrecisionDetailList]
that.confirmLoading = true
let httpurl = ''
@@ -272,6 +354,7 @@
if (!this.model.equipmentId) delete this.model.operator
if (!this.model.id) {
this.loadStandardDetail(selectObj.id)
+ this.loadPrecisionParameterList(selectObj.equipmentId)
}
this.loadMaintenanceOperatorList(this.model.equipmentId)
},
@@ -331,8 +414,42 @@
.catch(err => {
if (that.model.operator) delete that.model.operator
})
- }
-
+ },
+ loadPrecisionParameterList(equipmentId) {
+ this.precisionDetail.dataSource = []
+ if (equipmentId) {
+ this.spinning = true
+ getAction(this.url.precisionDetail, { equipmentId: equipmentId })
+ .then(res => {
+ if (res.success) {
+ this.precisionDetail.dataSource = res.result.map(item => ({
+ equipmentId: item.equipmentId,
+ parameterId: item.parameterId,
+ parameterId_dictText: item.parameterId_dictText,
+ parameterCode_dictText: item.parameterCode_dictText,
+ parameterValue: item.parameterValue,
+ }))
+ }
+ })
+ .finally(() => {
+ this.spinning = false
+ })
+ }
+ },
+ loadPrecisionDetail(orderId) {
+ if (orderId) {
+ getAction(this.url.precisionCheckDetail, { orderId: orderId }).then(res => {
+ if (res.success) {
+ this.precisionDetail.dataSource = [...res.result]
+ }
+ })
+ }
+ },
+ initParams() {
+ this.detail.dataSource = []
+ this.precisionDetail.dataSource = []
+ this.activeTabKey = '1'
+ },
}
}
</script>
--
Gitblit v1.9.3