From c18451867caad27d831caaec2e6abe4141160dd1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 07 四月 2025 09:33:26 +0800
Subject: [PATCH] art: 设备管理-周保-编辑问题解决
---
src/views/eam/maintenance/modules/EamWeekMaintenanceOrderModal.vue | 67 +++++++++++++++++++--------------
src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue | 23 ++++++-----
2 files changed, 51 insertions(+), 39 deletions(-)
diff --git a/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue b/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
index 612ae38..9d9fa17 100644
--- a/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamWeekMaintenanceOrderList.vue
@@ -126,17 +126,17 @@
dataIndex: 'orderNum'
},
{
- title: '璁惧ID',
+ title: '璁惧缂栧彿',
align: 'center',
- dataIndex: 'equipmentId'
+ dataIndex: 'equipmentId_dictText'
},
{
- title: '鏍囧噯ID',
+ title: '鏍囧噯鍚嶇О',
align: 'center',
- dataIndex: 'standardId'
+ dataIndex: 'standardId_dictText'
},
{
- title: '璁″垝鎵ц鏃ユ湡',
+ title: '璁″垝淇濆吇鏃ユ湡',
align: 'center',
dataIndex: 'maintenanceDate'
},
@@ -153,22 +153,22 @@
{
title: '淇濆吇浜�',
align: 'center',
- dataIndex: 'operator'
+ dataIndex: 'operator_dictText'
},
{
title: '淇濆吇鐘舵��',
align: 'center',
- dataIndex: 'maintenanceStatus'
+ dataIndex: 'maintenanceStatus_dictText'
},
{
title: '鍒涘缓鏂瑰紡',
align: 'center',
- dataIndex: 'creationMethod'
+ dataIndex: 'creationMethod_dictText'
},
{
title: '纭浜�',
align: 'center',
- dataIndex: 'confirmUser'
+ dataIndex: 'confirmUser_dictText'
},
{
title: '纭鏃堕棿',
@@ -176,14 +176,15 @@
dataIndex: 'confirmTime'
},
{
- title: '淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧',
+ title: '淇濆吇鍥剧墖',
align: 'center',
dataIndex: 'imageFiles'
},
{
title: '澶囨敞',
align: 'center',
- dataIndex: 'remark'
+ dataIndex: 'remark',
+ editable: true,
},
{
title: '鎿嶄綔',
diff --git a/src/views/eam/maintenance/modules/EamWeekMaintenanceOrderModal.vue b/src/views/eam/maintenance/modules/EamWeekMaintenanceOrderModal.vue
index 857e609..e3a9ae1 100644
--- a/src/views/eam/maintenance/modules/EamWeekMaintenanceOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamWeekMaintenanceOrderModal.vue
@@ -120,7 +120,7 @@
add: '/eam/weekMaintenanceOrder/add',
edit: '/eam/weekMaintenanceOrder/edit',
standardDetail: '/eam/eamMaintenanceStandardDetail/queryList',
- detail: '/eam/weekMaintenanceOrderDetail/queryList',
+ detail: '/eam/weekMaintenanceOrderDetail/queryList'
},
detail: {
loading: false,
@@ -188,17 +188,18 @@
methods: {
add() {
//鍒濆鍖栭粯璁ゅ��
- this.model = {};
- this.visible = true;
- this.editable = false;
- this.detail.dataSource = [];
+ this.model = {}
+ this.visible = true
+ this.editable = false
+ this.detail.dataSource = []
},
edit(record) {
+ // debugger
this.model = Object.assign({}, record)
this.visible = true
- this.editable = true;
- this.detail.dataSource = [];
- this.loadDetail(record.id);
+ this.editable = true
+ this.detail.dataSource = []
+ this.loadDetail(record.id)
},
close() {
this.$emit('close')
@@ -207,18 +208,18 @@
},
async handleOk() {
const that = this
- let errMap = await that.$refs.editableDetailTable.validateTable();
- if(errMap){
- this.$message.warning("鏁版嵁鏍￠獙澶辫触锛�");
- return;
+ let errMap = await that.$refs.editableDetailTable.validateTable()
+ if (errMap) {
+ this.$message.warning('鏁版嵁鏍￠獙澶辫触锛�')
+ return
}
// 瑙﹀彂琛ㄥ崟楠岃瘉
this.$refs.form.validate(valid => {
if (valid) {
- let tableData = that.$refs.editableDetailTable.getTableData();
- let removeData = that.$refs.editableDetailTable.getDeleteData();
- that.model.tableDetailList = [...tableData];
- that.model.removeDetailList = [...removeData];
+ let tableData = that.$refs.editableDetailTable.getTableData()
+ let removeData = that.$refs.editableDetailTable.getDeleteData()
+ that.model.tableDetailList = [...tableData]
+ that.model.removeDetailList = [...removeData]
that.confirmLoading = true
let httpurl = ''
@@ -250,11 +251,21 @@
this.close()
},
autocompleteForm(selectObj) {
- this.model.standardName = selectObj.standardName
- this.model.maintenancePeriod = selectObj.maintenancePeriod
- this.model.standardId = selectObj.id
- if(!this.model.id) {
- this.loadStandardDetail(selectObj.id);
+ //鏍囧噯鍚嶇О锛屼繚鍏诲懆鏈熶笉鍒锋柊瑙ｅ喅鍔炴硶
+ //鍔炴硶涓�
+ const newObj = {
+ standardName: selectObj.standardName,
+ maintenancePeriod: selectObj.maintenancePeriod,
+ standardId : selectObj.id,
+ };
+ this.model = Object.assign({}, newObj, this.model)
+ //鍔炴硶浜�
+ // this.$set(this.model, 'standardName', selectObj.standardName)
+ // this.$set(this.model, 'maintenancePeriod', selectObj.maintenancePeriod)
+ // this.$set(this.model, 'standardId', selectObj.id)
+ // console.log('model', this.model)
+ if (!this.model.id) {
+ this.loadStandardDetail(selectObj.id)
}
},
//鍔犺浇璇︽儏鏁版嵁
@@ -274,13 +285,13 @@
},
//鏍囧噯閫夋嫨鍙樺寲
loadDetail(orderId) {
- if (orderId) {
- getAction(this.url.detail, { orderId: orderId }).then(res => {
- if (res.success) {
- this.detail.dataSource = [...res.result]
- }
- })
- }
+ if (orderId) {
+ getAction(this.url.detail, { orderId: orderId }).then(res => {
+ if (res.success) {
+ this.detail.dataSource = [...res.result]
+ }
+ })
+ }
}
}
--
Gitblit v1.9.3