|
|
|
@ -891,10 +891,10 @@ |
|
|
|
<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-form-item v-if="operatorData.flag !== '2' || detailData.buNo !== '04-MHM'" :label="'所属角色'"> |
|
|
|
<el-select v-model="operatorData.roleId" placeholder="请选择" style="width: 120px" @change="getOperatorList2"> |
|
|
|
<el-option |
|
|
|
v-for = "i in operatorRoleList" |
|
|
|
v-for = "i in roleList" |
|
|
|
:key = "i.roleId" |
|
|
|
:label = "i.roleName" |
|
|
|
:value = "i.roleId"> |
|
|
|
@ -1054,7 +1054,6 @@ import { |
|
|
|
previewSopFile,//预览Sop文件 |
|
|
|
getColumnDisplayFlagList,//查询 检验单标准值角色用户 |
|
|
|
getResponsibleOperatorList, |
|
|
|
getMhmResponsibleRoleList, |
|
|
|
} from "@/api/qc/qc.js" |
|
|
|
import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js" |
|
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
|
@ -1091,12 +1090,6 @@ export default { |
|
|
|
} |
|
|
|
return this.tableData.slice(start,end) |
|
|
|
}, |
|
|
|
operatorRoleList () { |
|
|
|
if (this.operatorData.flag === '2' && this.detailData.buNo === '04-MHM') { |
|
|
|
return this.mhmRoleList |
|
|
|
} |
|
|
|
return this.roleList |
|
|
|
}, |
|
|
|
// returntemplateId(){ |
|
|
|
// let a = this.modalData.operationDesc |
|
|
|
// let list = this.operationList |
|
|
|
@ -2523,7 +2516,6 @@ export default { |
|
|
|
authFile: false, |
|
|
|
menuId: this.$route.meta.menuId, |
|
|
|
roleList: [], |
|
|
|
mhmRoleList: [], |
|
|
|
defaultCollaborativeRoleName: 'PQC操作员', |
|
|
|
operatorList: [], |
|
|
|
operatorData: { |
|
|
|
@ -2853,19 +2845,6 @@ export default { |
|
|
|
return this.detailData.buNo === '04-MHM' |
|
|
|
}, |
|
|
|
|
|
|
|
loadMhmRoleList (callback) { |
|
|
|
if (this.mhmRoleList.length > 0) { |
|
|
|
callback && callback() |
|
|
|
return |
|
|
|
} |
|
|
|
getMhmResponsibleRoleList({}).then(({ data }) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.mhmRoleList = data.rows || [] |
|
|
|
} |
|
|
|
callback && callback() |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
fetchResponsibleOperatorData (tempDataList, showDialog) { |
|
|
|
let request |
|
|
|
if (this.isMhmResponsibleBu()) { |
|
|
|
@ -2905,10 +2884,8 @@ export default { |
|
|
|
this.fetchResponsibleOperatorData(tempDataList, true) |
|
|
|
} |
|
|
|
if (this.isMhmResponsibleBu()) { |
|
|
|
this.loadMhmRoleList(() => { |
|
|
|
this.operatorData.roleId = '' |
|
|
|
openDialog() |
|
|
|
}) |
|
|
|
this.operatorData.roleId = '' |
|
|
|
openDialog() |
|
|
|
} else { |
|
|
|
if (this.roleList.length > 0) { |
|
|
|
let filterList = this.roleList.filter(item => item.roleName === '机修人员') |
|
|
|
|
