Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage

src/views/lecturer/InsideLecturer.vue

@@ -75,11 +75,11 @@
           @expand="expandTable" :pagination="false">
           <template #bodyCell="{ record, column }">
 
-            <!-- <template v-if="column.key === 'organizationName'">
+            <!-- <template v-if="column.key === 'orgName'">
               <a-space style="display:flex ;justify-content: space-around;  ">
                 <a-popover>
                   <template #content>
-                    <p>{{ record.organizationName }}</p>
+                    <p>{{ record.orgName }}</p>
                   </template>
                   <span>{{ record.neworganizationName }}</span>
                 </a-popover>
@@ -685,10 +685,10 @@ export default {
       },
       {
         title: '所属组织 ',
-        dataIndex: 'organizationName',
-        key: 'organizationName',
+        dataIndex: 'orgName',
+        key: 'orgName',
         elipsis: true, align: "center",
-        scopedSlots: { customRender: "organizationName" },
+        scopedSlots: { customRender: "orgName" },
         width: 400,
         //  customRender: (value, record) => {
         //   return (
@@ -847,8 +847,8 @@ export default {
           console.log(tableData.value,'tableData.value')
           // let objA = res.data.data.records
           // objA.map((item) => {
-          //   if (item.organizationName !== null) {
-          //     item.neworganizationName = item.organizationName.split('/')
+          //   if (item.orgName !== null) {
+          //     item.neworganizationName = item.orgName.split('/')
           //     item.neworganizationName = item.neworganizationName[item.neworganizationName.length - 1]
           //   }
           // })