dedsudiyu 10 ay önce
ebeveyn
işleme
1e1bf43e20

+ 12 - 1
src/api/commonality/permission.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-/*查询用户列表-下拉列表
+/*查询用户列表-下拉列表 - 无权限
 * userName : '', 名称
 * userType: '',  0.系统 1.老师 2.学生
 */
@@ -11,6 +11,17 @@ export function systemUserSelectUser(data) {
     data: data
   })
 }
+/*查询用户列表-下拉列表 - 有数据权限
+* userName : '', 名称
+* userType: '',  0.系统 1.老师 2.学生
+*/
+export function systemUserDropDateAuthList(data) {
+  return request({
+    url: '/system/user/dropDateAuthList',
+    method: 'post',
+    data: data
+  })
+}
 //实验室配置-查询用户列表-下拉列表带权限
 export function systemUserDropAuthList(data) {
   return request({

+ 5 - 1
src/views/integratedManagement/laboratoryManagement/subject/addSubject.vue

@@ -393,7 +393,11 @@ import {
           this.$set(this.form,'subId',this.subjectData.subId)
           this.$set(this.form,'subName',this.subjectData.subName)
           this.$set(this.form,'moldId',this.subjectData.moldId)
-          this.$set(this.form,'typeId',this.subjectData.typeId.split(','))
+          if(this.subjectData.typeId){
+            this.$set(this.form,'typeId',this.subjectData.typeId.split(','))
+          }else{
+            this.$set(this.form,'typeId',[])
+          }
           this.$set(this.form,'levelId',this.subjectData.levelId)
           this.$set(this.form,'deptId',this.subjectData.deptId)
           this.$set(this.form,'buildId',this.subjectData.buildId)

+ 2 - 2
src/views/integratedManagement/personnelManage/researchGroupManage/addPage.vue

@@ -111,7 +111,7 @@
   //import { getInfo } from "@/api/basicsModules/index";
 
   import { systemTopicDetail,systemTopicAdd,systemTopicEdit } from "@/api/integratedManagement/index";
-  import { systemUserSelectUser,systemUserSelectByPage } from "@/api/commonality/permission";
+  import { systemUserDropDateAuthList,systemUserSelectByPage } from "@/api/commonality/permission";
   import userDialog from "./userDialog.vue";
   export default {
     name: 'addPage',
@@ -276,7 +276,7 @@
       //人员查询
       userSelectList(query) {
         if (query !== '' && query.length>1) {
-          systemUserSelectUser({"userName":query,'userType':'1'}).then(response => {
+          systemUserDropDateAuthList({"userName":query,'userType':'1'}).then(response => {
             this.$set(this,'optionsUser',response.data);
           });
         } else {