From ab8e9e09aac47e46e3326310d360f2920970b1c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com> Date: Wed, 21 Jun 2023 13:20:16 +0800 Subject: [PATCH] =?UTF-8?q?2023-06-21=20=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/eam.js | 3 + src/views/modules/eam/eamAdmin.vue | 257 +++++++++++++----- src/views/modules/qc/IPQCResultEntry.vue | 1 - .../reportWorkOrder/reportCheckOrder.vue | 27 +- 4 files changed, 219 insertions(+), 69 deletions(-) diff --git a/src/api/eam/eam.js b/src/api/eam/eam.js index 96ca725..f27fd9f 100644 --- a/src/api/eam/eam.js +++ b/src/api/eam/eam.js @@ -13,6 +13,8 @@ export const initAdminLevel = data => createAPI(`/pms/eam/initAdminLevel`,'post' //获取所有部门 export const getEmpyDeptList = data => createAPI(`/pms/eam/getEmpyDeptList`,'post',data) +export const getMesList = data => createAPI(`/pms/eam/getMesList`,'post',data) + //---------------设备分类------------------- export const eamFamilySearch = data => createAPI(`/pms/eam/eamFamilySearch`,'post',data) @@ -152,6 +154,7 @@ export const getObjList= data => createAPI(`/pms/eam/getObjList`,'post',data) export const addObject= data => createAPI(`/pms/eam/addObject`,'post',data) export const delObject= data => createAPI(`/pms/eam/delObject`,'post',data) export const planObjectSearch= data => createAPI(`/pms/eam/planObjectSearch`,'post',data) +export const queryHistoryRecord= data => createAPI(`/pms/eam/queryHistoryRecord`,'post',data) //---------------设备清单------------------- export const getSpareSelectList= data => createAPI(`/pms/eam/getSpareSelectList`,'post',data) export const saveObjectSparesData= data => createAPI(`/pms/eam/saveObjectSparesData`,'post',data) diff --git a/src/views/modules/eam/eamAdmin.vue b/src/views/modules/eam/eamAdmin.vue index 46c3009..5bd82f4 100644 --- a/src/views/modules/eam/eamAdmin.vue +++ b/src/views/modules/eam/eamAdmin.vue @@ -97,14 +97,7 @@ - 部门: - - - - - - - + 部门 @@ -120,17 +113,17 @@ 工种 - - - - - - - - + + + + @@ -138,6 +131,60 @@ 关闭 + + + +
+ + + + + + + + + 查询 + + + + + + + + + +
+ + 确认 + 关闭 + + + @@ -150,6 +197,7 @@ eamAdminDelete, initAdminLevel, getEmpyDeptList, + getMesList, // 获取可用的MES账号 } from "@/api/eam/eam.js" import Chooselist from '@/views/modules/common/Chooselist_eam' import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' @@ -445,7 +493,40 @@ }, ], levelList:[], - + departmentModelFlag: false, + departmentData: { + site: this.$store.state.user.site, + deptId: '', + deptName: '', + }, + departmentListSelections: [], + departmentDetailList: [ + { + columnProp: 'deptId', + headerAlign: "center", + align: "center", + columnLabel: '部门编码', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + { + columnProp: 'deptName', + headerAlign: "center", + align: "center", + columnLabel: '部门名称', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + }, + ], + mesList: [] } }, mounted () { @@ -458,6 +539,33 @@ this.getDataList() }, methods: { + // 部门 + departmentClickRow(row){ + this.$refs.departmentTable.toggleRowSelection(row); + }, + // 多选 + selectionDepartment (val) { + this.departmentListSelections = val + }, + selectFlag(){ + return true; + }, + + // 确认多选部门 + confirmDepartment(){ + if(this.departmentListSelections.length == 0){ + this.$alert('请勾选部门！', '提示', { + confirmButtonText: '确定' + }) + return false + } + for (let i = 0; i < this.departmentListSelections.length; i++) { + this.modalData.department = this.modalData.department + ";" + this.departmentListSelections[i].deptId + } + this.modalData.department = this.modalData.department.substring(1) + this.departmentModelFlag = false + }, + // 获取基础数据列表S getBaseList (val,type) { this.tagNo = val @@ -543,59 +651,68 @@ this.dataListSelections = val }, addModal(){ - this.modalData={ - flag:'1', - site: this.$store.state.user.site, - adminID:'', - adminName:'', - active:'', - department:'', - phone:'', - tel:'', - email:'', - levelID:'', - mesUser:'', + this.modalData = { + flag:'1', + site: this.$store.state.user.site, + adminID:'', + adminName:'', + active:'', + department:'', + phone:'', + tel:'', + email:'', + levelID:'', + mesUser:'', createdBy: this.$store.state.user.name, updateBy: this.$store.state.user.name, - }; - let inData={ - site:this.$store.state.user.site, - } - initAdminLevel(inData).then(({data}) => { - this.levelList=data.rows - }) - getEmpyDeptList(inData).then(({data}) => { - this.departmentList=data.rows - }) - this.modalDisableFlag=false; - this.modalFlag=true; + }; + let inData = { + site: this.$store.state.user.site, + } + getMesList(inData).then(({data}) => { + this.mesList = data.rows + }) + // initAdminLevel(inData).then(({data}) => { + // this.levelList=data.rows + // }) + // getEmpyDeptList(inData).then(({data}) => { + // this.departmentList = data.rows + // }) + this.modalDisableFlag = false; + this.modalFlag = true; }, updateModal(row){ - this.modalData={ - flag:'2', + this.modalData = { + flag: '2', site: row.site, - adminID:row.adminID, - adminName:row.adminName, - active:row.active, - department:row.department, - phone:row.phone, - tel:row.tel, - email:row.email, - levelID:row.levelID, - mesUser:row.mesUser, + adminID: row.adminID, + adminName: row.adminName, + active: row.active, + department: row.department, + phone: row.phone, + tel: row.tel, + email: row.email, + levelID: row.levelID, + mesUser: row.mesUser, updateBy: this.$store.state.user.name, }; - let inData={ - site:this.$store.state.user.site, + let inData = { + site: this.$store.state.user.site, } - initAdminLevel(inData).then(({data}) => { - this.levelList=data.rows - }) - getEmpyDeptList(inData).then(({data}) => { - this.departmentList=data.rows + getMesList(inData).then(({data}) => { + this.mesList = data.rows }) - this.modalDisableFlag=true; - this.modalFlag=true; + // let inData = { + // site: this.$store.state.user.site, + // } + // initAdminLevel(inData).then(({data}) => { + // this.levelList = data.rows + // }) + // getEmpyDeptList(inData).then(({data}) => { + // this.departmentList = data.rows + // }) + this.modalDisableFlag = true; + this.modalFlag = true; }, // 删除 deleteAdmin (row) { @@ -694,7 +811,22 @@ } }, -// 校验用户是否收藏 + // 获取部门列表 + getDepartmentList(){ + getEmpyDeptList(this.departmentData).then(({data}) => { + if (data && data.code === 0) { + this.departmentList = data.rows + this.modalData.department = '' + this.departmentModelFlag = true; + }else { + this.$alert(data.msg, '错误', { + confirmButtonText: '确定' + }) + } + }) + }, + + // 校验用户是否收藏 favoriteIsOk() { let userFavorite = { userId: this.$store.state.user.id, @@ -737,7 +869,6 @@ this.favorite = true }) } - }, }, diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index d5e70b4..963efc8 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -202,7 +202,6 @@ - diff --git a/src/views/modules/reportWorkOrder/reportCheckOrder.vue b/src/views/modules/reportWorkOrder/reportCheckOrder.vue index 0feed17..f73353d 100644 --- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue +++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue @@ -120,13 +120,11 @@ value-format='yyyy-MM-dd HH:mm:ss' format='yyyy-MM-dd HH:mm:ss' placeholder="结束日期"> - - - + - + @@ -135,6 +133,10 @@ + + 点检单 + 点检记录 +
{ + this.HistoryRecordList = data.rows + }) + this.HistoryModelFlag = true + }, } }