EOEG SAI

master/src/main/resources/mybatis/plant/TStaffmgrMapper.xml

@@ -147,7 +147,7 @@
         d.p_id , d.special_duty, d.region, s.dept_name from t_staffmgr d
         left join sys_dept s on s.dept_id = d.dept_id
         inner join sys_user u on d.staffid = u.staffid and u.del_flag = 0
-        where (d.unit in (46, 48, 50, 52) or (d.unit = 38 and d.ACTUALPOST in (16, 15, 20, 18, 22))) and d.DEL_FLAG=0;
+        where (d.unit in (46, 48, 50, 52) or (d.unit = 38 and d.ACTUALPOST in (16, 15, 20, 18, 22))) and d.DEL_FLAG=0
     </select>
 
     <select id="selectEoegSaiInspectors" resultMap="TStaffmgrResult">
@@ -156,7 +156,7 @@
                d.p_id , d.special_duty, d.region, s.dept_name from t_staffmgr d
                                                                      left join sys_dept s on s.dept_id = d.dept_id
                                                                      inner join sys_user u on d.staffid = u.staffid and u.del_flag = 0
-        where d.name in ('武琛珅', '金卫东') and d.DEL_FLAG=0;
+        where d.name in ('武琛珅', '金卫东') and d.DEL_FLAG=0
     </select>
 
     <select id="selectTStaffmgrList" parameterType="TStaffmgr" resultMap="TStaffmgrResult">

ui/src/views/approve/approveDetail/eoeg-sai-apply-detail.vue

@@ -246,7 +246,7 @@
                 v-model="dataForm.inspectors"
                 placeholder="请选择验证人">
                 <el-option
-                  v-for="dict in applicantOptions"
+                  v-for="dict in inspectorsOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -489,7 +489,7 @@ import { listFile } from "@/api/production/eoegSaiApproveFile";
 import { getHistorylist } from "@/api/ehs/approvedanger";
 import { listUserPost } from "@/api/system/user";
 import { treeselect, listDept } from "@/api/system/dept";
-import { listSaiInspectors, listSaiExecutors, listStaffmgrByDeptAndTeam, getLoginStaffInfo } from "@/api/plant/staffmgr";
+import { listSaiInspectors, listSaiExecutors, listStaffmgrByDeptAndTeam, getLoginStaffInfo, listEoegSaiInspectors, listEoegSaiExecutors, listEoegSaiAssessors } from "@/api/plant/staffmgr";
 import { allFileList, delCommonfile } from "@/api/common/commonfile";
 import { categoryList } from "@/api/production/eoegCategory";
 import { selectDevice } from "@/api/invoice/device";
@@ -651,6 +651,9 @@ export default {
       executeDisabled: false,
       // 是否禁用验收
       inspectDisabled: false,
+      inspectorsOptions: [],
+      executorsOptions: [],
+      assessorsOptions: [],
     }
   },
   methods: {
@@ -777,7 +780,48 @@ export default {
       this.getLoginStaffInfo();
       // 加载SAI类别字典
       this.getCategoryList();
+
+      this.getInspectorsOptions();
+      this.getExecutorsOptions();
+      this.getAssessorsOptions();
+    },
+    getInspectorsOptions() {
+      listEoegSaiInspectors().then(response => {
+        let list = response.data;
+        this.inspectorsOptions = [];
+        for (let i = 0; i < list.length; i++) {
+          let option = {
+            dictLabel: list[i].name,
+            dictValue: list[i].userId
+          }
+          this.inspectorsOptions.push(option);
+        }
+      });
     },
+    getExecutorsOptions() {
+      listEoegSaiExecutors().then(response => {
+        let list = response.data;
+        this.executorsOptions = [];
+        for (let i = 0; i < list.length; i++) {
+          let option = {
+            dictLabel: list[i].name,
+            dictValue: list[i].userId
+          }
+          this.executorsOptions.push(option);
+        }
+      });},
+    getAssessorsOptions() {
+      listEoegSaiAssessors().then(response => {
+        let list = response.data;
+        this.assessorsOptions = [];
+        for (let i = 0; i < list.length; i++) {
+          let option = {
+            dictLabel: list[i].name,
+            dictValue: list[i].userId
+          }
+          this.assessorsOptions.push(option);
+        }
+      });},
     /** 获取SAI类别列表数据 */
     getCategoryList() {
       this.saiCategoryOptions = [];

ui/src/views/production/eoegapply/all/index.vue

@@ -442,7 +442,7 @@
                 v-model="form.executor"
                 placeholder="请选择整改负责人">
                 <el-option
-                  v-for="dict in applicantOptions"
+                  v-for="dict in executorsOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -1150,6 +1150,9 @@ export default {
       countB: 0,
       countC: 0,
       countD: 0,
+      inspectorsOptions: [],
+      executorsOptions: [],
+      assessorsOptions: [],
     };
   },
   watch: {
@@ -1190,8 +1193,48 @@ export default {
     this.getCategoryList();
     this.getWorkAreaList();
     this.getTeamTable();
+    this.getInspectorsOptions();
+    this.getExecutorsOptions();
+    this.getAssessorsOptions();
   },
   methods: {
+    getInspectorsOptions() {
+      listEoegSaiInspectors().then(response => {
+        let list = response.data;
+        this.inspectorsOptions = [];
+        for (let i = 0; i < list.length; i++) {
+          let option = {
+            dictLabel: list[i].name,
+            dictValue: list[i].userId
+          }
+          this.inspectorsOptions.push(option);
+        }
+      });
+    },
+    getExecutorsOptions() {
+      listEoegSaiExecutors().then(response => {
+        let list = response.data;
+        this.executorsOptions = [];
+        for (let i = 0; i < list.length; i++) {
+          let option = {
+            dictLabel: list[i].name,
+            dictValue: list[i].userId
+          }
+          this.executorsOptions.push(option);
+        }
+      });},
+    getAssessorsOptions() {
+      listEoegSaiAssessors().then(response => {
+        let list = response.data;
+        this.assessorsOptions = [];
+        for (let i = 0; i < list.length; i++) {
+          let option = {
+            dictLabel: list[i].name,
+            dictValue: list[i].userId
+          }
+          this.assessorsOptions.push(option);
+        }
+      });},
     getTeamTable() {
       getTeamAnalysis().then(response => {
         let data = response.data;

ui/src/views/production/eoegapply/mine/index.vue

@@ -435,7 +435,7 @@
                 v-model="form.executor"
                 placeholder="请选择整改负责人">
                 <el-option
-                  v-for="dict in applicantOptions"
+                  v-for="dict in executorsOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -759,7 +759,7 @@
   import { getToken } from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import SaiApplyDetail from "@/views/approve/approveDetail/sai-apply-detail";
+  import SaiApplyDetail from "@/views/approve/approveDetail/eoeg-sai-apply-detail";
   import ProcessImg from '@/views/approve/processImg/index';
   import { listStaffmgrByDeptAndTeam, getLoginStaffInfo, listEoegSaiInspectors, listEoegSaiExecutors, listEoegSaiAssessors } from "@/api/plant/staffmgr";
   import { allFileList, delCommonfile } from "@/api/common/commonfile";
@@ -1036,6 +1036,9 @@
         countB: 0,
         countC: 0,
         countD: 0,
+        inspectorsOptions: [],
+        executorsOptions: [],
+        assessorsOptions: [],
       };
     },
     watch: {
@@ -1076,8 +1079,48 @@
       this.getCategoryList();
       this.getWorkAreaList();
       this.getTeamTable();
+      this.getInspectorsOptions();
+      this.getExecutorsOptions();
+      this.getAssessorsOptions();
     },
     methods: {
+      getInspectorsOptions() {
+        listEoegSaiInspectors().then(response => {
+          let list = response.data;
+          this.inspectorsOptions = [];
+          for (let i = 0; i < list.length; i++) {
+            let option = {
+              dictLabel: list[i].name,
+              dictValue: list[i].userId
+            }
+            this.inspectorsOptions.push(option);
+          }
+        });
+      },
+      getExecutorsOptions() {
+        listEoegSaiExecutors().then(response => {
+          let list = response.data;
+          this.executorsOptions = [];
+          for (let i = 0; i < list.length; i++) {
+            let option = {
+              dictLabel: list[i].name,
+              dictValue: list[i].userId
+            }
+            this.executorsOptions.push(option);
+          }
+        });},
+      getAssessorsOptions() {
+        listEoegSaiAssessors().then(response => {
+          let list = response.data;
+          this.assessorsOptions = [];
+          for (let i = 0; i < list.length; i++) {
+            let option = {
+              dictLabel: list[i].name,
+              dictValue: list[i].userId
+            }
+            this.assessorsOptions.push(option);
+          }
+        });},
       getTeamTable() {
         getTeamAnalysis().then(response => {
           let data = response.data;

ui/src/views/production/eoegapply/pending/index.vue

@@ -435,7 +435,7 @@
                 v-model="form.executor"
                 placeholder="请选择整改负责人">
                 <el-option
-                  v-for="dict in applicantOptions"
+                  v-for="dict in executorsOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -1036,6 +1036,9 @@
         countB: 0,
         countC: 0,
         countD: 0,
+        inspectorsOptions: [],
+        executorsOptions: [],
+        assessorsOptions: [],
       };
     },
     watch: {
@@ -1076,8 +1079,48 @@
       this.getCategoryList();
       this.getWorkAreaList();
       this.getTeamTable();
+      this.getInspectorsOptions();
+      this.getExecutorsOptions();
+      this.getAssessorsOptions();
     },
     methods: {
+      getInspectorsOptions() {
+        listEoegSaiInspectors().then(response => {
+          let list = response.data;
+          this.inspectorsOptions = [];
+          for (let i = 0; i < list.length; i++) {
+            let option = {
+              dictLabel: list[i].name,
+              dictValue: list[i].userId
+            }
+            this.inspectorsOptions.push(option);
+          }
+        });
+      },
+      getExecutorsOptions() {
+        listEoegSaiExecutors().then(response => {
+          let list = response.data;
+          this.executorsOptions = [];
+          for (let i = 0; i < list.length; i++) {
+            let option = {
+              dictLabel: list[i].name,
+              dictValue: list[i].userId
+            }
+            this.executorsOptions.push(option);
+          }
+        });},
+      getAssessorsOptions() {
+        listEoegSaiAssessors().then(response => {
+          let list = response.data;
+          this.assessorsOptions = [];
+          for (let i = 0; i < list.length; i++) {
+            let option = {
+              dictLabel: list[i].name,
+              dictValue: list[i].userId
+            }
+            this.assessorsOptions.push(option);
+          }
+        });},
       getTeamTable() {
         getTeamAnalysis().then(response => {
           let data = response.data;