From b80a732bcce0c8d94e058a1aaac659f076d6a1f3 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Thu, 18 Jan 2024 17:57:42 +0800
Subject: [PATCH] 2024.1.18

---
 .../eam/eamWorkOrderForMaintenance.vue        |  80 ++++++++++-
 src/views/modules/eam/eamWorkPlanForCheck.vue | 128 ++++++++++--------
 .../modules/eam/eamWorkPlanForMaintenance.vue |  36 +++--
 .../partspare/partspare-add-or-update.vue     |   5 +
 src/views/modules/qc/IPQCResultEntry.vue      |   2 +-
 .../reportWorkOrder/reportDefectOrder.vue     | 113 ++++++++--------
 .../reportMaintenanceOrder.vue                | 109 ++++++++-------
 7 files changed, 284 insertions(+), 189 deletions(-)

diff --git a/src/views/modules/eam/eamWorkOrderForMaintenance.vue b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
index e77b8ea..532dd48 100644
--- a/src/views/modules/eam/eamWorkOrderForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkOrderForMaintenance.vue
@@ -316,13 +316,23 @@
     </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">
         <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-form-item>
-          <el-form-item :label="'人员名称'">
+          <el-form-item :label="'用户名称'">
             <el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
@@ -972,8 +982,11 @@
           site: '',
           bu: '',
           adminID: '',
-          adminName: ''
+          adminName: '',
+          roleID: '',
+          roleName: '机修人员',
         },
+        roleList: [],
         operatorList: [],
         operatorListSelections: [],
         operatorDetailList: [
@@ -981,7 +994,7 @@
             columnProp: 'adminID',
             headerAlign: "center",
             align: "center",
-            columnLabel: '人员编码',
+            columnLabel: '用户账号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -993,7 +1006,31 @@
             columnProp: 'adminName',
             headerAlign: "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,
             columnImage: false,
             columnSortable: false,
@@ -1438,6 +1475,7 @@
 
       // 获取人员列表
       getOperatorList () {
+        this.getRoleNameList()
         this.operatorData.bu = this.saveData.site + '_' + this.saveData.buNo
         // 先清空缓存选中
         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) {
         this.$refs.operatorTable.toggleRowSelection(row)
@@ -1530,6 +1590,14 @@
         })
       },
 
+      closeDialog () {
+        this.operatorData = {
+          site: '',
+          adminName: '',
+          adminID: '',
+        }
+      },
+
       // 动态列开始 获取 用户保存的 格式列
       async getTableUserColumn (tableId, columnId) {
         let queryTableUser = {
diff --git a/src/views/modules/eam/eamWorkPlanForCheck.vue b/src/views/modules/eam/eamWorkPlanForCheck.vue
index 2f4860d..b18ab81 100644
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@@ -577,13 +577,23 @@
     <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">
         <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-form-item>
-          <el-form-item :label="'人员姓名'">
+          <el-form-item :label="'用户名称'">
             <el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
@@ -632,6 +642,16 @@
     <el-dialog title="审核人员清单" :close-on-click-modal="false" v-drag :visible.sync="checkerModelFlag" width="820px">
       <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-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="checkerData.adminID" style="width: 120px"></el-input>
           </el-form-item>
@@ -1415,7 +1435,7 @@
             columnProp: 'adminID',
             headerAlign: "center",
             align: "center",
-            columnLabel: '编码',
+            columnLabel: '用户账号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1427,31 +1447,7 @@
             columnProp: 'adminName',
             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,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            columnProp: 'department',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '部门',
+            columnLabel: '用户名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1472,34 +1468,10 @@
             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",
             align: "center",
-            columnLabel: 'MES账号',
+            columnLabel: '手机号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1562,17 +1534,22 @@
         dataListSelections3: [],
         objectSelections1: [],
         objectSelections2: [],
+        roleList: [],
         operatorData: {
           site: this.$store.state.user.site,
           bu: '',
           adminID: '',
-          adminName: ''
+          adminName: '',
+          roleID: '',
+          roleName: '机修人员',
         },
         checkerData: {
           site: this.$store.state.user.site,
           bu: '',
           adminID: '',
-          adminName: ''
+          adminName: '',
+          roleID: '',
+          roleName: '机修人员',
         },
         updateDetailData: {
           site: '',
@@ -1896,6 +1873,8 @@
       // 获取机修人员列表
       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
@@ -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 () {
         this.checkerData.bu = this.modalData.bu
+        this.getRoleNameList()
         getCheckerList(this.checkerData).then(({data}) => {
           if (data && data.code === 0) {
             this.checkerList = data.rows
@@ -2700,6 +2706,14 @@
         }
       },
 
+      closeDialog () {
+        this.operatorData = {
+          site: '',
+          adminName: '',
+          adminID: '',
+        }
+      },
+
       // 动态列开始 获取 用户保存的 格式列
       async getTableUserColumn (tableId, columnId) {
         let queryTableUser = {
diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
index 9f8b231..cd18af8 100644
--- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
@@ -568,15 +568,15 @@
       <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-option
-              v-for = "i in roleList"
-              :key = "i.roleID"
-              :label = "i.roleName"
-              :value = "i.roleName">
-            </el-option>
-          </el-select>
-        </el-form-item>
+            <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-form-item>
@@ -629,6 +629,16 @@
     <el-dialog title="审核人员清单" :close-on-click-modal="false" v-drag :visible.sync="checkerModelFlag" width="820px">
       <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-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="checkerData.adminID" style="width: 120px"></el-input>
           </el-form-item>
@@ -1420,13 +1430,15 @@
           site: '',
           bu: '',
           adminID: '',
-          adminName: ''
+          adminName: '',
+          roleID: '',
+          roleName: '机修人员',
         },
         operatorData: {
           site: '',
           bu: '',
           roleID: '',
-          roleName: '',
+          roleName: '机修人员',
           adminID: '',
           adminName: ''
         },
@@ -1794,6 +1806,7 @@
       // 获取审核人员
       getCheckerList () {
         this.checkerData.bu = this.modalData.bu
+        this.getRoleNameList()
         getCheckerList(this.checkerData).then(({data}) => {
           if (data && data.code === 0) {
             this.checkerList = data.rows
@@ -2683,7 +2696,6 @@
       closeDialog () {
         this.operatorData = {
           site: '',
-          roleName: '',
           adminName: '',
           adminID: '',
         }
diff --git a/src/views/modules/partspare/partspare-add-or-update.vue b/src/views/modules/partspare/partspare-add-or-update.vue
index 6bb3870..953827b 100644
--- a/src/views/modules/partspare/partspare-add-or-update.vue
+++ b/src/views/modules/partspare/partspare-add-or-update.vue
@@ -75,6 +75,7 @@ import Chooselist from '@/views/modules/common/Chooselist_eam'
 import {getPartSpareInfo, savePartSpare, updatePartSpare} from '@/api/partspare/partspare.js'
 
 export default {
+  //校验averagePrice是否为数字
   data() {
     return {
       visible: false,
@@ -194,6 +195,10 @@ export default {
         this.$message.warning("计价单位不能为空")
         return;
       }
+      if (isNaN(this.dataForm.averagePrice)) {
+        this.$message.warning("计价单位必须为整数或小数!")
+        return;
+      }
       if (!this.dataForm.umid) {
         this.$message.warning("单价单位不能为空")
         return;
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index bafdae6..d777113 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -168,7 +168,7 @@
     </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-item label="BU" prop="bu" :rules="rules.bu">
           <el-select v-model="modalData.bu" placeholder="请选择" @change="buChange" style="width: 221px">
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 824be3e..6751d52 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -255,18 +255,25 @@
     </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">
         <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-input v-model="operatorData.adminID" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="'人员姓名'">
             <el-input v-model="operatorData.adminName" clearable style="width: 120px"></el-input>
           </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-button type="primary" @click="getOperatorList()">查询</el-button>
           </el-form-item>
@@ -391,6 +398,7 @@
           orderNo: '',
           planID: '',
           objectID: '',
+          buNo: '',
           planOperator: '',
           functionType: 'C',
           status: '',
@@ -721,17 +729,20 @@
           bu: '',
           adminID: '',
           adminName: '',
-          departmentName: ''
+          departmentName: '',
+          roleID: '',
+          roleName: '机修人员',
         },
         operatorModelFlag: false,
         operatorList: [],
+        roleList: [],
         dataListSelections2: [],
         operatorDetailList: [
           {
             columnProp: 'adminID',
             headerAlign: "center",
             align: "center",
-            columnLabel: '编码',
+            columnLabel: '用户账号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -743,31 +754,7 @@
             columnProp: 'adminName',
             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,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            columnProp: 'departmentName',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '部门',
+            columnLabel: '用户名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -788,34 +775,10 @@
             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",
             align: "center",
-            columnLabel: 'MES账号',
+            columnLabel: '手机号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1084,6 +1047,8 @@
       // 获取机修人员列表
       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 = ''
@@ -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) {
         this.dataListSelections2 = val
@@ -1482,6 +1473,14 @@
         document.activeElement.blur()
       },
 
+      closeDialog () {
+        this.operatorData = {
+          site: '',
+          adminName: '',
+          adminID: '',
+        }
+      },
+
       // 动态列开始 获取 用户保存的 格式列
       async getTableUserColumn (tableId, columnId) {
         let queryTableUser = {
diff --git a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
index b50f3a3..dea723c 100644
--- a/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportMaintenanceOrder.vue
@@ -348,13 +348,23 @@
     </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">
         <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-form-item>
-          <el-form-item :label="'人员姓名'">
+          <el-form-item :label="'用户姓名'">
             <el-input v-model="operatorData.adminName"  style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
@@ -1120,8 +1130,11 @@
           site: '',
           bu: '',
           adminID: '',
-          adminName: ''
+          adminName: '',
+          roleName: '机修人员',
+          roleId: '',
         },
+        roleList: [],
         operatorModelFlag: false,
         dataListSelections2: [],
         operatorDetailList: [
@@ -1129,7 +1142,7 @@
             columnProp: 'adminID',
             headerAlign: "center",
             align: "center",
-            columnLabel: '编码',
+            columnLabel: '用户账号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1141,31 +1154,7 @@
             columnProp: 'adminName',
             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,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            columnProp: 'department',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '部门',
+            columnLabel: '用户名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1186,34 +1175,10 @@
             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",
             align: "center",
-            columnLabel: 'MES账号',
+            columnLabel: '手机号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1295,6 +1260,7 @@
       // 获取机修人员列表
       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
@@ -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) {
         this.$refs.operatorTable.toggleRowSelection(row)
@@ -1660,6 +1649,14 @@
         document.activeElement.blur()
       },
 
+      closeDialog () {
+        this.operatorData = {
+          site: '',
+          adminName: '',
+          adminID: '',
+        }
+      },
+
       // 动态列开始 获取 用户保存的 格式列
       async getTableUserColumn (tableId, columnId) {
         let queryTableUser = {