diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue
index 7fc0137..25a45f7 100644
--- a/src/views/modules/eam/eam_device_list.vue
+++ b/src/views/modules/eam/eam_device_list.vue
@@ -454,7 +454,7 @@
-
+
@@ -485,13 +485,13 @@
-
+
-
+
-
+
查询
@@ -539,7 +539,7 @@
- 保存
+ 保存
关闭
@@ -2624,36 +2624,36 @@
],
levelList: [],
//设备备件分页新增 0314 rq ---start
- spareModalFlag:false,
- spareModalData:{
- site:'',
- objectID:'',
- objectDesc:'',
+ spareModalFlag: false,
+ spareModalData: {
+ site: '',
+ objectID: '',
+ objectDesc: '',
partNo: '',
partDescription: '',
- spareList:[],
+ spareList: [],
},
- spareList:[],
- spareSelectionList:[],
- spareCopyModalData:{
+ spareList: [],
+ spareSelectionList: [],
+ spareCopyModalData: {
site: this.$store.state.user.site,
- objectID:'',
- objectDesc:'',
- familyID:'',
- oldObjectID:'',
- oldObjectDesc:'',
- type:'',
- spareFlag:'Y',
- itemAFlag:'Y',
- itemBFlag:'Y',
- defectFlag:'Y',
+ objectID: '',
+ objectDesc: '',
+ familyID: '',
+ oldObjectID: '',
+ oldObjectDesc: '',
+ type: '',
+ spareFlag: 'Y',
+ itemAFlag: 'Y',
+ itemBFlag: 'Y',
+ defectFlag: 'Y',
},
- objectCopySelectionList:[],
- objectCopyList:[],
- spareCopyModalFlag:false,
+ objectCopySelectionList: [],
+ objectCopyList: [],
+ spareCopyModalFlag: false,
//设备备件分页新增 0314 rq ---end
//设备点检计划分页新增 0315 rq ---start
- checkPlanColumnArray:[
+ checkPlanColumnArray: [
{
userId: this.$store.state.user.name,
functionId: 5303,
@@ -2908,10 +2908,10 @@
columnWidth: 150,
},
],
- checkPlanList:[],
+ checkPlanList: [],
//设备点检计划分页新增 0315 rq ---end
//设备维保计划分页新增 0315 rq ---start
- maintenanceColumnArray:[
+ maintenanceColumnArray: [
{
userId: this.$store.state.user.name,
functionId: 5303,
@@ -3168,84 +3168,84 @@
],
//设备维保计划分页新增 0315 rq ---end
//设备点检项目分页新增 0315 rq ---start
- updateItemModalFlag:false,
- updateItemLabel:{
- itemDescLabel:'',
- itemRemarkLabel:'',
+ updateItemModalFlag: false,
+ updateItemLabel: {
+ itemDescLabel: '',
+ itemRemarkLabel: '',
},
- updateItemModal:{
- flag:'',
- site:'',
- objectID:'',
- itemNo:'',
- itemDesc:'',
- itemType:'',
- valueTypeDb:'',
- itemRemark:'',
- valueChooseFlag:'',
- defaultValue:'',
- maxValue:'',
- minValue:'',
- userId:'',
+ updateItemModal: {
+ flag: '',
+ site: '',
+ objectID: '',
+ itemNo: '',
+ itemDesc: '',
+ itemType: '',
+ valueTypeDb: '',
+ itemRemark: '',
+ valueChooseFlag: '',
+ defaultValue: '',
+ maxValue: '',
+ minValue: '',
+ userId: '',
},
//设备点检项目分页新增 0315 rq ---end
- chooseTableData:[],
- itemModalFlag:false,
- itemFlag:'text',
- itemData:{
- site:'',
- objectID:'',
- itemNo:'',
- valueNo:'',
- availableValue:'',
- itemType:'',
+ chooseTableData: [],
+ itemModalFlag: false,
+ itemFlag: 'text',
+ itemData: {
+ site: '',
+ objectID: '',
+ itemNo: '',
+ valueNo: '',
+ availableValue: '',
+ itemType: '',
createdBy: this.$store.state.user.name
},
- chooseModalFlag:false,
- chooseModalData:{
- site:'',
- objectID:'',
+ chooseModalFlag: false,
+ chooseModalData: {
+ site: '',
+ objectID: '',
itemNo: '',
itemDesc: '',
- itemType:'',
- valueTypeDb:'',
+ itemType: '',
+ valueTypeDb: '',
},
- planModalDisableFlag:false,
- planModalFlag:false,
- planModalData:{
+ planModalDisableFlag: false,
+ planModalFlag: false,
+ planModalData: {
objectList:[],
flag:'',
functionType:'',
site: this.$store.state.user.site,
- planID:'',
- planDesc:'',
- objectID:'',
- propertiesCode:'',
- propertiesDesc:'',
- operator:'',
- planPeriod:'',
- status:'',
- planStartDate:'',
- planEndDate:'',
- userId:'',
- remark:'',
+ planID: '',
+ planDesc: '',
+ objectID: '',
+ propertiesCode: '',
+ propertiesDesc: '',
+ operator: '',
+ planPeriod: '',
+ status: '',
+ planStartDate: '',
+ planEndDate: '',
+ userId: '',
+ remark: '',
},
- objectData:{
+ objectData: {
site: this.$store.state.user.site,
- objectID:'',
- objectDesc:'',
- familyID:'',
+ objectID: '',
+ objectDesc: '',
+ familyID: '',
},
- objectList:[],
- objectSelectionList:[],
- defectModalFlag:false,
- defectModalData:{
- flag:'',
+ objectList: [],
+ objectSelectionList: [],
+ defectModalFlag: false,
+ defectModalData: {
+ flag: '',
site: this.$store.state.user.site,
- defectID:'',
- objectID:'',
- active:'',
- id:'',
+ defectID: '',
+ objectID: '',
+ active: '',
+ id: '',
},
toolInstanceIdWidth: 17,
recordWidth: 0,
@@ -3825,42 +3825,43 @@
this.objectCopySelectionList = val
},
+ // 复制备件
+ copyObject (type) {
+ this.spareCopyModalData = {
+ bu: this.currentRow.site + '_' + this.currentRow.buNo,
+ objectID: '',
+ objectDesc: '',
+ familyID: '',
+ oldObjectID: this.currentRow.objectID,
+ oldObjectDesc: this.currentRow.objectDesc,
+ spareFlag: 'Y',
+ itemAFlag: 'Y',
+ itemBFlag: 'Y',
+ defectFlag: 'Y',
+ type: type
+ }
+ this.getObjectCopyList()
+ this.spareCopyModalFlag = true
+ },
+
+ // 查询可用设备列表
getObjectCopyList () {
getObjectList(this.spareCopyModalData).then(({data}) => {
this.objectCopyList = data.rows
for (let i = 0; i < this.objectCopyList.length; i++) {
- //删除本设备 只能选其他的设备
- if(this.objectCopyList[i].objectID == this.spareCopyModalData.oldObjectID){
+ // 删除本设备 只能选其他的设备
+ if (this.objectCopyList[i].objectID === this.spareCopyModalData.oldObjectID) {
this.objectCopyList.splice(i,1)
}
}
})
},
- copyObject (type) {
- this.spareCopyModalData = {
- site: this.$store.state.user.site,
- objectID:'',
- objectDesc:'',
- familyID:'',
- oldObjectID:this.currentRow.objectID,
- oldObjectDesc:this.currentRow.objectDesc,
- spareFlag:'Y',
- itemAFlag:'Y',
- itemBFlag:'Y',
- defectFlag:'Y',
- type:type
- }
- this.getObjectCopyList()
- this.spareCopyModalFlag = true
- },
-
+ // 复制
saveCopyData () {
- if(this.objectCopySelectionList.length === 0){
- this.$alert('请勾选设备！', '错误', {
- confirmButtonText: '确定'
- })
- return false
+ if (this.objectCopySelectionList.length === 0) {
+ this.$message.warning('请勾选设备！')
+ return
}
this.$confirm(`复制会删除所选设备以前的数据，是否继续?`, '提示', {
confirmButtonText: '确定',
@@ -3879,7 +3880,7 @@
}
copyObjectSparesData(inList).then(({data}) => {
if (data && data.code === 0) {
- this.spareCopyModalFlag = false;
+ this.spareCopyModalFlag = false
this.$message({
message: '操作成功',
type: 'success',