天线负责人修改

src/views/modules/qc/FAIResultEntry.vue

@@ -734,9 +734,9 @@
     <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" :key="i.roleId" :label="i.roleName" :value="i.roleId">
+              <el-option v-for="i in roleList" :key="i.roleId" :label="i.roleName" :value="i.roleId">
               </el-option>
             </el-select>
           </el-form-item>
@@ -859,7 +859,6 @@ import {
   getEamPropertiesItemByItemNo,
   getCollectorDataByItem,
   getResponsibleOperatorList,
-  getMhmResponsibleRoleList,
 } from '@/api/qc/qc.js' 
 import {
   getTableDefaultListLanguage,
@@ -902,12 +901,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
-    },
   },
   watch: {
     detailData: {
@@ -2247,7 +2240,6 @@ export default {
       authFile: false,
       menuId: this.$route.meta.menuId,
       roleList: [],
-      mhmRoleList: [],
       defaultCollaborativeRoleName: 'FAI操作员',
       operatorList: [],
       operatorData: {
@@ -2603,19 +2595,6 @@ export default {
       })
     },
 
-    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()) {
@@ -2661,10 +2640,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(

src/views/modules/qc/FQCResultEntry.vue

@@ -716,9 +716,9 @@
     <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" :key="i.roleId" :label="i.roleName" :value="i.roleId">
+              <el-option v-for="i in roleList" :key="i.roleId" :label="i.roleName" :value="i.roleId">
               </el-option>
             </el-select>
           </el-form-item>
@@ -843,7 +843,6 @@ import {
   getEamPropertiesItemByItemNo,
   getCollectorDataByItem,
   getResponsibleOperatorList,
-  getMhmResponsibleRoleList,
 } from '@/api/qc/qc.js'
 import {
   getTableDefaultListLanguage,
@@ -886,12 +885,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
-    },
   },
   watch: {
     detailData: {
@@ -2230,7 +2223,6 @@ export default {
       authFile: false,
       menuId: this.$route.meta.menuId,
       roleList: [],
-      mhmRoleList: [],
       defaultCollaborativeRoleName: 'FQC操作员',
       operatorList: [],
       operatorData: {
@@ -2585,19 +2577,6 @@ export default {
       })
     },
 
-    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()) {
@@ -2643,10 +2622,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(

src/views/modules/qc/IPQCResultEntry.vue

@@ -794,10 +794,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">
@@ -951,7 +951,6 @@
     getEamPropertiesItemByItemNo,
     getCollectorDataByItem,
     getResponsibleOperatorList,
-    getMhmResponsibleRoleList,
   } from "@/api/qc/qc.js" 
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -987,12 +986,6 @@
         }
         return this.tableData.slice(start,end)
       },
-      operatorRoleList () {
-        if (this.operatorData.flag === '2' && this.detailData.buNo === '04-MHM') {
-          return this.mhmRoleList
-        }
-        return this.roleList
-      }
     },
     watch: {
       detailData: {
@@ -2379,7 +2372,6 @@
         authFile: false,
         menuId: this.$route.meta.menuId,
         roleList: [],
-        mhmRoleList: [],
         defaultCollaborativeRoleName: 'IPQC操作员',
         operatorList: [],
         operatorData: {
@@ -2759,19 +2751,6 @@
         })
       },
 
-      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()) {
@@ -2811,10 +2790,8 @@
           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 === '机修人员')

src/views/modules/qc/IQCResultEntry.vue

@@ -655,10 +655,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">
@@ -800,7 +800,6 @@
     getEamPropertiesItemByItemNo,
     getCollectorDataByItem,
     getResponsibleOperatorList,
-    getMhmResponsibleRoleList,
   } from "@/api/qc/qc.js" 
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -836,12 +835,6 @@
         }
         return this.tableData.slice(start,end)
       },
-      operatorRoleList () {
-        if (this.operatorData.flag === '2' && this.detailData.buNo === '04-MHM') {
-          return this.mhmRoleList
-        }
-        return this.roleList
-      }
     },
     watch: {
           detailData: {
@@ -1920,7 +1913,6 @@
         authFile: false,
         menuId: this.$route.meta.menuId,
         roleList: [],
-        mhmRoleList: [],
         defaultCollaborativeRoleName: 'IQC操作员',
         operatorList: [],
         operatorData: {
@@ -2258,19 +2250,6 @@
         })
       },
 
-      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()) {
@@ -2310,10 +2289,8 @@
           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 === '机修人员')

src/views/modules/qc/PQCResultEntry.vue

@@ -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 === '机修人员')