diff --git a/src/api/apis.js b/src/api/apis.js index 658a6a91..d35cf0db 100644 --- a/src/api/apis.js +++ b/src/api/apis.js @@ -29,7 +29,7 @@ export const USER_LIST_PAGE = "/admin/thirdApi/user/list"; export const USER_LIST = "/admin/thirdApi/user/list"; export const ORG_LIST = "/admin/thirdApi/org/list"; export const ORG_CHILD_LIST = "/admin/thirdApi/org/info"; - +export const USER_LIST_NEW = '/xboe/teacher/name' export const AUDIENCE_LIST = "/admin/thirdApi/audience/userAudiences"; export const USER_PERMISSION = "/admin/thirdApi/permission/listByUser"; export const VALIDATE_TOKEN = "/admin/thirdApi/validateToken"; diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue index 5bcc69ea..26057bca 100644 --- a/src/components/project/lockLecturer.vue +++ b/src/components/project/lockLecturer.vue @@ -74,10 +74,10 @@ -
+
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 648e5885..f1bc89fc 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -278,7 +278,7 @@ {{ formParam.studys ||'-'}} {{ formParam.remark ||'-' }} -
取消 返回 -
+ -->
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index adcf62b1..cba9d0a9 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -352,7 +352,7 @@
-
取消 返回 -
+ -->
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 8df8a5ba..8b2d93e0 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -420,8 +420,8 @@
- -
--> +
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue index f6c89a72..849de192 100644 --- a/src/views/lecturer/Organization.vue +++ b/src/views/lecturer/Organization.vue @@ -114,7 +114,7 @@ + placeholder="请输入培训发生组织名称" allowClear showSearch> @@ -328,13 +328,13 @@ export default{ }, { title: '根节点名称', - dataIndex: 'isParent', - key: 'isParent', + dataIndex: 'parentName', + key: 'parentName', ellipsis: true, align: "center", width: 200, customRender: ({text})=>{ return ( - text != 1 ? "是" : "否" + text || '-' ) }, },