diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js index fb90ea8..1480249 100644 --- a/src/api/eam/eam.js +++ b/src/api/eam/eam.js @@ -107,6 +107,7 @@ export const modalCodeBlur = data => createAPI(`/pms/eam/modalCodeBlur`,'post',d export const planOrder = data => createAPI(`/pms/eam/planOrder`,'post',data) export const cancelPlan = data => createAPI(`/pms/eam/cancelPlan`,'post',data) +export const getOperatorList = data => createAPI(`/pms/eam/getOperatorList`,'post',data) // 获取机修人员列表 //---------------点检工单------------------- export const eamWorkOrderSearch = data => createAPI(`/pms/eam/eamWorkOrderSearch`,'post',data) export const cancelOrder= data => createAPI(`/pms/eam/cancelOrder`,'post',data) diff --git a/src/api/eam/eam_object_list.js b/src/api/eam/eam_object_list.js index 5aa8975..9b3e19f 100644 --- a/src/api/eam/eam_object_list.js +++ b/src/api/eam/eam_object_list.js @@ -23,5 +23,12 @@ export const uploadEamObjectFile = data => createAPI('/sys/file/upload','post',d export const downLoadObjectFile = data => createAPI(`pms/eamObject/downLoadObjectFile?id=`+data.id,'GET') - +// ===================================== 设备知识库 ===================================== +export const getKnowledgeBaseList = data => createAPI('/pms/eamKnowledgeBase/getKnowledgeBaseList','post',data) // 查询文件列表 +export const getDefectList = data => createAPI('/pms/eamKnowledgeBase/getDefectList','post',data) // 获取故障列表 +export const saveKnowledgeBase = data => createAPI('/pms/eamKnowledgeBase/saveKnowledgeBase','post',data) // 新增知识库文件 +export const knowledgeBaseUpdate = data => createAPI('/pms/eamKnowledgeBase/knowledgeBaseUpdate','post',data) // 修改知识库文件 +export const knowledgeBaseDelete = data => createAPI('/pms/eamKnowledgeBase/knowledgeBaseDelete','post',data) // 删除知识库文件 +export const knowledgeBaseUpload = data => createAPI('/pms/eamKnowledgeBase/knowledgeBaseUpload','post',data) // 上传知识库文件 +export const knowledgeBaseDeleteSome = data => createAPI('/pms/eamKnowledgeBase/knowledgeBaseDeleteSome','post',data) // 批量删除知识库文件 diff --git a/src/views/modules/eam/com_eam_knowledge_base_upload_file.vue b/src/views/modules/eam/com_eam_knowledge_base_upload_file.vue new file mode 100644 index 0000000..b8854a5 --- /dev/null +++ b/src/views/modules/eam/com_eam_knowledge_base_upload_file.vue @@ -0,0 +1,150 @@ + + + + diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue index 73eded6..1e83b86 100644 --- a/src/views/modules/eam/eamWorkPlanForCheck.vue +++ b/src/views/modules/eam/eamWorkPlanForCheck.vue @@ -164,8 +164,12 @@ + + + + - 默认机修人员 + 选择机修人员 @@ -392,6 +396,57 @@ + + +
+ + + + + + + + + 查询 + + + + + + + + + +
+ + 确认 + 关闭 + + + @@ -412,6 +467,7 @@ getObjectList, planOrder, cancelPlan, + getOperatorList, // 获取机修人员列表 } from "@/api/eam/eam.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' @@ -921,7 +977,6 @@ columnWidth: 70, }, ], - itemModalData:{ site:'', planID:'', @@ -939,7 +994,6 @@ }, itemModalFlag:false, itemModalDisableFlag:false, - itemFlag:'text', chooseModalFlag:false, chooseModalData:{ @@ -961,6 +1015,112 @@ createdBy: this.$store.state.user.name }, itemAddModalFlag:false, + operatorList: [], + operatorModelFlag: false, + operatorDetailList: [ + { + columnProp: 'adminID', + headerAlign: "center", + align: "left", + columnLabel: '编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'adminName', + headerAlign: "center", + align: "left", + columnLabel: '名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'phone', + headerAlign: "center", + align: "left", + columnLabel: '电话', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'department', + headerAlign: "center", + align: "left", + columnLabel: '部门', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'email', + headerAlign: "center", + align: "left", + columnLabel: '邮箱', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'tel', + headerAlign: "center", + align: "left", + columnLabel: 'tel', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'adminLevelDesc', + headerAlign: "center", + align: "left", + columnLabel: '等级', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'mesUser', + headerAlign: "center", + align: "left", + columnLabel: 'mesUser', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + ], + dataListSelections2: [], + operatorData: { + site: this.$store.state.user.site, + adminID: '', + adminName: '' + } } }, mounted () { @@ -973,53 +1133,37 @@ this.getDataList() }, methods: { - // 校验用户是否收藏 - favoriteIsOk() { - let userFavorite = { - userId: this.$store.state.user.id, - languageCode: this.$i18n.locale - } - console.log(this.$route.meta.menuId) - userFavoriteList(userFavorite).then(({data}) => { - for (let i = 0; i < data.list.length; i++) { - // let flag=false; - if(this.$route.meta.menuId==data.list[i].menuId){ - this.favorite = true - // flag=true; - } + // 获取机修人员列表 + getOperatorList(){ + getOperatorList(this.operatorData).then(({data}) => { + if (data && data.code === 0) { + this.operatorList = data.rows + this.operatorModelFlag = true; + } else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) } - }) }, - // 收藏 OR 取消收藏 - favoriteFunction() { - let userFavorite = { - userId: this.$store.state.user.id, - functionId: this.$route.meta.menuId, - } - if (this.favorite) { - // 取消收藏 - this.$confirm(`确定取消收藏`, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - removeUserFavorite(userFavorite).then(({data}) => { - this.$message.success(data.msg) - this.favorite = false - }) - }) - } else { - // 收藏 - saveUserFavorite(userFavorite).then(({data}) => { - this.$message.success(data.msg) - this.favorite = true + // 多选 + selectionChangeHandle2 (val) { + this.dataListSelections2 = val + }, + selectFlag(){ + return true; + }, + // 确认多选机修人员 + confirmOperator(){ + if(this.dataListSelections2.length == 0){ + this.$alert('请勾选人员！', '错误', { + confirmButtonText: '确定' }) + return false } - + console.log(this.dataListSelections2) }, - // 获取基础数据列表S getBaseList (val,type) { this.tagNo = val @@ -1595,6 +1739,50 @@ }).catch(() => { }) }, + + // 校验用户是否收藏 + favoriteIsOk() { + let userFavorite = { + userId: this.$store.state.user.id, + languageCode: this.$i18n.locale + } + console.log(this.$route.meta.menuId) + userFavoriteList(userFavorite).then(({data}) => { + for (let i = 0; i < data.list.length; i++) { + // let flag=false; + if(this.$route.meta.menuId==data.list[i].menuId){ + this.favorite = true + // flag=true; + } + } + }) + }, + // 收藏 OR 取消收藏 + favoriteFunction() { + let userFavorite = { + userId: this.$store.state.user.id, + functionId: this.$route.meta.menuId, + } + if (this.favorite) { + // 取消收藏 + this.$confirm(`确定取消收藏`, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + removeUserFavorite(userFavorite).then(({data}) => { + this.$message.success(data.msg) + this.favorite = false + }) + }) + } else { + // 收藏 + saveUserFavorite(userFavorite).then(({data}) => { + this.$message.success(data.msg) + this.favorite = true + }) + } + }, } } diff --git a/src/views/modules/eam/eam_device_list.vue b/src/views/modules/eam/eam_device_list.vue index 9b49350..a72740e 100644 --- a/src/views/modules/eam/eam_device_list.vue +++ b/src/views/modules/eam/eam_device_list.vue @@ -25,9 +25,9 @@ - + 查询 - 新增 + 新增 复制到其他设备 +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + 查询 + 新增 + 批量删除 + + {{ "导出" }} + + + + + + + + + + + + + + + + + + + + + + + + + 设备编码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 保存 + 关闭 + + + + + + + + + + + 上传文件 + + + + + + + + + + + + + + + + +
+ + + + + diff --git a/src/views/modules/qc/qcMethod.vue b/src/views/modules/qc/qcMethod.vue index ac70636..43e75b8 100644 --- a/src/views/modules/qc/qcMethod.vue +++ b/src/views/modules/qc/qcMethod.vue @@ -129,6 +129,7 @@ methodNo: '', methodName: '', createBy: this.$store.state.user.name, + updateBy: this.$store.state.user.name, methodRemark: '', }, // 标头展示 @@ -217,6 +218,7 @@ this.modalData = { flag: '1', createBy: this.$store.state.user.name, + updateBy: this.$store.state.user.name, methodNo: '', methodName: '', methodRemark: '', @@ -229,6 +231,7 @@ this.modalData = { flag: '2', createBy: this.$store.state.user.name, + updateBy: this.$store.state.user.name, methodNo: row.methodNo, methodName: row.methodName, methodRemark: row.methodRemark, diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue index cfefd4f..df53400 100644 --- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue +++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue @@ -114,12 +114,12 @@ - - 故障图片 - - - 备件图片 - + + + + + +