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

2024.1.18

java8
yuejiayang 2 years ago
parent
db2b8addc4
commit
b80a732bcc
7 changed files with 284 additions and 189 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 80
      src/views/modules/eam/eamWorkOrderForMaintenance.vue
  2. 128
      src/views/modules/eam/eamWorkPlanForCheck.vue
  3. 18
      src/views/modules/eam/eamWorkPlanForMaintenance.vue
  4. 5
      src/views/modules/partspare/partspare-add-or-update.vue
  5. 2
      src/views/modules/qc/IPQCResultEntry.vue
  6. 113
      src/views/modules/reportWorkOrder/reportDefectOrder.vue
  7. 109
      src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue

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

@ -316,13 +316,23 @@
</el-dialog> </el-dialog>
<!-- 人员 --> <!-- 人员 -->
<el-dialog title="人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="520px">
<el-dialog title="人员清单" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="520px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData"> <el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'人员编码'">
<el-form-item :label="'所属角色'">
<el-select value="roleName" v-model="operatorData.roleName" clearable placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleID"
:label = "i.roleName"
:value = "i.roleName">
</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" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'人员名称'">
<el-form-item :label="'用户名称'">
<el-input v-model="operatorData.adminName" style="width: 120px"></el-input> <el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
@ -972,8 +982,11 @@
site: '', site: '',
bu: '', bu: '',
adminID: '', adminID: '',
adminName: ''
adminName: '',
roleID: '',
roleName: '机修人员',
}, },
roleList: [],
operatorList: [], operatorList: [],
operatorListSelections: [], operatorListSelections: [],
operatorDetailList: [ operatorDetailList: [
@ -981,7 +994,7 @@
columnProp: 'adminID', columnProp: 'adminID',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '人员编码',
columnLabel: '用户账号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -993,7 +1006,31 @@
columnProp: 'adminName', columnProp: 'adminName',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '人员名称',
columnLabel: '用户名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'email',
headerAlign: "center",
align: "center",
columnLabel: '邮箱',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'phone',
headerAlign: "center",
align: "center",
columnLabel: '手机号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -1438,6 +1475,7 @@
// 获取人员列表 // 获取人员列表
getOperatorList () { getOperatorList () {
this.getRoleNameList()
this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
// 先清空缓存选中 // 先清空缓存选中
this.$nextTick(() => this.$refs.operatorTable.clearSelection()) this.$nextTick(() => this.$refs.operatorTable.clearSelection())
@ -1462,6 +1500,28 @@
}) })
}, },
// 获取数据列表
getRoleNameList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/role/list'),
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) { operatorClickRow (row) {
this.$refs.operatorTable.toggleRowSelection(row) this.$refs.operatorTable.toggleRowSelection(row)
@ -1530,6 +1590,14 @@
}) })
}, },
closeDialog () {
this.operatorData = {
site: '',
adminName: '',
adminID: '',
}
},
// 动态列开始 获取 用户保存的 格式列 // 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) { async getTableUserColumn (tableId, columnId) {
let queryTableUser = { let queryTableUser = {

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

@ -577,13 +577,23 @@
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
<!-- 机修人员清单 --> <!-- 机修人员清单 -->
<el-dialog title="执行人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<el-dialog title="执行人员清单" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData"> <el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'人员编码'">
<el-form-item :label="'所属角色'">
<el-select value="roleName" v-model="operatorData.roleName" clearable placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleID"
:label = "i.roleName"
:value = "i.roleName">
</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" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'人员姓名'">
<el-form-item :label="'用户名称'">
<el-input v-model="operatorData.adminName" style="width: 120px"></el-input> <el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
@ -632,6 +642,16 @@
<el-dialog title="审核人员清单" :close-on-click-modal="false" v-drag :visible.sync="checkerModelFlag" width="820px"> <el-dialog title="审核人员清单" :close-on-click-modal="false" v-drag :visible.sync="checkerModelFlag" width="820px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="checkerData"> <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-option
v-for = "i in roleList"
:key = "i.roleID"
:label = "i.roleName"
:value = "i.roleName">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'人员编码'"> <el-form-item :label="'人员编码'">
<el-input v-model="checkerData.adminID" style="width: 120px"></el-input> <el-input v-model="checkerData.adminID" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
@ -1415,7 +1435,7 @@
columnProp: 'adminID', columnProp: 'adminID',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '编码',
columnLabel: '用户账号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -1427,31 +1447,7 @@
columnProp: 'adminName', columnProp: 'adminName',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'phone',
headerAlign: "center",
align: "center",
columnLabel: '手机号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'department',
headerAlign: "center",
align: "center",
columnLabel: '部门',
columnLabel: '用户名称',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -1472,34 +1468,10 @@
fixed: '', fixed: '',
}, },
{ {
columnProp: 'tel',
headerAlign: "center",
align: "center",
columnLabel: '座机号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'adminLevelDesc',
headerAlign: "center",
align: "center",
columnLabel: '等级',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'mesUser',
columnProp: 'phone',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: 'MES账号',
columnLabel: '手机号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -1562,17 +1534,22 @@
dataListSelections3: [], dataListSelections3: [],
objectSelections1: [], objectSelections1: [],
objectSelections2: [], objectSelections2: [],
roleList: [],
operatorData: { operatorData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
bu: '', bu: '',
adminID: '', adminID: '',
adminName: ''
adminName: '',
roleID: '',
roleName: '机修人员',
}, },
checkerData: { checkerData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
bu: '', bu: '',
adminID: '', adminID: '',
adminName: ''
adminName: '',
roleID: '',
roleName: '机修人员',
}, },
updateDetailData: { updateDetailData: {
site: '', site: '',
@ -1896,6 +1873,8 @@
// 获取机修人员列表 // 获取机修人员列表
getOperatorList () { getOperatorList () {
this.operatorData.bu = this.modalData.bu this.operatorData.bu = this.modalData.bu
this.operatorData.site = this.$store.state.user.site
this.getRoleNameList()
getOperatorList(this.operatorData).then(({data}) => { getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
@ -1910,9 +1889,36 @@
}) })
}, },
// 获取数据列表
getRoleNameList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/role/list'),
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 () { getCheckerList () {
this.checkerData.bu = this.modalData.bu this.checkerData.bu = this.modalData.bu
this.getRoleNameList()
getCheckerList(this.checkerData).then(({data}) => { getCheckerList(this.checkerData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.checkerList = data.rows this.checkerList = data.rows
@ -2700,6 +2706,14 @@
} }
}, },
closeDialog () {
this.operatorData = {
site: '',
adminName: '',
adminID: '',
}
},
// 动态列开始 获取 用户保存的 格式列 // 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) { async getTableUserColumn (tableId, columnId) {
let queryTableUser = { let queryTableUser = {

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

@ -629,6 +629,16 @@
<el-dialog title="审核人员清单" :close-on-click-modal="false" v-drag :visible.sync="checkerModelFlag" width="820px"> <el-dialog title="审核人员清单" :close-on-click-modal="false" v-drag :visible.sync="checkerModelFlag" width="820px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="checkerData"> <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-option
v-for = "i in roleList"
:key = "i.roleID"
:label = "i.roleName"
:value = "i.roleName">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'人员编码'"> <el-form-item :label="'人员编码'">
<el-input v-model="checkerData.adminID" style="width: 120px"></el-input> <el-input v-model="checkerData.adminID" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
@ -1420,13 +1430,15 @@
site: '', site: '',
bu: '', bu: '',
adminID: '', adminID: '',
adminName: ''
adminName: '',
roleID: '',
roleName: '机修人员',
}, },
operatorData: { operatorData: {
site: '', site: '',
bu: '', bu: '',
roleID: '', roleID: '',
roleName: '',
roleName: '机修人员',
adminID: '', adminID: '',
adminName: '' adminName: ''
}, },
@ -1794,6 +1806,7 @@
// 获取审核人员 // 获取审核人员
getCheckerList () { getCheckerList () {
this.checkerData.bu = this.modalData.bu this.checkerData.bu = this.modalData.bu
this.getRoleNameList()
getCheckerList(this.checkerData).then(({data}) => { getCheckerList(this.checkerData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.checkerList = data.rows this.checkerList = data.rows
@ -2683,7 +2696,6 @@
closeDialog () { closeDialog () {
this.operatorData = { this.operatorData = {
site: '', site: '',
roleName: '',
adminName: '', adminName: '',
adminID: '', adminID: '',
} }

5
src/views/modules/partspare/partspare-add-or-update.vue
View File

@ -75,6 +75,7 @@ import Chooselist from '@/views/modules/common/Chooselist_eam'
import {getPartSpareInfo, savePartSpare, updatePartSpare} from '@/api/partspare/partspare.js' import {getPartSpareInfo, savePartSpare, updatePartSpare} from '@/api/partspare/partspare.js'
export default { export default {
//校验averagePrice是否为数字
data() { data() {
return { return {
visible: false, visible: false,
@ -194,6 +195,10 @@ export default {
this.$message.warning("计价单位不能为空") this.$message.warning("计价单位不能为空")
return; return;
} }
if (isNaN(this.dataForm.averagePrice)) {
this.$message.warning("计价单位必须为整数或小数!")
return;
}
if (!this.dataForm.umid) { if (!this.dataForm.umid) {
this.$message.warning("单价单位不能为空") this.$message.warning("单价单位不能为空")
return; return;

2
src/views/modules/qc/IPQCResultEntry.vue
View File

@ -168,7 +168,7 @@
</el-pagination> </el-pagination>
<!-- 新增巡检记录 --> <!-- 新增巡检记录 -->
<el-dialog title="新增巡检记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="BU" prop="bu" :rules="rules.bu"> <el-form-item label="BU" prop="bu" :rules="rules.bu">
<el-select v-model="modalData.bu" placeholder="请选择" @change="buChange" style="width: 221px"> <el-select v-model="modalData.bu" placeholder="请选择" @change="buChange" style="width: 221px">

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

@ -255,18 +255,25 @@
</el-dialog> </el-dialog>
<!-- 执行人员清单 --> <!-- 执行人员清单 -->
<el-dialog title="执行人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<el-dialog title="执行人员清单" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData"> <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-option
v-for = "i in roleList"
:key = "i.roleID"
:label = "i.roleName"
:value = "i.roleName">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="'人员编码'"> <el-form-item :label="'人员编码'">
<el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input> <el-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'人员姓名'"> <el-form-item :label="'人员姓名'">
<el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input> <el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'部门'">
<el-input v-model="operatorData.departmentName" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
<el-button type="primary" @click="getOperatorList()">查询</el-button> <el-button type="primary" @click="getOperatorList()">查询</el-button>
</el-form-item> </el-form-item>
@ -391,6 +398,7 @@
orderNo: '', orderNo: '',
planID: '', planID: '',
objectID: '', objectID: '',
buNo: '',
planOperator: '', planOperator: '',
functionType: 'C', functionType: 'C',
status: '', status: '',
@ -721,17 +729,20 @@
bu: '', bu: '',
adminID: '', adminID: '',
adminName: '', adminName: '',
departmentName: ''
departmentName: '',
roleID: '',
roleName: '机修人员',
}, },
operatorModelFlag: false, operatorModelFlag: false,
operatorList: [], operatorList: [],
roleList: [],
dataListSelections2: [], dataListSelections2: [],
operatorDetailList: [ operatorDetailList: [
{ {
columnProp: 'adminID', columnProp: 'adminID',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '编码',
columnLabel: '用户账号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -743,31 +754,7 @@
columnProp: 'adminName', columnProp: 'adminName',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'phone',
headerAlign: "center",
align: "center",
columnLabel: '手机号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'departmentName',
headerAlign: "center",
align: "center",
columnLabel: '部门',
columnLabel: '用户名称',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -788,34 +775,10 @@
fixed: '', fixed: '',
}, },
{ {
columnProp: 'tel',
headerAlign: "center",
align: "center",
columnLabel: '座机号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'adminLevelDesc',
headerAlign: "center",
align: "center",
columnLabel: '等级',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'mesUser',
columnProp: 'phone',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: 'MES账号',
columnLabel: '手机号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -1084,6 +1047,8 @@
// 获取机修人员列表 // 获取机修人员列表
getOperatorList () { getOperatorList () {
this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
this.operatorData.site = this.$store.state.user.site
this.getRoleNameList()
if (this.saveData.operator == null) { if (this.saveData.operator == null) {
this.saveData.operator = '' this.saveData.operator = ''
this.saveData.operatorName = '' this.saveData.operatorName = ''
@ -1111,6 +1076,32 @@
}) })
}, },
// 获取数据列表
getRoleNameList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/role/list'),
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) { selectionChangeHandle2 (val) {
this.dataListSelections2 = val this.dataListSelections2 = val
@ -1482,6 +1473,14 @@
document.activeElement.blur() document.activeElement.blur()
}, },
closeDialog () {
this.operatorData = {
site: '',
adminName: '',
adminID: '',
}
},
// 动态列开始 获取 用户保存的 格式列 // 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) { async getTableUserColumn (tableId, columnId) {
let queryTableUser = { let queryTableUser = {

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

@ -348,13 +348,23 @@
</el-dialog> </el-dialog>
<!-- 机修人员清单 --> <!-- 机修人员清单 -->
<el-dialog title="机修人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<el-dialog title="机修人员清单" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
<div class="rq"> <div class="rq">
<el-form :inline="true" label-position="top" :model="operatorData"> <el-form :inline="true" label-position="top" :model="operatorData">
<el-form-item :label="'人员编码'">
<el-form-item :label="'所属角色'">
<el-select value="roleName" v-model="operatorData.roleName" clearable placeholder="请选择" style="width: 120px">
<el-option
v-for = "i in roleList"
:key = "i.roleID"
:label = "i.roleName"
:value = "i.roleName">
</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" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'人员姓名'">
<el-form-item :label="'用户姓名'">
<el-input v-model="operatorData.adminName" style="width: 120px"></el-input> <el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '"> <el-form-item :label="' '">
@ -1120,8 +1130,11 @@
site: '', site: '',
bu: '', bu: '',
adminID: '', adminID: '',
adminName: ''
adminName: '',
roleName: '机修人员',
roleId: '',
}, },
roleList: [],
operatorModelFlag: false, operatorModelFlag: false,
dataListSelections2: [], dataListSelections2: [],
operatorDetailList: [ operatorDetailList: [
@ -1129,7 +1142,7 @@
columnProp: 'adminID', columnProp: 'adminID',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '编码',
columnLabel: '用户账号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -1141,31 +1154,7 @@
columnProp: 'adminName', columnProp: 'adminName',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: '名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'phone',
headerAlign: "center",
align: "center",
columnLabel: '手机号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'department',
headerAlign: "center",
align: "center",
columnLabel: '部门',
columnLabel: '用户名称',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -1186,34 +1175,10 @@
fixed: '', fixed: '',
}, },
{ {
columnProp: 'tel',
headerAlign: "center",
align: "center",
columnLabel: '座机号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'adminLevelDesc',
headerAlign: "center",
align: "center",
columnLabel: '等级',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
columnProp: 'mesUser',
columnProp: 'phone',
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: 'MES账号',
columnLabel: '手机号',
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -1295,6 +1260,7 @@
// 获取机修人员列表 // 获取机修人员列表
getOperatorList () { getOperatorList () {
this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
this.getRoleNameList()
getOperatorList(this.operatorData).then(({data}) => { getOperatorList(this.operatorData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.operatorList = data.rows this.operatorList = data.rows
@ -1309,6 +1275,29 @@
}) })
}, },
// 获取数据列表
getRoleNameList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('/sys/role/list'),
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) { operatorClickRow (row) {
this.$refs.operatorTable.toggleRowSelection(row) this.$refs.operatorTable.toggleRowSelection(row)
@ -1660,6 +1649,14 @@
document.activeElement.blur() document.activeElement.blur()
}, },
closeDialog () {
this.operatorData = {
site: '',
adminName: '',
adminID: '',
}
},
// 动态列开始 获取 用户保存的 格式列 // 动态列开始 获取 用户保存的 格式列
async getTableUserColumn (tableId, columnId) { async getTableUserColumn (tableId, columnId) {
let queryTableUser = { let queryTableUser = {

Write Preview
Loading…
Cancel
Save