讲师管理bug

src/components/lecturer/ImportWork.vue

@@ -355,7 +355,7 @@ import {getCookieForName} from "@/api/method";
             .line{
               height: 1px;
               margin-top: 16px;
-              background-color: #666666;
+              background-color: #f0f0f0;
             }
             .contents{
               display: flex;

src/components/project/AddContent.vue

@@ -198,14 +198,14 @@ export default {
             .line{
               height: 1px;
               margin-top: 16px;
-              background-color: #666666;
+              background-color: #e8e8e8;
             }
             .content{
               display: flex;
               min-height: 500px;
               .left{
                 width: 50%;
-                border-right: 1px solid #666666;
+                border-right: 1px solid #e8e8e8;
                 padding: 30px 15px;
                 max-height: 600px;
                 overflow-y: auto;
@@ -255,7 +255,7 @@ export default {
             height: 60px;
             text-align: right;
             padding: 13px 30px;
-            border-top: 1px solid #666666;
+            border-top: 1px solid #e8e8e8;
           }
         }
       }

src/components/project/AddOrgContent.vue

@@ -42,7 +42,7 @@
                   v-for="(item, index) in treeAddData"
                   :key="index"
                 >
-                  <div class="tag_text" :title="`${item?.name} - (原：${item?.orgName || '-'})`">{{ item?.name }} - (原：{{ item?.orgName || '-' }})</div>
+                  <div class="tag_text" :title="`${item?.orgName} - (原：${item?.affiliationName || '-'})`">{{ item?.orgName }} - (原：{{ item?.affiliationName || '-' }})</div>
                   <div @click="deleteTree(item)" class="tag_delete">+</div>
                 </div>
               </div>
@@ -125,6 +125,7 @@ import * as lecturerApi from "@/api/Lecturer.js";
       }
       if(treeData.value.length){
         treeData.value.map(item=>{
+          item.name = item.name?.split('(')[0]
           notLists.value.some(i=>{
             if(i.orgId == item.id){
               item.disabled = true
@@ -158,11 +159,12 @@ import * as lecturerApi from "@/api/Lecturer.js";
         return item;
       }
       try {
-        const orgItem = orgLists.value?.find(i => i && i.id == item.id);
+        const orgItem = orgLists.value?.find(i => i && i.orgId == item.id);
         if (orgItem) {
           item.isSelect = orgItem.isSelect;
           item.orgName = orgItem.orgName;
           item.leaders = orgItem.leaders;
+          item.affiliationName = orgItem.affiliationName
         }
         return {
           orgId: item.id,
@@ -252,14 +254,14 @@ import * as lecturerApi from "@/api/Lecturer.js";
             .line{
               height: 1px;
               margin-top: 16px;
-              background-color: #666666;
+              background-color: #e8e8e8;
             }
             .content{
               display: flex;
               min-height: 500px;
               .left{
                 width: 50%;
-                border-right: 1px solid #666666;
+                border-right: 1px solid #e8e8e8;
                 padding: 30px 15px;
                 max-height: 600px;
                 overflow-y: auto;
@@ -315,7 +317,7 @@ import * as lecturerApi from "@/api/Lecturer.js";
             height: 60px;
             text-align: right;
             padding: 13px 30px;
-            border-top: 1px solid #666666;
+            border-top: 1px solid #e8e8e8;
           }
         }
       }

src/components/project/ConfirmLecturer.vue

@@ -143,11 +143,16 @@ const handleConfirm = () => {
   }
   api.teacherExpenseConfirm({ids:ids?.join(',')}).then(res=>{
     console.log(res,'resssss')
-    api.submitApproval({ids:ids?.join(',')}).then(res=>{
+    api.submitApproval({ids:res.data?.data?.join(',')}).then(res=>{
       console.log(res,'resssss')
       message.success('提交成功')
       close()
       closeDrawer()
+    }).catch(err=>{
+      message.destroy()
+      message.error(err.data.msg)
+      close()
+      closeDrawer()
     })
   }).catch(err=>{
     message.destroy()

src/components/project/OrgClass.vue

@@ -16,7 +16,7 @@
     v-model:value="labelValue"
     style="width: 100%"
     :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-    placeholder="请选择归属组织"
+    :placeholder="placeholder"
     :labelInValue="true"
     allow-clear
     v-model:treeExpandedKeys="stuTreeExpandedKeys"
@@ -46,6 +46,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  placeholder: {
+    type: String,
+    default: "请选择归属组织"
+  }
 });
 const emit = defineEmits({});
 const stuTreeExpandedKeys = ref([]);

src/components/project/lockLecturer.vue

@@ -11,12 +11,11 @@
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">{{ title }}</div>
-        <!-- <img
+        <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
           @click="closeDrawer"
-        /> -->
-        <a-button @click="closeDrawer" style="margin-right: 10px;" type="primary" class="btn1">返回</a-button>
+        />
       </div>
       <div class="content">
         <div class="title">