|
|
|
@ -97,14 +97,7 @@ |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item > |
|
|
|
<span slot="label" style="" @click="getBaseList(1044)"><a herf="#">部门:</a></span> |
|
|
|
<!-- <el-select v-model="modalData.department" style="width: 120px"--> |
|
|
|
<!-- placeholder="请选择">--> |
|
|
|
<!-- <el-option v-for="item in departmentList " :key="index" :label="item.deptName"--> |
|
|
|
<!-- :value="item.deptId">--> |
|
|
|
|
|
|
|
<!-- </el-option>--> |
|
|
|
<!-- </el-select>--> |
|
|
|
<span slot="label" style="" @click="getDepartmentList()"><a>部门</a></span> |
|
|
|
<el-input v-model="modalData.department" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="手机号码:"> |
|
|
|
@ -120,17 +113,17 @@ |
|
|
|
</el-form-item> |
|
|
|
<el-form-item > |
|
|
|
<span slot="label" style="" @click="getBaseList(202)"><a herf="#">工种</a></span> |
|
|
|
<!-- <el-select v-model="modalData.levelID" style="width: 120px"--> |
|
|
|
<!-- placeholder="请选择">--> |
|
|
|
<!-- <el-option v-for="item in levelList " :key="index" :label="item.adminLevelID+'-'+item.adminLevelDesc"--> |
|
|
|
<!-- :value="item.adminLevelID">--> |
|
|
|
|
|
|
|
<!-- </el-option>--> |
|
|
|
<!-- </el-select>--> |
|
|
|
<el-input v-model="modalData.levelID" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="MES账号:"> |
|
|
|
<el-input v-model="modalData.mesUser" style="width: 120px"></el-input> |
|
|
|
<el-select v-model="modalData.mesUser" placeholder="请选择" style="width: 120px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in mesList" |
|
|
|
:key = "i.username" |
|
|
|
:label = "i.username" |
|
|
|
:value = "i.username"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
|
@ -138,6 +131,60 @@ |
|
|
|
<el-button type="primary" @click="modalFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 部门 --> |
|
|
|
<el-dialog title="部门清单" :close-on-click-modal="false" v-drag :visible.sync="departmentModelFlag" width="520px"> |
|
|
|
<div class="rq"> |
|
|
|
<el-form :inline="true" label-position="top" :model="departmentData"> |
|
|
|
<el-form-item :label="'部门编码'"> |
|
|
|
<el-input v-model="departmentData.deptId" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="'部门名称'"> |
|
|
|
<el-input v-model="departmentData.deptName" style="width: 120px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item :label="' '"> |
|
|
|
<el-button type="primary" @click="getDepartmentList()">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
:height="300" |
|
|
|
:data="departmentList" |
|
|
|
ref="departmentTable" |
|
|
|
@row-click="departmentClickRow" |
|
|
|
@selection-change="selectionDepartment" |
|
|
|
border |
|
|
|
v-loading="dataListLoading" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
type="selection" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
:selectable="selectFlag" |
|
|
|
width="50"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
v-for="(item,index) in departmentDetailList" :key="index" |
|
|
|
:sortable="item.columnSortable" |
|
|
|
:prop="item.columnProp" |
|
|
|
:header-align="item.headerAlign" |
|
|
|
:show-overflow-tooltip="item.showOverflowTooltip" |
|
|
|
:align="item.align" |
|
|
|
:fixed="item.fixed==''?false:item.fixed" |
|
|
|
:min-width="item.columnWidth" |
|
|
|
:label="item.columnLabel"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span> |
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
</el-table> |
|
|
|
</div> |
|
|
|
<el-footer style="height:40px;margin-top: 20px;text-align:center"> |
|
|
|
<el-button type="primary" @click="confirmDepartment()">确认</el-button> |
|
|
|
<el-button type="primary" @click="departmentModelFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
@ -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 |
|
|
|
@ -561,12 +669,15 @@ |
|
|
|
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 |
|
|
|
}) |
|
|
|
// initAdminLevel(inData).then(({data}) => { |
|
|
|
// this.levelList=data.rows |
|
|
|
// }) |
|
|
|
// getEmpyDeptList(inData).then(({data}) => { |
|
|
|
// this.departmentList = data.rows |
|
|
|
// }) |
|
|
|
this.modalDisableFlag = false; |
|
|
|
this.modalFlag = true; |
|
|
|
}, |
|
|
|
@ -588,12 +699,18 @@ |
|
|
|
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 |
|
|
|
}) |
|
|
|
// 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; |
|
|
|
}, |
|
|
|
@ -694,6 +811,21 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取部门列表 |
|
|
|
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 = { |
|
|
|
@ -737,7 +869,6 @@ |
|
|
|
this.favorite = true |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
杨奉源
3 years ago