wilson
/
Jiantengmes-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-04-02 

功能优化
master
fengyuan_yang 2 years ago
parent
9a53a9513c
commit
d1cf1e86c6
7 changed files with 547 additions and 213 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/api/eam/eam.js
  2. 128
      src/views/modules/eam/eamWorkOrderForMaintenance.vue
  3. 178
      src/views/modules/eam/eamWorkPlanForCheck.vue
  4. 169
      src/views/modules/eam/eamWorkPlanForMaintenance.vue
  5. 16
      src/views/modules/reportWorkOrder/reportCheckOrder.vue
  6. 144
      src/views/modules/reportWorkOrder/reportDefectOrder.vue
  7. 119
      src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue

6
src/api/eam/eam.js
View File

@ -189,4 +189,10 @@ export const getSiteAndBuByUserName= data => createAPI(`/pms/eam/getSiteAndBuByU
export const eamCheckRecordSearch= data => createAPI(`/pms/eam/eamCheckRecordSearch`,'post',data)
export const eamDefectRecordSearch= data => createAPI(`/pms/eam/eamDefectRecordSearch`,'post',data)
/**
* 获取用户角色列表
* @param data
* @returns {*}
*/
export const getUserRoleList= data => createAPI(`/pms/eam/getUserRoleList`,'post',data)

128
src/views/modules/eam/eamWorkOrderForMaintenance.vue
View File

@ -160,7 +160,7 @@
<el-input v-model="saveData.actualOperatorName" disabled style="width: 120px"></el-input>
</el-form-item>
<el-form-item>
<span v-if="saveData.status === '待审核'" slot="label" @click="getOperatorList()"><a>协同人员</a></span>
<span v-if="saveData.status === '待审核'" slot="label" @click="getOperatorList"><a>协同人员</a></span>
<span v-else slot="label">协同人员</span>
<el-input v-model="saveData.operator" readonly style="width: 221px"></el-input>
</el-form-item>
@ -328,27 +328,27 @@
</el-dialog>
<!-- 人员 -->
<el-dialog title="人员清单" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="520px">
<el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="520px">
<div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'所属角色'">
<el-select value="roleName" v-model="operatorData.roleName" clearable placeholder="请选择" style="width: 120px">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleID"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleName">
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'用户账号'">
<el-input v-model="operatorData.adminID" style="width: 120px"></el-input>
<el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'用户名称'">
<el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
<el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList">查询</el-button>
<el-button type="primary" @click="getOperatorList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
@ -406,7 +406,8 @@ import {
checkWorkOrder,
searchFileUrl,
updateWorkOrder,
getSiteAndBuByUserName
getSiteAndBuByUserName,
getUserRoleList
} from "@/api/eam/eam.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -1002,8 +1003,8 @@ export default {
bu: '',
adminID: '',
adminName: '',
roleID: '',
roleName: '机修人员',
roleId: '',
roleName: '',
},
roleList: [],
operatorList: [],
@ -1078,6 +1079,8 @@ export default {
// 动态列
this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
// 获取用户角色
this.getUserRoleList()
},
methods: {
@ -1492,11 +1495,30 @@ export default {
}
},
// 获取用户角色
getUserRoleList () {
getUserRoleList().then(({data}) => {
if (data.code === 0) {
this.roleList = data.rows
} else {
this.roleList = []
}
})
},
// 获取人员列表
getOperatorList () {
this.getRoleNameList()
this.operatorModelFlag = true
this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号
@ -1511,6 +1533,7 @@ export default {
this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
}
})
this.operatorModelFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -1519,28 +1542,66 @@ export default {
})
},
// 获取数据列表
getRoleNameList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/role/list2'),
method: 'get',
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
})
}).then(({data}) => {
// 查询机修人员列表
getOperatorList2 () {
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.roleList = data.page.list
this.totalPage = data.page.totalCount
this.operatorList = data.rows
} else {
this.roleList = []
this.totalPage = 0
this.operatorList = []
}
this.dataListLoading = false
})
},
// // 获取人员列表
// getOperatorList () {
// this.getRoleNameList()
// this.operatorModelFlag = true
// this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
// // 先清空缓存选中
// this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// // 拿到选中的人员编号
// let tempDataList = (this.saveData.adminID == null ? '' : this.saveData.adminID).split(';')
// // 查询所有部门
// getOperatorList(this.operatorData).then(({data}) => {
// if (data && data.code === 0) {
// this.operatorList = data.rows
// this.operatorList.forEach(val => {
// // 回显选中的部门
// if (tempDataList.includes(val.adminID)) {
// this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
// }
// })
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// },
//
// // 获取数据列表
// getRoleNameList () {
// this.dataListLoading = true
// this.$http({
// url: this.$http.adornUrl('/sys/role/list2'),
// method: 'get',
// params: this.$http.adornParams({
// 'page': this.pageIndex,
// 'limit': this.pageSize,
// })
// }).then(({data}) => {
// if (data && data.code === 0) {
// this.roleList = data.page.list
// this.totalPage = data.page.totalCount
// } else {
// this.roleList = []
// this.totalPage = 0
// }
// this.dataListLoading = false
// })
// },
// 部门
operatorClickRow (row) {
this.$refs.operatorTable.toggleRowSelection(row)
@ -1609,15 +1670,6 @@ export default {
})
},
closeDialog () {
this.operatorData = {
site: '',
adminName: '',
adminID: '',
roleName: '机修人员',
}
},
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) {
let queryTableUser = {

178
src/views/modules/eam/eamWorkPlanForCheck.vue
View File

@ -216,11 +216,11 @@
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item prop="operatorName" :rules="rules.operatorNameType">
<span slot="label" @click="getOperatorList()"><a>计划执行人员</a></span>
<span slot="label" @click="getOperatorList"><a>计划执行人员</a></span>
<el-input v-model="modalData.operatorName" style="width: 260px"></el-input>
</el-form-item>
<el-form-item prop="checkerName" :rules="rules.checkerNameType">
<span slot="label" @click="getCheckerList()"><a>选择审核人员</a></span>
<span slot="label" @click="getCheckerList"><a>选择审核人员</a></span>
<el-input v-model="modalData.checkerName" style="width: 260px"></el-input>
</el-form-item>
</el-form>
@ -370,11 +370,11 @@
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
<el-form-item prop="operatorName" :rules="rules.operatorNameType">
<span slot="label" @click="getOperatorList()"><a>计划执行人员</a></span>
<span slot="label" @click="getOperatorList"><a>计划执行人员</a></span>
<el-input v-model="modalData.operatorName" style="width: 260px"></el-input>
</el-form-item>
<el-form-item prop="checkerName" :rules="rules.checkerNameType">
<span slot="label" @click="getCheckerList()"><a>选择审核人员</a></span>
<span slot="label" @click="getCheckerList"><a>选择审核人员</a></span>
<el-input v-model="modalData.checkerName" style="width: 260px"></el-input>
</el-form-item>
</el-form>
@ -386,7 +386,7 @@
<div style="text-align: center ;font-size: 11px">
<span> ----------------------------------------------------选择设备----------------------------------------------------</span>
</div>
<el-button type="primary" @click="addPlanDetail()">设备编辑</el-button>
<el-button type="primary" @click="addPlanDetail">设备编辑</el-button>
<el-table
:height="200"
:data="updateObjectList"
@ -587,27 +587,27 @@
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 机修人员清单 -->
<el-dialog title="执行人员清单" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<el-dialog title="执行人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'所属角色'">
<el-select value="roleName" v-model="operatorData.roleName" clearable placeholder="请选择" style="width: 120px">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleID"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleName">
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'用户账号'">
<el-input v-model="operatorData.adminID" style="width: 120px"></el-input>
<el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'用户名称'">
<el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
<el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList()">查询</el-button>
<el-button type="primary" @click="getOperatorList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
@ -653,23 +653,23 @@
<div class="rq">
<el-form :inline="true" label-position="top" :model="checkerData">
<el-form-item :label="'所属角色'">
<el-select value="roleName" v-model="checkerData.roleName" clearable placeholder="请选择" style="width: 120px">
<el-select v-model="checkerData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleID"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleName">
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'人员编码'">
<el-input v-model="checkerData.adminID" style="width: 120px"></el-input>
<el-input v-model="checkerData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'人员姓名'">
<el-input v-model="checkerData.adminName" style="width: 120px"></el-input>
<el-input v-model="checkerData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getCheckerList()">查询</el-button>
<el-button type="primary" @click="getCheckerList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
@ -823,7 +823,8 @@
addObject, // 添加设备
delObject, // 移除设备
planObjectSearch, // 查询该计划的设备
getSiteAndBuByUserName
getSiteAndBuByUserName,
getUserRoleList
} from "@/api/eam/eam.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -1551,7 +1552,7 @@
bu: '',
adminID: '',
adminName: '',
roleID: '',
roleId: '',
roleName: '',
},
checkerData: {
@ -1559,7 +1560,7 @@
bu: '',
adminID: '',
adminName: '',
roleID: '',
roleId: '',
roleName: '',
},
updateDetailData: {
@ -1691,6 +1692,8 @@
// 动态列
this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
// 获取用户角色
this.getUserRoleList()
},
methods: {
@ -1884,14 +1887,22 @@
// 获取机修人员列表
getOperatorList () {
this.operatorData.bu = this.modalData.bu
this.operatorData.site = this.$store.state.user.site
this.getRoleNameList()
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.modalData.operatorName = ''
this.modalData.operator = ''
this.operatorModelFlag = true;
this.operatorModelFlag = true
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
@ -1900,36 +1911,86 @@
})
},
// 获取数据列表
getRoleNameList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/role/list2'),
method: 'get',
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
})
}).then(({data}) => {
let temp = []
// 查询机修人员列表
getOperatorList2 () {
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.roleList = data.page.list
temp = this.roleList[0]
this.roleList[0] = this.roleList[1]
this.roleList[1] = temp
this.totalPage = data.page.totalCount
this.operatorList = data.rows
} else {
this.operatorList = []
}
})
},
// 获取用户角色
getUserRoleList () {
getUserRoleList().then(({data}) => {
if (data.code === 0) {
this.roleList = data.rows
} else {
this.roleList = []
this.totalPage = 0
}
this.dataListLoading = false
})
},
// // 获取机修人员列表
// getOperatorList () {
// this.operatorData.bu = this.modalData.bu
// this.operatorData.site = this.$store.state.user.site
// this.getRoleNameList()
// getOperatorList(this.operatorData).then(({data}) => {
// if (data && data.code === 0) {
// this.operatorList = data.rows
// this.modalData.operatorName = ''
// this.modalData.operator = ''
// this.operatorModelFlag = true;
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// },
//
// // 获取数据列表
// getRoleNameList () {
// this.dataListLoading = true
// this.$http({
// url: this.$http.adornUrl('/sys/role/list2'),
// method: 'get',
// params: this.$http.adornParams({
// 'page': this.pageIndex,
// 'limit': this.pageSize,
// })
// }).then(({data}) => {
// let temp = []
// if (data && data.code === 0) {
// this.roleList = data.page.list
// temp = this.roleList[0]
// this.roleList[0] = this.roleList[1]
// this.roleList[1] = temp
// this.totalPage = data.page.totalCount
// } else {
// this.roleList = []
// this.totalPage = 0
// }
// this.dataListLoading = false
// })
// },
// 获取审核人员
getCheckerList () {
this.checkerData.bu = this.modalData.bu
this.getRoleNameList()
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.checkerData.roleId = filterList[0].roleId
} else {
this.checkerData.roleId = this.roleList[0].roleId
}
} else {
this.checkerData.roleId = ''
}
getCheckerList(this.checkerData).then(({data}) => {
if (data && data.code === 0) {
this.checkerList = data.rows
@ -1944,6 +2005,35 @@
})
},
// 查询机修人员列表
getCheckerList2 () {
getCheckerList(this.checkerData).then(({data}) => {
if (data && data.code === 0) {
this.checkerList = data.rows
} else {
this.checkerList = []
}
})
},
// // 获取审核人员
// getCheckerList () {
// this.checkerData.bu = this.modalData.bu
// this.getRoleNameList()
// getCheckerList(this.checkerData).then(({data}) => {
// if (data && data.code === 0) {
// this.checkerList = data.rows
// this.modalData.checkerName = ''
// this.modalData.checker = ''
// this.checkerModelFlag = true
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// },
// 多选
selectionChangeHandle2 (val) {
this.dataListSelections2 = val

169
src/views/modules/eam/eamWorkPlanForMaintenance.vue
View File

@ -578,23 +578,23 @@
<div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'所属角色'">
<el-select value="roleName" v-model="operatorData.roleName" clearable placeholder="请选择" style="width: 120px">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleID"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleName">
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'用户账号'">
<el-input v-model="operatorData.adminID" style="width: 120px"></el-input>
<el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'用户名称'">
<el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
<el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList()">查询</el-button>
<el-button type="primary" @click="getOperatorList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
@ -640,23 +640,23 @@
<div class="rq">
<el-form :inline="true" label-position="top" :model="checkerData">
<el-form-item :label="'所属角色'">
<el-select value="roleName" v-model="checkerData.roleName" clearable placeholder="请选择" style="width: 120px">
<el-select v-model="checkerData.roleName" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleID"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleName">
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'人员编码'">
<el-input v-model="checkerData.adminID" style="width: 120px"></el-input>
<el-input v-model="checkerData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'人员姓名'">
<el-input v-model="checkerData.adminName" style="width: 120px"></el-input>
<el-input v-model="checkerData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getCheckerList()">查询</el-button>
<el-button type="primary" @click="getCheckerList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
@ -806,7 +806,8 @@
getPlanDetailList, // 查询计划详情
getObjList, // 获取设备的差异列表(快速新增)
planObjectSearch, // 查询该计划的设备
getSiteAndBuByUserName
getSiteAndBuByUserName,
getUserRoleList
} from "@/api/eam/eam.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -1442,14 +1443,14 @@
bu: '',
adminID: '',
adminName: '',
roleID: '',
roleName: '机修人员',
roleId: '',
roleName: '',
},
operatorData: {
site: '',
bu: '',
roleID: '',
roleName: '机修人员',
roleId: '',
roleName: '',
adminID: '',
adminName: ''
},
@ -1740,6 +1741,8 @@
// 动态列
this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
// 获取用户角色
this.getUserRoleList()
},
methods: {
@ -1772,8 +1775,16 @@
// 获取机修人员列表
getOperatorList () {
this.operatorData.bu = this.modalData.bu
this.operatorData.site = this.$store.state.user.site
this.getRoleNameList()
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
@ -1788,36 +1799,105 @@
})
},
// 获取数据列表
getRoleNameList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/role/list2'),
method: 'get',
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
})
}).then(({data}) => {
let temp = []
// 查询机修人员列表
getOperatorList2 () {
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.roleList = data.page.list
temp = this.roleList[0]
this.roleList[0] = this.roleList[1]
this.roleList[1] = temp
this.totalPage = data.page.totalCount
this.operatorList = data.rows
} else {
this.operatorList = []
}
})
},
// 获取用户角色
getUserRoleList () {
getUserRoleList().then(({data}) => {
if (data.code === 0) {
this.roleList = data.rows
} else {
this.roleList = []
this.totalPage = 0
}
this.dataListLoading = false
})
},
// // 获取机修人员列表
// getOperatorList () {
// this.operatorData.bu = this.modalData.bu
// this.operatorData.site = this.$store.state.user.site
// this.getRoleNameList()
// getOperatorList(this.operatorData).then(({data}) => {
// if (data && data.code === 0) {
// this.operatorList = data.rows
// this.modalData.operatorName = ''
// this.modalData.operator = ''
// this.operatorModelFlag = true
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// },
//
// // 获取数据列表
// getRoleNameList () {
// this.dataListLoading = true
// this.$http({
// url: this.$http.adornUrl('/sys/role/list2'),
// method: 'get',
// params: this.$http.adornParams({
// 'page': this.pageIndex,
// 'limit': this.pageSize,
// })
// }).then(({data}) => {
// let temp = []
// if (data && data.code === 0) {
// this.roleList = data.page.list
// temp = this.roleList[0]
// this.roleList[0] = this.roleList[1]
// this.roleList[1] = temp
// this.totalPage = data.page.totalCount
// } else {
// this.roleList = []
// this.totalPage = 0
// }
// this.dataListLoading = false
// })
// },
// // 获取审核人员
// getCheckerList () {
// this.checkerData.bu = this.modalData.bu
// this.getRoleNameList()
// getCheckerList(this.checkerData).then(({data}) => {
// if (data && data.code === 0) {
// this.checkerList = data.rows
// this.modalData.checkerName = ''
// this.modalData.checker = ''
// this.checkerModelFlag = true
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// },
// 获取审核人员
getCheckerList () {
this.checkerData.bu = this.modalData.bu
this.getRoleNameList()
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '审核人员')
if (filterList.length > 0) {
this.checkerData.roleId = filterList[0].roleId
} else {
this.checkerData.roleId = this.roleList[0].roleId
}
} else {
this.checkerData.roleId = ''
}
getCheckerList(this.checkerData).then(({data}) => {
if (data && data.code === 0) {
this.checkerList = data.rows
@ -1832,6 +1912,17 @@
})
},
// 查询机修人员列表
getCheckerList2 () {
getCheckerList(this.checkerData).then(({data}) => {
if (data && data.code === 0) {
this.checkerList = data.rows
} else {
this.checkerList = []
}
})
},
selectFlag () {
return true
},

16
src/views/modules/reportWorkOrder/reportCheckOrder.vue
View File

@ -385,12 +385,6 @@
handler: function (newV, oldV) {
this.saveData.workTime = Math.ceil(Math.floor(this.dayjs(this.saveData.endDate2).diff(this.saveData.startDate2, 'seconds') / 30) / 2)
}
},
searchData: {
deep: true,
handler: function (newV, oldV) {
this.searchData.groupID = this.searchData.groupID.toUpperCase()
}
}
},
data () {
@ -1352,11 +1346,11 @@
this.$message.warning(this.detailList[i].itemDesc+'实测值未填写！')
return
}
if (this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue !== '' && this.detailList[i].numberValue != null) {
if((this.detailList[i].minValue !== "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)){
this.detailList[i].itemResult = '不合格'
}
}
// if (this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue !== '' && this.detailList[i].numberValue != null) {
// if((this.detailList[i].minValue !== "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue != "" && this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)){
// this.detailList[i].itemResult = '不合格'
// }
// }
}
if (this.saveData.checkResult === '不合格') {
this.detailList.forEach(val => {

144
src/views/modules/reportWorkOrder/reportDefectOrder.vue
View File

@ -265,16 +265,16 @@
</el-dialog>
<!-- 执行人员清单 -->
<el-dialog title="执行人员清单" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<el-dialog title="执行人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'所属角色'">
<el-select value="roleName" v-model="operatorData.roleName" clearable placeholder="请选择" style="width: 120px">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleID"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleName">
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
@ -285,7 +285,7 @@
<el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList()">查询</el-button>
<el-button type="primary" @click="getOperatorList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
@ -367,6 +367,7 @@
searchFileUrl, // 查询文件路径
reach, // 到达
getSiteAndBuByUserName, // 获取用户的site和bu
getUserRoleList, // 获取用户角色列表
} from "@/api/eam/eam.js"
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
import Chooselist from '@/views/modules/common/Chooselist_eam'
@ -742,9 +743,8 @@
bu: '',
adminID: '',
adminName: '',
departmentName: '',
roleID: '',
roleName: '机修人员',
roleId: '',
roleName: '',
},
operatorModelFlag: false,
operatorList: [],
@ -993,6 +993,8 @@
// 动态列
this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
// 获取用户角色
this.getUserRoleList()
},
methods: {
@ -1105,19 +1107,34 @@
this.$refs.operatorTable.toggleRowSelection(row)
},
// 获取用户角色
getUserRoleList () {
getUserRoleList().then(({data}) => {
if (data.code === 0) {
this.roleList = data.rows
} else {
this.roleList = []
}
})
},
// 获取机修人员列表
getOperatorList () {
this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
this.operatorData.site = this.$store.state.user.site
this.getRoleNameList()
if (this.saveData.operator == null) {
this.saveData.operator = ''
this.saveData.operatorName = ''
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
// 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 拿到选中的人员编号
let tempDataList = this.saveData.operator.split(';')
let tempDataList = (this.saveData.operator == null ? '' : this.saveData.operator).split(';')
// 查询人员
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
@ -1135,34 +1152,84 @@
})
}
})
if (this.saveData.operator == null) {
this.saveData.operator = ''
this.saveData.operatorName = ''
}
},
// 获取数据列表
getRoleNameList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/role/list2'),
method: 'get',
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
})
}).then(({data}) => {
let temp = []
// 查询机修人员列表
getOperatorList2 () {
// // 先清空缓存选中
// this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// 查询人员
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.roleList = data.page.list
temp = this.roleList[0]
this.roleList[0] = this.roleList[1]
this.roleList[1] = temp
this.totalPage = data.page.totalCount
this.operatorList = data.rows
} else {
this.roleList = []
this.totalPage = 0
this.operatorList = []
}
this.dataListLoading = false
})
},
// // 获取机修人员列表
// getOperatorList () {
// this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
// this.operatorData.site = this.$store.state.user.site
// this.getRoleNameList()
// if (this.saveData.operator == null) {
// this.saveData.operator = ''
// this.saveData.operatorName = ''
// }
// // 先清空缓存选中
// this.$nextTick(() => this.$refs.operatorTable.clearSelection())
// // 拿到选中的人员编号
// let tempDataList = this.saveData.operator.split(';')
// // 查询人员
// getOperatorList(this.operatorData).then(({data}) => {
// if (data && data.code === 0) {
// this.operatorList = data.rows
// this.operatorList.forEach(val => {
// // 回显选中的人员
// if (tempDataList.includes(val.adminID)) {
// this.$nextTick(() => this.$refs.operatorTable.toggleRowSelection(val, true))
// }
// })
// this.operatorModelFlag = true
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// },
//
// // 获取数据列表
// getRoleNameList () {
// this.dataListLoading = true
// this.$http({
// url: this.$http.adornUrl('/sys/role/list2'),
// method: 'get',
// params: this.$http.adornParams({
// 'page': this.pageIndex,
// 'limit': this.pageSize,
// })
// }).then(({data}) => {
// let temp = []
// if (data && data.code === 0) {
// this.roleList = data.page.list
// temp = this.roleList[0]
// this.roleList[0] = this.roleList[1]
// this.roleList[1] = temp
// this.totalPage = data.page.totalCount
// } else {
// this.roleList = []
// this.totalPage = 0
// }
// this.dataListLoading = false
// })
// },
// 多选
selectionChangeHandle2 (val) {
this.dataListSelections2 = val
@ -1534,15 +1601,6 @@
document.activeElement.blur()
},
closeDialog () {
this.operatorData = {
site: '',
adminName: '',
adminID: '',
roleName: '机修人员',
}
},
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) {
let queryTableUser = {

119
src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
View File

@ -101,8 +101,8 @@
fixed="right"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" v-if="scope.row.status=='未开工'" @click="reach(scope.row)">到达</a>
<a type="text" size="small" v-if="scope.row.status=='已到达'" @click="reportModal(scope.row)">执行</a>
<el-link style="cursor: pointer" v-if="scope.row.status === '未开工'" @click="reach(scope.row)">到达</el-link>
<el-link style="cursor: pointer" v-if="scope.row.status === '已到达'" @click="reportModal(scope.row)">执行</el-link>
</template>
</el-table-column>
</el-table>
@ -354,27 +354,27 @@
</el-dialog>
<!-- 机修人员清单 -->
<el-dialog title="协同人员清单" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<el-dialog title="协同人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'所属角色'">
<el-select value="roleName" v-model="operatorData.roleName" clearable placeholder="请选择" style="width: 120px">
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleID"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleName">
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'用户编码'">
<el-input v-model="operatorData.adminID" style="width: 120px"></el-input>
<el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'用户姓名'">
<el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
<el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList">查询</el-button>
<el-button type="primary" @click="getOperatorList2">查询</el-button>
</el-form-item>
</el-form>
<el-table
@ -431,7 +431,8 @@
getOperatorList,
refreshItem,
reach,
getSiteAndBuByUserName
getSiteAndBuByUserName,
getUserRoleList, // 获取用户角色列表
} from "@/api/eam/eam.js"
import {
getTableDefaultListLanguage,
@ -1131,7 +1132,7 @@
bu: '',
adminID: '',
adminName: '',
roleName: '机修人员',
roleName: '',
roleId: '',
},
roleList: [],
@ -1206,6 +1207,8 @@
this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
this.getTableUserColumn(this.$route.meta.menuId+'table3',3)
// 获取用户角色
this.getUserRoleList()
},
methods: {
@ -1341,10 +1344,30 @@
})
},
// 获取用户角色
getUserRoleList () {
getUserRoleList().then(({data}) => {
if (data.code === 0) {
this.roleList = data.rows
} else {
this.roleList = []
}
})
},
// 获取机修人员列表
getOperatorList () {
this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
this.getRoleNameList()
if (this.roleList.length > 0) {
let filterList = this.roleList.filter(item => item.roleName === '机修人员')
if (filterList.length > 0) {
this.operatorData.roleId = filterList[0].roleId
} else {
this.operatorData.roleId = this.roleList[0].roleId
}
} else {
this.operatorData.roleId = ''
}
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
@ -1359,24 +1382,53 @@
})
},
// 获取数据列表
getRoleNameList () {
this.$http({
url: this.$http.adornUrl('/sys/role/list2'),
method: 'get',
params: this.$http.adornParams({
'page': this.pageIndex,
'limit': this.pageSize,
})
}).then(({data}) => {
// 查询机修人员列表
getOperatorList2 () {
getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.roleList = data.page.list
this.operatorList = data.rows
} else {
this.roleList = []
this.operatorList = []
}
})
},
// // 获取机修人员列表
// getOperatorList () {
// this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
// this.getRoleNameList()
// getOperatorList(this.operatorData).then(({data}) => {
// if (data && data.code === 0) {
// this.operatorList = data.rows
// this.saveData.operatorName = ''
// this.saveData.operator = ''
// this.operatorModelFlag = true
// } else {
// this.$alert(data.msg, '错误', {
// confirmButtonText: '确定'
// })
// }
// })
// },
//
// // 获取数据列表
// getRoleNameList () {
// this.$http({
// url: this.$http.adornUrl('/sys/role/list2'),
// method: 'get',
// params: this.$http.adornParams({
// 'page': this.pageIndex,
// 'limit': this.pageSize,
// })
// }).then(({data}) => {
// if (data && data.code === 0) {
// this.roleList = data.page.list
// } else {
// this.roleList = []
// }
// })
// },
// 点击行选中复选框
operatorClickRow (row) {
@ -1668,11 +1720,11 @@
this.$message.warning(this.detailList[i].itemDesc+'实测值未填写！')
return
}
if (this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue !== '' && this.detailList[i].numberValue != null) {
if ((this.detailList[i].minValue !== "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue !== ""&& this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)) {
this.detailList[i].itemResult = '不合格'
}
}
// if (this.detailList[i].valueTypeDb === 'N' && this.detailList[i].numberValue !== '' && this.detailList[i].numberValue != null) {
// if ((this.detailList[i].minValue !== "" && this.detailList[i].minValue != null && this.detailList[i].minValue > this.detailList[i].numberValue) || (this.detailList[i].minValue !== ""&& this.detailList[i].minValue != null && this.detailList[i].maxValue < this.detailList[i].numberValue)) {
// this.detailList[i].itemResult = '不合格'
// }
// }
}
if (this.saveData.checkResult === '不合格') {
this.detailList.forEach(val => {
@ -1728,15 +1780,6 @@
document.activeElement.blur()
},
closeDialog () {
this.operatorData = {
site: '',
adminName: '',
adminID: '',
roleName: '机修人员',
}
},
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) {
let queryTableUser = {

Write Preview
Loading…
Cancel
Save