Browse Source

1.设备清单:增加设备负责人功能

2.维修反馈:新增时,选择设备后若该设备负责人在当天排班中,系统自动带出
java8
赵宏斌 4 months ago
parent
commit
6d11744da4
  1. 117
      src/views/modules/eam/com_eam_object_add_update.vue
  2. 45
      src/views/modules/eam/eamFeedBack.vue

117
src/views/modules/eam/com_eam_object_add_update.vue

@ -112,6 +112,12 @@
<el-input-number :controls="false" :step="0" min="0" v-model="pageData.timeOutMaintenanceDuration" style="width: 137px;"></el-input-number>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" v-if="this.pageData.addFlag == 'N'" style="margin-left: 7px">
<el-form-item label="设备负责人" >
<span slot="label" @click="addDeviceManager()"><a herf="#">设备负责人</a></span>
<el-input v-model="pageData.deviceManager" readonly style="width: 300px;"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" :model="pageData" style="margin-left: 7px">
<el-form-item label="备注" >
<el-input
@ -129,6 +135,68 @@
<el-button type="primary" @click="visible = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- 人员详情 -->
<el-dialog title="选择人员" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="500px">
<div style="font-size: 12px">
<el-form :inline="true" label-position="top" :model="detailData">
<el-form-item :label="'所属角色'">
<el-select v-model="detailData.roleId" placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleId"
:label = "i.roleName"
:value = "i.roleId">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'人员编码'">
<el-input v-model="detailData.adminID" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'人员姓名'">
<el-input v-model="detailData.adminName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList">查询</el-button>
</el-form-item>
</el-form>
</div>
<el-table
height="400px"
:data="operatorList"
border
ref="itemTable1"
@selection-change="selectionItemList"
highlight-current-row
style="width: 100%">
<el-table-column
type="selection"
header-align="center"
align="center"
:selectable="selectFlag"
width="50">
</el-table-column>
<el-table-column
prop="adminID"
header-align="center"
align="center"
min-width="110"
label="人员编码">
</el-table-column>
<el-table-column
prop="adminName"
header-align="center"
align="center"
min-width="170"
label="人员名称">
</el-table-column>
</el-table>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="addOperators()">保存</el-button>
<el-button @click="fastAddFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!--列表的组件-->
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
@ -142,6 +210,7 @@ import {
import {getSiteAndBuByUserName} from "@/api/eam/eam.js"
/* 引入组件 */
import Chooselist from '@/views/modules/common/Chooselist_eam';
import {getOperatorList, getUserRoleList} from "../../../api/eam/eam";
var functionId = 'C10000001';
export default {
@ -150,6 +219,11 @@ export default {
titleCon: '设备清单维护',
visible: false,
userId: this.$store.state.user.name,
detailData:{},
fastAddFlag:false,
roleList:[],
itemSelections:[],
operatorList:[],
pageData: {
site: '',
bu: '',
@ -263,6 +337,49 @@ export default {
}
})
},
addDeviceManager(){
this.detailData.bu = this.pageData.bu
//
this.getUserRoleList()
//
this.$set(this.detailData, 'roleId', 20)
//
this.getOperatorList()
this.fastAddFlag = true
},
getOperatorList(){
getOperatorList(this.detailData).then(({data})=>{
if (data && data.code === 0) {
this.operatorList = data.rows
}
})
},
//
getUserRoleList () {
getUserRoleList().then(({data}) => {
if (data.code === 0) {
this.roleList = data.rows
console.log(this.roleList)
} else {
this.roleList = []
}
})
},
addOperators(){
let str = ''
this.itemSelections.forEach((item)=>{
str = str + item.adminID + ';'
})
str = str.slice(0,-1)
this.pageData.deviceManager = str
this.fastAddFlag = false
},
selectionItemList (val) {
this.itemSelections = val
},
selectFlag () {
return true
},
//
init (currentRow) {

45
src/views/modules/eam/eamFeedBack.vue

@ -167,7 +167,7 @@
<el-dialog title="下达" :close-on-click-modal="false" v-drag :visible.sync="chooseReachModelFlag" width="410px">
<el-form :inline="true" label-position="top">
<el-form-item >
<span slot="label" @click="getOperatorList()"><a>选择计划执行人员</a></span>
<span slot="label" @click="getOperatorList(0)"><a>选择计划执行人员</a></span>
<el-input v-model="this.xdplanOperatorName" style="width: 389px"></el-input>
</el-form-item>
</el-form>
@ -298,7 +298,7 @@
</el-select>
</el-form-item>
<el-form-item :rules="saveRules.planOperatorName">
<span style="cursor: pointer" slot="label" @click="getOperatorList"><a>计划维修人员</a></span>
<span style="cursor: pointer" slot="label" @click="getOperatorList(0)"><a>计划维修人员</a></span>
<el-input v-model="saveModalData.planOperatorName" disabled style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="' '">
@ -1561,15 +1561,28 @@
}
this.saveFeedMatterFlag = true
},
getClassesList() {
async getClassesList() {
let split = this.saveModalData.bu.split('_')
let params = {
site: split[0],
buNo: split[1]
}
getClassesList(params).then(({data}) => {
await getClassesList(params).then(({data}) => {
if (data.code === 0) {
this.classesList = data.rows
let h = new Date().getHours();
this.classesList.forEach((options)=>{
//|
if (h >= 8 && h < 20){
if (options.description.includes('白班')){
this.$set(this.operatorData,'classesCode',options.code)
}
} else {
if (options.description.includes('夜班')){
this.$set(this.operatorData,'classesCode',options.code)
}
}
})
} else {
this.$message.warning(data.msg)
}
@ -1683,13 +1696,25 @@
},
//
getBaseData (val) {
async getBaseData (val) {
if (this.tagNo === 201) {
this.saveMatterData.trackingPersonnel = val.username
}
if (this.tagNo === 200) {
this.saveModalData.objectID = val.ObjectID
this.saveModalData.objectDesc = val.ObjectDesc
if (val.deviceManager!=''&&val.deviceManager!=null){
let peopleList = val.deviceManager.split(';')
await this.getOperatorList(1)
peopleList.forEach((username)=>{
this.operatorList.forEach((item)=>{
if (item.adminID === username){
this.saveModalData.planOperator = item.adminID
this.saveModalData.planOperatorName = item.adminName
}
})
})
}
}
if (this.tagNo === 1055) {
this.saveModalData.defectID = val.DefectID
@ -1843,7 +1868,7 @@
},
//
getOperatorList () {
async getOperatorList (type) {
this.operatorData.bu = this.saveModalData.bu
this.$set(this.operatorData,'date',this.saveModalData.defectDate)
if (this.roleList.length > 0) {
@ -1859,12 +1884,14 @@
//
this.$set(this.operatorData,'classesCode','')
//bu
this.getClassesList()
await this.getClassesList()
//
getOperatorListByOrder(this.operatorData).then(({data}) => {
await getOperatorListByOrder(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
this.operatorList = data.rows
this.operatorModelFlag = true
if (type != 1){
this.operatorModelFlag = true
}
} else {
this.operatorList = []
}

Loading…
Cancel
Save