wangggziwen 2 жил өмнө
parent
commit
7a39014702

+ 1 - 1
master/src/main/resources/mybatis/plant/TStaffmgrMapper.xml

@@ -83,7 +83,7 @@
         left join sys_dept s on s.dept_id = d.dept_id
         inner join sys_user u on d.staffid = u.staffid
         <where>
-            <if test="deptId != null and deptId != ''"> and d.dept_id = #{deptId} </if>
+            <if test="deptId != null and deptId != ''"> and d.unit = #{deptId} </if>
             <if test="team != null  and team != ''"> and d.team = #{team} </if>
             and d.del_flag = 0
         </where>

+ 16 - 13
ui/src/views/production/apply/all/index.vue

@@ -1056,25 +1056,28 @@ export default {
     },
     /** 加载登记人部门列表 */
     getApplicantDeptOptions() {
-      listDept(null).then(response => {
-        let deptList = response.data;
-        this.applicantDeptOptions = [];
-        for (let i = 0; i < deptList.length; i++) {
-          if (deptList[i].deptId == 103 || deptList[i].deptId == 10058 || deptList[i].deptId == 10042) {
-            this.applicantDeptOptions.push({
-              dictLabel: deptList[i].deptName,
-              dictValue: deptList[i].deptId
-            });
-          }
-        }
-      });
+      // listDept(null).then(response => {
+      //   let deptList = response.data;
+      //   this.applicantDeptOptions = [];
+      //   for (let i = 0; i < deptList.length; i++) {
+      //     if (deptList[i].deptId == 103 || deptList[i].deptId == 10058 || deptList[i].deptId == 10042) {
+      //       this.applicantDeptOptions.push({
+      //         dictLabel: deptList[i].deptName,
+      //         dictValue: deptList[i].deptId
+      //       });
+      //     }
+      //   }
+      // });
+      this.applicantDeptOptions.push({ dictLabel: "CBP/C", dictValue: 10 });
+      this.applicantDeptOptions.push({ dictLabel: "CTA/B", dictValue: 12 });
+      this.applicantDeptOptions.push({ dictLabel: "CTM/B", dictValue: 14 });
     },
     /** 部门/班组值改变事件 */
     handleDeptOrTeamChange() {
       this.applicantOptions = [];
       this.form.applicant = null;
       let applicantDept = this.form.applicantDept;
-      if (applicantDept != '103') {
+      if (applicantDept != '10') {
         this.applicantTeamDisabled = true;
         this.form.applicantTeam = null;
       } else {

+ 16 - 13
ui/src/views/production/apply/mine/index.vue

@@ -1056,25 +1056,28 @@
       },
       /** 加载登记人部门列表 */
       getApplicantDeptOptions() {
-        listDept(null).then(response => {
-          let deptList = response.data;
-          this.applicantDeptOptions = [];
-          for (let i = 0; i < deptList.length; i++) {
-            if (deptList[i].deptId == 103 || deptList[i].deptId == 10058 || deptList[i].deptId == 10042) {
-              this.applicantDeptOptions.push({
-                dictLabel: deptList[i].deptName,
-                dictValue: deptList[i].deptId
-              });
-            }
-          }
-        });
+        // listDept(null).then(response => {
+        //   let deptList = response.data;
+        //   this.applicantDeptOptions = [];
+        //   for (let i = 0; i < deptList.length; i++) {
+        //     if (deptList[i].deptId == 103 || deptList[i].deptId == 10058 || deptList[i].deptId == 10042) {
+        //       this.applicantDeptOptions.push({
+        //         dictLabel: deptList[i].deptName,
+        //         dictValue: deptList[i].deptId
+        //       });
+        //     }
+        //   }
+        // });
+        this.applicantDeptOptions.push({ dictLabel: "CBP/C", dictValue: 10 });
+        this.applicantDeptOptions.push({ dictLabel: "CTA/B", dictValue: 12 });
+        this.applicantDeptOptions.push({ dictLabel: "CTM/B", dictValue: 14 });
       },
       /** 部门/班组值改变事件 */
       handleDeptOrTeamChange() {
         this.applicantOptions = [];
         this.form.applicant = null;
         let applicantDept = this.form.applicantDept;
-        if (applicantDept != '103') {
+        if (applicantDept != '10') {
           this.applicantTeamDisabled = true;
           this.form.applicantTeam = null;
         } else {

+ 16 - 13
ui/src/views/production/apply/pending/index.vue

@@ -1056,25 +1056,28 @@
       },
       /** 加载登记人部门列表 */
       getApplicantDeptOptions() {
-        listDept(null).then(response => {
-          let deptList = response.data;
-          this.applicantDeptOptions = [];
-          for (let i = 0; i < deptList.length; i++) {
-            if (deptList[i].deptId == 103 || deptList[i].deptId == 10058 || deptList[i].deptId == 10042) {
-              this.applicantDeptOptions.push({
-                dictLabel: deptList[i].deptName,
-                dictValue: deptList[i].deptId
-              });
-            }
-          }
-        });
+        // listDept(null).then(response => {
+        //   let deptList = response.data;
+        //   this.applicantDeptOptions = [];
+        //   for (let i = 0; i < deptList.length; i++) {
+        //     if (deptList[i].deptId == 103 || deptList[i].deptId == 10058 || deptList[i].deptId == 10042) {
+        //       this.applicantDeptOptions.push({
+        //         dictLabel: deptList[i].deptName,
+        //         dictValue: deptList[i].deptId
+        //       });
+        //     }
+        //   }
+        // });
+        this.applicantDeptOptions.push({ dictLabel: "CBP/C", dictValue: 10 });
+        this.applicantDeptOptions.push({ dictLabel: "CTA/B", dictValue: 12 });
+        this.applicantDeptOptions.push({ dictLabel: "CTM/B", dictValue: 14 });
       },
       /** 部门/班组值改变事件 */
       handleDeptOrTeamChange() {
         this.applicantOptions = [];
         this.form.applicant = null;
         let applicantDept = this.form.applicantDept;
-        if (applicantDept != '103') {
+        if (applicantDept != '10') {
           this.applicantTeamDisabled = true;
           this.form.applicantTeam = null;
         } else {