-
-
-
-
-
-
-
-
-
-
-
-
- ➞
-
-
-
-
-
-
-
-
-
-
- 查询
- 新增计划
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row[item.columnProp] }}
- ![]()
-
-
-
-
- 下达
- 修改
- 删除
- 计划项目
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
- 设备编码
-
-
-
-
-
-
- 点检模板
-
+
-
-
+
-
+
+ placeholder="选择日期">
-
+
+ ➞
+
+
+ placeholder="选择日期">
-
-
-
- 默认机修人员
-
-
-
-
+
+
-
-
+ 查询
+ 新增计划
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+ ![]()
+
+
+
+
+ 下达
+ 修改
+ 删除
+ 计划项目
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 设备编码
+
+
+
+
+
+
+ 点检模板
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 默认机修人员
+
-
- 保存
- 关闭
-
-
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
@@ -170,7 +231,7 @@
-
+
this.modalData.planEndDate) {
+ this.$alert('计划开始日期不能小于结束日期！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return
+ }
if(this.modalData.flag=='1'){
+ if(this.dataListSelections.length==0){
+ this.$alert('请勾选设备！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }
+ this.modalData.objectList=this.dataListSelections
eamWorkPlanSave(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@@ -1109,8 +1228,8 @@
// eamPropertiesItemSave(this.itemModalData).then(({data}) => {
// if (data && data.code == '0') {
// searchPlanItems(this.detailData).then(({data}) => {
- // this.detailList = data.rows
- // })
+ // this.detailList = data.rows
+ // })
// this.itemModalFlag=false
// this.$message({
// message: '操作成功',
@@ -1245,12 +1364,12 @@
//----------项目可选值----------------end
createOrder(row){
- if(row.planStartDate < this.dayjs().format("YYYY-MM-DD")){
- this.$alert('计划开始日期小于今天！请修改开始日期', '错误', {
- confirmButtonText: '确定'
- })
- return false
- }
+ if(row.planStartDate < this.dayjs().format("YYYY-MM-DD")){
+ this.$alert('计划开始日期小于今天！请修改开始日期', '错误', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }
row.userId=this.$store.state.user.name
this.$confirm(`是创建日期为`+row.planStartDate+`的点检工单?`, '提示', {
confirmButtonText: '确定',
@@ -1303,6 +1422,11 @@
}
})
},
+ getObjectList(){
+ getObjectList(this.objectData).then(({data}) => {
+ this.objectList = data.rows
+ })
+ }
}
}
diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
index d7a401b..a661437 100644
--- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
@@ -106,11 +106,11 @@
-
+
设备编码
-
+
@@ -148,13 +148,74 @@
-
-
+
保存
关闭
@@ -327,6 +388,7 @@
createEamWorkOrder,
objectIDBlur,
modalCodeBlur,
+ getObjectList,
} from "@/api/eam/eam.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
export default {
@@ -341,7 +403,6 @@
this.searchData.objectID = this.searchData.objectID.toUpperCase()
}
},
-
modalData: {
deep: true,
handler: function (newV, oldV) {
@@ -368,7 +429,7 @@
planID: '',
planDesc: '',
objectID: '',
- status: '已计划',
+ status: '',
startDate: new Date(),
endDate:'',
functionType:'B',
@@ -385,6 +446,7 @@
modalFlag:false,
modalDisableFlag:false,
modalData:{
+ objectList:[],
flag:'',
functionType:'B',
site: this.$store.state.user.site,
@@ -400,9 +462,14 @@
planEndDate:'',
userId:'',
remark:'',
-
},
-
+ objectData:{
+ site: this.$store.state.user.site,
+ objectID:'',
+ objectDesc:'',
+ familyID:'',
+ },
+ objectList:[],
// 展示列集
columnList: [
{
@@ -567,6 +634,24 @@
fixed: '',
columnWidth: 140,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 101013,
+ serialNumber: '101013TableOperator',
+ tableId: "101013Table",
+ tableName: "点检计划表",
+ columnProp: 'operator',
+ headerAlign: "center",
+ align: "left",
+ columnLabel: '计划操作员',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 80,
+ },
{
userId: this.$store.state.user.name,
functionId: 101017,
@@ -870,7 +955,10 @@
strVal = this.modalData.operator
this.$refs.baseList.init(val, strVal)
}
-
+ if (val === 1027) {
+ strVal = this.objectData.familyID
+ this.$refs.baseList.init(val, strVal)
+ }
})
},
/* 列表方法的回调 */
@@ -886,6 +974,9 @@
if (this.tagNo === 201) {
this.modalData.operator = val.AdminID
}
+ if (this.tagNo === 1027) {
+ this.objectData.familyID = val.FamilyID
+ }
},
// 获取数据列表
getDataList () {
@@ -919,6 +1010,7 @@
addModal(){
this.modalData={
flag:'1',
+ objectList:[],
functionType:'B',
site: this.$store.state.user.site,
planID:'',
@@ -936,11 +1028,13 @@
remark:'',
};
this.modalDisableFlag=false;
+ this.objectList=[];
this.modalFlag=true;
},
updateModal(row){
this.modalData={
flag:'2',
+ objectList:[],
functionType:'B',
site:row.site,
planID:row.planID,
@@ -1018,7 +1112,32 @@
})
return
}
+ if (this.modalData.planEndDate == '' || this.modalData.planEndDate == null) {
+ this.$alert('请选择结束日期！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }
+ if (this.modalData.planEndDate < this.dayjs().format("YYYY-MM-DD")) {
+ this.$alert('计划结束日期不能小于今天！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return
+ }
+ if (this.modalData.planStartDate > this.modalData.planEndDate) {
+ this.$alert('计划开始日期不能小于结束日期！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return
+ }
if(this.modalData.flag=='1'){
+ if(this.dataListSelections.length==0){
+ this.$alert('请勾选设备！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }
+ this.modalData.objectList=this.dataListSelections
eamWorkPlanSave(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@@ -1303,6 +1422,11 @@
}
})
},
+ getObjectList(){
+ getObjectList(this.objectData).then(({data}) => {
+ this.objectList = data.rows
+ })
+ }
}
}
+
+
+
+
+
+
+ 设备分类编码
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ----------------------------------------------------选择设备----------------------------------------------------
+
+
+
+
+
+
+
+
+ 设备分类编码
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ----------------------------------------------------选择设备----------------------------------------------------
+
+