From 2e3a185dce148c14051f96892841614b28e72d86 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 18 九月 2023 14:07:19 +0800
Subject: [PATCH] 保养锁料修改
---
src/views/eam/common/MaintenanceStandardWorkInstruction.vue | 2 +
src/views/eam/PredictiveWorkOrderList.vue | 18 ++++++---
src/views/eam/modules/specialtyMaintenanceOrder/JSelectSparePartModal.vue | 3 +
src/views/eam/SpecialtyMaintenanceOrderList.vue | 2
src/views/eam/common/MaintenanceStandardSafetyRequirement.vue | 2 +
src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue | 2 +
src/views/eam/PredictiveWorkPlanList.vue | 5 ++
src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue | 2 +
src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue | 2 +
src/views/eam/modules/dailyMaintenanceOrder/JSelectSparePartModal.vue | 2
src/views/eam/modules/predictiveWorkOrder/ActualMaterialEditTable.vue | 12 +++--
src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue | 31 ++++++++-------
src/views/eam/modules/equipmentNew/edit/EquipmentSparePartsForm.vue | 2
src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue | 27 +++++++------
14 files changed, 70 insertions(+), 42 deletions(-)
diff --git a/src/views/eam/PredictiveWorkOrderList.vue b/src/views/eam/PredictiveWorkOrderList.vue
index ada83a3..450350b 100644
--- a/src/views/eam/PredictiveWorkOrderList.vue
+++ b/src/views/eam/PredictiveWorkOrderList.vue
@@ -19,7 +19,7 @@
allow-clear
placeholder="璇烽�夋嫨宸ュ崟鐘舵��"
:triggerChange="true"
- dictCode="repair_order_status"
+ dictCode="maintenance_order_status"
v-model="queryParam.status"
/>
</a-form-item>
@@ -132,6 +132,7 @@
<a-popconfirm
title="纭畾涓嬪彂宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>
<a v-if="record.status == '1'">涓嬪彂</a>
</a-popconfirm>
@@ -142,6 +143,7 @@
<a-popconfirm
title="纭畾鎾ゅ洖宸ュ崟鍚�?"
@confirm="() => handleOrderReset(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>
<a v-if="record.status == '2'">鎾ゅ洖</a>
</a-popconfirm>
@@ -152,6 +154,7 @@
<a-popconfirm
title="纭畾鎭㈠宸ュ崟鍚�?"
@confirm="() => handleOrderRecover(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>
<a v-if="record.status == '7'">鎭㈠</a>
</a-popconfirm>
@@ -162,6 +165,7 @@
<a-popconfirm
title="纭畾浣滃簾宸ュ崟鍚�?"
@confirm="() => handleOrderCancel(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>
<a v-if="record.status == '2'">浣滃簾</a>
</a-popconfirm>
@@ -172,20 +176,19 @@
<a-popconfirm
title="纭畾棰嗗彇宸ュ崟鍚�?"
@confirm="() => handleOrderGet(record)"
+ v-has="'predictiveWorkOrder:get&do'"
>
<a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
</a-popconfirm>
<a
v-if="record.status == '2' && record.assignMode == '2' "
@click="handleAssignOrder(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>娲惧伐</a>
<a
- v-if="record.status == '2'&& record.assignMode == '3' && record.inspectionUserName != null "
+ v-if="record.status == '2'&& record.assignMode == '3'&&record.maintenanceUserName!=null"
@click="handleAssignOrder(record)"
- >鏀规淳</a>
- <a
- v-if="record.status == '3'"
- @click="handleAssignOrder(record)"
+ v-has="'predictiveWorkOrder:assign&callback&recover&cancle&issue'"
>鏀规淳</a>
<a-divider
v-if="record.status == '2'"
@@ -198,6 +201,7 @@
<a
v-if="record.status === '3' || record.status === '4' "
@click="handleOrderExe(record)"
+ v-has="'predictiveWorkOrder:get&do'"
>鎵ц</a>
<a-divider
v-if="record.status === '3' || record.status === '4' "
@@ -206,6 +210,7 @@
<a
v-if="record.status === '1'"
@click="handleEdit(record)"
+ v-has="'predictiveWorkOrder:edit&delete'"
>缂栬緫</a>
<a-divider
v-if="record.status === '1'"
@@ -221,6 +226,7 @@
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
+ v-has="'predictiveWorkOrder:edit&delete'"
>
<a v-if="record.status === '1'">鍒犻櫎</a>
</a-popconfirm>
diff --git a/src/views/eam/PredictiveWorkPlanList.vue b/src/views/eam/PredictiveWorkPlanList.vue
index 86c48d7..57e5974 100644
--- a/src/views/eam/PredictiveWorkPlanList.vue
+++ b/src/views/eam/PredictiveWorkPlanList.vue
@@ -66,6 +66,7 @@
@click='handleAdd'
type='primary'
icon='plus'
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>鏂板
</a-button>
<a-button
@@ -118,21 +119,25 @@
<a
v-if="record.status == '2'"
@click="handleRevise(record)"
+ v-has="'predictiveWorkplan:update&take'"
>鍗囩増</a>
<a
v-if="record.status == '1'"
@click="handleTakeEffect(record)"
+ v-has="'predictiveWorkplan:update&take'"
>鐢熸晥</a>
<a-divider type="vertical"/>
<a
v-if="record.status == '1'"
@click="handleEdit(record)"
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>缂栬緫</a>
<a-divider type="vertical"/>
<a-popconfirm
v-if="record.status == '1'"
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
diff --git a/src/views/eam/SpecialtyMaintenanceOrderList.vue b/src/views/eam/SpecialtyMaintenanceOrderList.vue
index d7e8d27..c557e19 100644
--- a/src/views/eam/SpecialtyMaintenanceOrderList.vue
+++ b/src/views/eam/SpecialtyMaintenanceOrderList.vue
@@ -200,7 +200,7 @@
v-has="'specialtyMaintenanceOrder:assign'"
>娲惧伐</a>
<a
- v-if="record.status == '2'&& record.assignMode == '3' && record.inspectionUserName != null "
+ v-if="record.status == '2'&& record.assignMode == '3' && record.maintenanceUserName != null "
@click="handleAssignOrder(record)"
v-has="'specialtyMaintenanceOrder:assign'"
>鏀规淳</a>
diff --git a/src/views/eam/common/MaintenanceStandardSafetyRequirement.vue b/src/views/eam/common/MaintenanceStandardSafetyRequirement.vue
index 5fcb402..b2faec8 100644
--- a/src/views/eam/common/MaintenanceStandardSafetyRequirement.vue
+++ b/src/views/eam/common/MaintenanceStandardSafetyRequirement.vue
@@ -18,6 +18,7 @@
type="primary"
icon="plus"
v-if="maintenanceStandardId !='' && isAdd "
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>鏂板
</a-button>
<div>
@@ -42,6 +43,7 @@
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
v-if="maintenanceStandardId !='' && isAdd "
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
diff --git a/src/views/eam/common/MaintenanceStandardWorkInstruction.vue b/src/views/eam/common/MaintenanceStandardWorkInstruction.vue
index a68ade0..1a28ef4 100644
--- a/src/views/eam/common/MaintenanceStandardWorkInstruction.vue
+++ b/src/views/eam/common/MaintenanceStandardWorkInstruction.vue
@@ -18,6 +18,7 @@
type="primary"
icon="plus"
v-if="maintenanceStandardId !='' && isAdd "
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>鏂板</a-button>
<div>
@@ -95,6 +96,7 @@
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
v-if="maintenanceStandardId !='' && isAdd "
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue b/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
index 9071fba..fea537c 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/ActualMaterialEditTable.vue
@@ -11,6 +11,7 @@
:dataSource="dataSource"
:pagination="ipagination"
@change="handleTableChange"
+ :loading="loading"
>
<template
@@ -109,7 +110,7 @@
<actual-material-select ref="actualMaterialSelect">
<!-- @sendMaterialRecord="sendMaterialRecord" -->
</actual-material-select>
- <j-select-spare-part-modal ref='JSelectSparePartModal'></j-select-spare-part-modal>
+ <j-select-spare-part-modal ref='JSelectSparePartModal' @selection2Rows="getSelectRows"></j-select-spare-part-modal>
</a-card>
</template>
<script>
@@ -265,7 +266,8 @@
lock: "/eam/maintenanceOrderActualMaterial/lock",
unLock: "/eam/maintenanceOrderActualMaterial/unLock"
},
- changeIndex: 0
+ changeIndex: 0,
+ loading:false,
}
},
watch: {
@@ -413,7 +415,7 @@
this.$message.error('浣跨敤鏁伴噺涓嶈兘澶т簬鍙敤鏁伴噺!');
return false;
}
- this.confirmLoading = true;
+ this.loading = true;
postAction(this.url.lock, record).then(res => {
if (res.success) {
this.$message.success("搴撳瓨閿佸畾鎴愬姛锛�")
@@ -421,14 +423,14 @@
this.$message.error(res.message)
}
}).finally(res => {
- that.confirmLoading = false
+ that.loading = false
that.loadData();
})
},
handleUnLock(record) {
let that = this;
- this.confirmLoading = true;
+ this.loading = true;
postAction(this.url.unLock, record).then(res => {
if (res.success) {
this.$message.success("搴撳瓨瑙ｉ攣鎴愬姛锛�")
@@ -436,7 +438,7 @@
this.$message.error(res.message)
}
}).finally(res => {
- that.confirmLoading = false
+ that.loading = false
that.loadData();
})
},
@@ -472,11 +474,8 @@
this.loading = false
})
},
- },
-
- mounted() {
- let newActualMaterials = [];
- this.$bus.$on('selection2Rows', (data) => {
+ getSelectRows(data){
+ let newActualMaterials = [];
for (let i = 0; i < data.length; i++) {
newActualMaterials.push({
// id: this.getUuiD(16),
@@ -499,9 +498,7 @@
isLock: 'no'
})
}
- debugger
let that = this
- // newActualMaterials = this.dataSource
postAction(this.url.addInit, newActualMaterials).then((res) => {
if (res.success) {
that.$message.success(res.message)
@@ -511,10 +508,14 @@
}
}).finally(res => {
newActualMaterials = []
- that.loadData(1);
+ that.loadData();
})
- })
+
+ }
+ },
+
+ mounted() {
},
}
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/JSelectSparePartModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/JSelectSparePartModal.vue
index bdd8498..ee5771d 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/JSelectSparePartModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/JSelectSparePartModal.vue
@@ -262,7 +262,7 @@
this.$message.warn("璇烽�夋嫨澶囦欢");
return false;
}
- this.$bus.$emit('selection2Rows', this.selectionRows)
+ this.$emit('selection2Rows', this.selectionRows)
this.close()
},
onSelectChange(selectionRows) {
diff --git a/src/views/eam/modules/equipmentNew/edit/EquipmentSparePartsForm.vue b/src/views/eam/modules/equipmentNew/edit/EquipmentSparePartsForm.vue
index 4606035..139906f 100644
--- a/src/views/eam/modules/equipmentNew/edit/EquipmentSparePartsForm.vue
+++ b/src/views/eam/modules/equipmentNew/edit/EquipmentSparePartsForm.vue
@@ -49,7 +49,7 @@
>
<template slot='toolbarPrefix'>
- <a-button type='primary' @click='equipmentSparesSelect' :disabled="formDisabled">閫夋嫨澶囦欢
+ <a-button type='primary' @click='equipmentSparesSelect' :disabled="formDisabled" icon="plus">閫夋嫨澶囦欢
</a-button>
</template>
</j-vxe-table>
diff --git a/src/views/eam/modules/predictiveWorkOrder/ActualMaterialEditTable.vue b/src/views/eam/modules/predictiveWorkOrder/ActualMaterialEditTable.vue
index 22a19f5..4ca11f0 100644
--- a/src/views/eam/modules/predictiveWorkOrder/ActualMaterialEditTable.vue
+++ b/src/views/eam/modules/predictiveWorkOrder/ActualMaterialEditTable.vue
@@ -11,6 +11,7 @@
:dataSource="dataSource"
:pagination="ipagination"
@change="handleTableChange"
+ :loading="loading"
>
<template
@@ -264,7 +265,8 @@
lock: "/eam/maintenanceOrderActualMaterial/lock",
unLock: "/eam/maintenanceOrderActualMaterial/unLock"
},
- changeIndex: 0
+ changeIndex: 0,
+ loading:false
}
},
watch: {
@@ -388,7 +390,7 @@
this.$message.error('浣跨敤鏁伴噺涓嶈兘澶т簬鍙敤鏁伴噺!');
return false;
}
- this.confirmLoading = true;
+ this.loading = true;
postAction(this.url.lock, record).then(res => {
if (res.success) {
this.$message.success("搴撳瓨閿佸畾鎴愬姛锛�")
@@ -396,14 +398,14 @@
this.$message.error(res.message)
}
}).finally(res => {
- that.confirmLoading = false
+ that.loading = false
that.loadData();
})
},
handleUnLock(record) {
let that = this;
- this.confirmLoading = true;
+ this.loading = true;
postAction(this.url.unLock, record).then(res => {
if (res.success) {
this.$message.success("搴撳瓨瑙ｉ攣鎴愬姛锛�")
@@ -411,7 +413,7 @@
this.$message.error(res.message)
}
}).finally(res => {
- that.confirmLoading = false
+ that.loading = false
that.loadData();
})
},
diff --git a/src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue b/src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue
index 5d13a99..59dcae6 100644
--- a/src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue
+++ b/src/views/eam/modules/predictiveWorkPlan/PredictiveParameters.vue
@@ -18,6 +18,7 @@
type="primary"
icon="plus"
v-if="planId != '' && isAdd "
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>鏂板
</a-button>
<div>
@@ -41,6 +42,7 @@
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
v-if="planId != '' && isDel"
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
diff --git a/src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue b/src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue
index 6e9d121..cc9a490 100644
--- a/src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue
+++ b/src/views/eam/modules/predictiveWorkPlan/PredictiveSpareParts.vue
@@ -18,6 +18,7 @@
type="primary"
icon="plus"
v-if="planId != '' && isAdd "
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>鏂板
</a-button>
<div>
@@ -42,6 +43,7 @@
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
v-if="planId != '' && isAdd "
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
diff --git a/src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue b/src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue
index 4dd80d0..a0814a8 100644
--- a/src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue
+++ b/src/views/eam/modules/predictiveWorkPlan/PredictiveWarn.vue
@@ -18,6 +18,7 @@
type="primary"
icon="plus"
v-if="planId != '' && isAdd "
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>鏂板
</a-button>
<div>
@@ -41,6 +42,7 @@
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(record.id)"
v-if="planId != '' && isAdd "
+ v-has="'predictiveWorkPlan:add&edit&delete'"
>
<a>鍒犻櫎</a>
</a-popconfirm>
diff --git a/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue b/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
index 803db38..301703c 100644
--- a/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
+++ b/src/views/eam/modules/specialtyMaintenanceOrder/ActualMaterialEditTable.vue
@@ -11,6 +11,7 @@
:dataSource="dataSource"
:pagination="ipagination"
@change="handleTableChange"
+ :loading="loading"
>
<template
@@ -105,10 +106,10 @@
</a-row>
<!-- :disabled="false" -->
</div>
- <actual-material-select ref="actualMaterialSelect">
+ <actual-material-select ref="actualMaterialSelect" >
<!-- @sendMaterialRecord="sendMaterialRecord" -->
</actual-material-select>
- <j-select-spare-part-modal ref='JSelectSparePartModal'></j-select-spare-part-modal>
+ <j-select-spare-part-modal ref='JSelectSparePartModal' @getSelectRows="getSelectRows"></j-select-spare-part-modal>
</a-card>
</template>
<script>
@@ -264,7 +265,8 @@
lock: "/eam/maintenanceOrderActualMaterial/lock",
unLock: "/eam/maintenanceOrderActualMaterial/unLock"
},
- changeIndex: 0
+ changeIndex: 0,
+ loading:false,
}
},
watch: {
@@ -411,7 +413,7 @@
this.$message.error('浣跨敤鏁伴噺涓嶈兘澶т簬鍙敤鏁伴噺!');
return false;
}
- this.confirmLoading = true;
+ this.loading = true;
postAction(this.url.lock, record).then(res => {
if (res.success) {
this.$message.success("搴撳瓨閿佸畾鎴愬姛锛�")
@@ -419,14 +421,14 @@
this.$message.error(res.message)
}
}).finally(res => {
- that.confirmLoading = false
+ that.loading = false
that.loadData();
})
},
handleUnLock(record) {
let that = this;
- this.confirmLoading = true;
+ this.loading = true;
postAction(this.url.unLock, record).then(res => {
if (res.success) {
this.$message.success("搴撳瓨瑙ｉ攣鎴愬姛锛�")
@@ -434,7 +436,7 @@
this.$message.error(res.message)
}
}).finally(res => {
- that.confirmLoading = false
+ that.loading = false
that.loadData();
})
},
@@ -470,10 +472,8 @@
this.loading = false
})
},
- },
- mounted() {
- let newActualMaterials = [];
- this.$bus.$on('selectionRows', (data) => {
+ getSelectRows(data){
+ let newActualMaterials = [];
for (let i = 0; i < data.length; i++) {
newActualMaterials.push({
// id: this.getUuiD(16),
@@ -509,7 +509,10 @@
that.loadData();
})
- })
+
+ }
+ },
+ mounted() {
},
}
diff --git a/src/views/eam/modules/specialtyMaintenanceOrder/JSelectSparePartModal.vue b/src/views/eam/modules/specialtyMaintenanceOrder/JSelectSparePartModal.vue
index aee11b8..522cf50 100644
--- a/src/views/eam/modules/specialtyMaintenanceOrder/JSelectSparePartModal.vue
+++ b/src/views/eam/modules/specialtyMaintenanceOrder/JSelectSparePartModal.vue
@@ -262,7 +262,8 @@
this.$message.warn("璇烽�夋嫨澶囦欢");
return false;
}
- this.$bus.$emit('selectionRows', this.selectionRows)
+
+ this.$emit('getSelectRows', this.selectionRows)
this.close()
},
onSelectChange(selectionRows) {
--
Gitblit v1.9.3