讲师管理bug

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";

src/components/project/lockLecturer.vue

@@ -74,10 +74,10 @@
           </a-tabs>
         </div>
       </div>
-      <div class="btnn">
+      <!-- <div class="btnn">
         <button class="btn2" @click="closeDrawer">取消</button>
         <button class="btn2" @click="closeDrawer">确定</button>
-      </div>
+      </div> -->
     </div>
   </a-drawer>
 </template>

src/views/lecturer/ExternalTeaching.vue

@@ -278,7 +278,7 @@
         <a-descriptions-item label="参训人数  ">{{ formParam.studys  ||'-'}}</a-descriptions-item>
         <a-descriptions-item label="备注  " :span="2">{{ formParam.remark ||'-' }}</a-descriptions-item>
       </a-descriptions>
-      <div :style="{
+      <!-- <div :style="{
         position: 'absolute',
         right: 0,
         bottom: 0,
@@ -292,7 +292,7 @@
         <a-button class="drabtn" @click="cancelTeachingDialog">取消</a-button>
         <a-button class="drabtn" type="primary" @click="cancelTeachingDialog" :loading="buttonLoading">返回
         </a-button>
-      </div>
+      </div> -->
     </a-drawer>
     <!-- 删除功能弹窗 -->
     <div>

src/views/lecturer/InsideTeaching.vue

@@ -352,7 +352,7 @@
           </template>
         </a-table>
       </div>
-      <div :style="{
+      <!-- <div :style="{
         position: 'absolute',
         right: 0,
         bottom: 0,
@@ -366,7 +366,7 @@
         <a-button class="drabtn" @click="cancelTeachingDialog">取消</a-button>
         <a-button class="drabtn" type="primary" @click="cancelTeachingDialog" :loading="buttonLoading">返回
         </a-button>
-      </div>
+      </div> -->
     </a-drawer>
     <!-- 删除功能弹窗 -->
     <div>

src/views/lecturer/LecturerFee.vue

@@ -420,8 +420,8 @@
   <div style="margin-bottom:32px;">
     <a-table :columns="columnSee" :data-source="tableDataSee"  :pagination="false" />
   </div>
-  <span class="line"></span>
-  <div :style="{
+  <!-- <span class="line"></span> -->
+  <!-- <div :style="{
         position: 'absolute',
         right: 0,
         bottom: 0,
@@ -435,7 +435,7 @@
         <a-button  class="drabtn"  type="primary" @click="cancelTeachingDialog(false)">确定</a-button>
         <a-button   class="drabtn" @click="cancelTeachingDialog(false)" :loading="buttonLoading">取消
         </a-button>
-      </div>
+      </div> -->
 </a-drawer>
 <ImportWork v-model:showWork="showWork" :template="'讲师费导入模板'" :url="'/admin/export/importTeacherExpense'" :fileName="uploadFile" :title="title"></ImportWork>
     </div>

src/views/lecturer/Organization.vue

@@ -114,7 +114,7 @@
           <a-col :span="12">
             <a-form-item label="培训发生组织名称：" name="affiliationName">
         <a-input :maxlength="30" show-count v-model:value="formParam.affiliationName"  class="draitem"
-                  placeholder="请输入讲师体系名称" allowClear showSearch>
+                  placeholder="请输入培训发生组织名称" allowClear showSearch>
                   </a-input>
             </a-form-item>
           </a-col>
@@ -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 || '-'
           )
         },
       },