diff --git a/src/components/project/LookExternalLecturer.vue b/src/components/project/LookExternalLecturer.vue
index f3191983..c6501128 100644
--- a/src/components/project/LookExternalLecturer.vue
+++ b/src/components/project/LookExternalLecturer.vue
@@ -147,29 +147,29 @@ export default{
       //   ellipsis: true, align: "center",
       //   width: 120,
       // },
-      {
-        title: '课程编号',
-        dataIndex: 'courseId',
-        key: 'courseId',
-         align: "center",
-         customRender: ({text, index})=>{
-                return index+1;
-            },    
-        width: 120,
-      },
+      // {
+      //   title: '课程编号',
+      //   dataIndex: 'courseId',
+      //   key: 'courseId',
+      //    align: "center",
+      //    customRender: ({text, index})=>{
+      //           return index+1;
+      //       },    
+      //   width: 120,
+      // },
       {
         title: '课程名称',
         dataIndex: 'courseName',
         key: 'courseName',
         ellipsis: true, align: "center",
-        width: 120,
+        width: 180,
       },
       {
         title: '课程日期',
         dataIndex: 'teachingDate',
         key: 'teachingDate',
         ellipsis: true, align: "center",
-        width: 200,
+        width: 160,
         customRender: (value) => {
           return (
             <div>
@@ -208,7 +208,7 @@ export default{
         }
       },
       {
-        title: '学习总人数',
+        title: '参训人数',
         dataIndex: 'studys',
         key: 'studys',
         ellipsis: true, align: "center",
@@ -222,7 +222,7 @@ export default{
         dataIndex: 'teaching',
         key: 'teaching',
         ellipsis: true, align: "center",
-        width: 120,
+        width: 130,
         customRender: ({text})=>{
           return text ? text+'分钟' : '-'
         }
@@ -236,7 +236,7 @@ export default{
         customRender: (value) => {
           return (
             <div>
-              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
             </div>
           )
         }
@@ -265,7 +265,7 @@ export default{
         dataIndex: 'remark',
         key: 'remark',
         ellipsis: true, align: "center",
-        width: 120,
+        width: 200,
         customRender: (text)=>{
           return (
             <div>
diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue
index e75f17fb..de9d63d6 100644
--- a/src/components/project/LookInsideLecturer.vue
+++ b/src/components/project/LookInsideLecturer.vue
@@ -22,7 +22,7 @@
       <a-descriptions-item label="讲师头像">
         <a-image :width="55" style="border-radius: 50%;width:55px;height:55px;" :src=formParam.photo />
       </a-descriptions-item>
-      <a-descriptions-item label="讲师姓名">{{formParam.name}}/{{formParam.userNo}}</a-descriptions-item>
+      <a-descriptions-item label="讲师姓名">{{formParam.name}}  /  {{formParam.userNo}}</a-descriptions-item>
       <a-descriptions-item label="讲师体系">{{formParam.tsystemName || '-'}}</a-descriptions-item>
       <!-- 二层 -->
       <a-descriptions-item label="讲师级别">{{formParam.tlevelName||'-'}}</a-descriptions-item>
@@ -32,15 +32,15 @@
                       @click="handleup">查看认证资料</a-button>
                   </span>
       </a-descriptions-item>
-      <a-descriptions-item label="授课时长"> <span v-if="formParam.teaching!= null" >{{ (Number(formParam.teaching) /60 ).toFixed(2)}}小时</span><span v-else>-</span>
+      <a-descriptions-item label="授课时长"> <span v-if="formParam.teaching!= null" >{{formParam.teaching}}分钟({{ (Number(formParam.teaching) /60 ).toFixed(2)}}小时)</span><span v-else>-</span>
             </a-descriptions-item>
       <a-descriptions-item label="发薪地  ">{{formParam.salaryName||'-'}}</a-descriptions-item>
       <!-- 三层 -->
       <a-descriptions-item label="在职状态">{{formParam.waitStatus=='0'?'在职' :formParam.waitStatus=='1' ?'离职':'-'}}</a-descriptions-item>
       <a-descriptions-item label="账号状态">{{formParam.status=='0'?'临时' :formParam.status=='1' ?'启用':formParam.status==2 ?'停用':'-'}}</a-descriptions-item>
-      <a-descriptions-item label="创建方式">{{formParam.createFrom=='0'?'自动录入' :formParam.createFrom=='1'?'手动录入':'-'}}</a-descriptions-item>
+      <a-descriptions-item label="录入方式">{{formParam.createFrom=='0'?'自动录入' :formParam.createFrom=='1'?'手动录入':'-'}}</a-descriptions-item>
       <a-descriptions-item style="max-width: 400px;" label="所属组织" >
-        <span :title="formParam.orgName">{{ formParam.orgNames || '-' }}</span>
+        <span :title="formParam.orgName">{{ formParam.orgName || '-' }}</span>
       </a-descriptions-item>
     </a-descriptions>
     <div style="margin-top: 10px;"></div>
@@ -207,31 +207,31 @@ export default{
     }
         //授课记录列表
         const teacherrecordsColumns = ref([
-      {
-        title: '课程编号',
-        dataIndex: 'courseId',
-        key: 'courseId',
-         align: "center",
-         customRender: ({text, index})=>{
-                return index+1;
-            },
+      // {
+      //   title: '课程编号',
+      //   dataIndex: 'courseId',
+      //   key: 'courseId',
+      //    align: "center",
+      //    customRender: ({text, index})=>{
+      //           return index+1;
+      //       },
             
-        width: 120,
-      },
+      //   width: 120,
+      // },
       {
         title: '课程名称',
         dataIndex: 'courseName',
         key: 'courseName',
         ellipsis: true,
         align: "center",
-        width: 120,
+        width: 180,
       },
       {
         title: '课程日期',
         dataIndex: 'teachingDate',
         key: 'teachingDate',
         ellipsis: true, align: "center",
-        width: 200,
+        width: 160,
         customRender: (value) => {
           return (
             <div>
@@ -271,7 +271,7 @@ export default{
         }
       },
       {
-        title: '学习总人数',
+        title: '参训人数',
         dataIndex: 'studys',
         key: 'studys',
         ellipsis: true, align: "center",
@@ -285,7 +285,7 @@ export default{
         dataIndex: 'teaching',
         key: 'teaching',
         ellipsis: true, align: "center",
-        width: 120,
+        width: 130,
         customRender: ({text})=>{
           return text ? text+'分钟' : '-'
         }
@@ -299,7 +299,7 @@ export default{
         customRender: (value) => {
           return (
             <div>
-              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
             </div>
           )
         }
@@ -329,7 +329,7 @@ export default{
         key: 'remark ',
         ellipsis: true,
         align: "center",
-        width: 120,
+        width: 200,
         customRender: (value) => {
           return (
             <div>{value.record.remark || '-'}</div>
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index ca3aec27..6d936665 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -439,25 +439,24 @@ export default {
           )
         }
       },
-      // {
-      //   title: '讲师邮箱 ',
-      //   dataIndex: 'email',
-      //   key: 'email',
-      // ellipsis: true, align: "center",
-      //   width: 200,
-      // },
       {
-        title: '授课时长 ',
+        title: '讲师邮箱 ',
+        dataIndex: 'email',
+        key: 'email',
+      ellipsis: true, align: "center",
+        width: 200,
+        customRender: ({text})=>{
+          return text || '-'
+        }
+      },
+      {
+        title: '授课时长(分钟)',
         dataIndex: 'teaching',
         key: 'teaching',
         ellipsis: true, align: "center",
         width: 200,
-         customRender: (value, record) => {
-          return (
-            <div>
-              {value.record.teaching}分钟
-            </div>
-          )
+        customRender: ({text})=>{
+          return text ? text+'分钟' : '-'
         }
       },
       {
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index d386db87..5af7f3d5 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -341,7 +341,7 @@
             <span style="margin-left: 10px ;" v-if="formParam.teaching != '0'">({{ (formParam.teaching / 60
             ).toFixed(2) }}小时)</span>
           </a-descriptions-item>
-          <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-'}}</a-descriptions-item>
+          <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-'}}</a-descriptions-item>
           <a-descriptions-item label="参训人数  ">{{ formParam.studys ? formParam.studys+'人' :'-'}}</a-descriptions-item>
           <a-descriptions-item label="备注  " :span="2">{{ formParam.remark ||'-' }}</a-descriptions-item>
         </a-descriptions>
@@ -562,13 +562,20 @@ export default {
         customRender: ({text})=> text||'-'
       },
       {
-        title: '手机号码 ',
-        dataIndex: 'mobile',
-        key: 'mobile',
+        title: '课程名称 ',
+        dataIndex: 'courseName',
+        key: 'courseName',
         ellipsis: true, align: "center",
-        width: 150,
-        customRender: ({text}) => text||'-'
+        width: 200,
       },
+      // {
+      //   title: '手机号码 ',
+      //   dataIndex: 'mobile',
+      //   key: 'mobile',
+      //   ellipsis: true, align: "center",
+      //   width: 150,
+      //   customRender: ({text}) => text||'-'
+      // },
       {
         title: '课程类型 ',
         dataIndex: 'type',
@@ -592,33 +599,7 @@ export default {
         }
       },
       {
-        title: '课程名称 ',
-        dataIndex: 'courseName',
-        key: 'courseName',
-        ellipsis: true, align: "center",
-        width: 150,
-      },
-      {
-        title: '录入类型',
-        dataIndex: 'createFrom',
-        key: 'createFrom',
-        ellipsis: true, align: "center",
-        width: 120,
-        customRender: (value) => {
-          return (
-            <div>
-              {value.record.createFrom == "0" || value.record.createFrom == "1"
-                ? {
-                  "0": "系统生成",
-                  "1": "手动录入",
-                }[value.record.createFrom + ""] || ""
-                : "-"}
-            </div>
-          )
-        }
-      },
-      {
-        title: '授课时间 ',
+        title: '授课/课程日期 ',
         dataIndex: 'teachingDate',
         key: 'teachingDate',
         ellipsis: true, align: "center",
@@ -670,29 +651,29 @@ export default {
       //  //${getSysTypeMap(record.sysType3, record.sysTypeId)?'-'+getSysTypeMap//(record.sysType3) : ""}
       //  //   `
       //   },
+      // {
+      //   title: '内容分类',
+      //   dataIndex: 'courseTypeName',
+      //   key: 'courseTypeName',
+      //   ellipsis: true, align: "center",
+      //   width: 120,
+      // },
       {
-        title: '内容分类',
-        dataIndex: 'courseTypeName',
-        key: 'courseTypeName',
-        ellipsis: true, align: "center",
-        width: 120,
-      },
-      {
-        title: '授课时长(H) ',
+        title: '授课/课程时长(分钟)',
         dataIndex: 'teaching',
         key: 'teaching',
         ellipsis: true, align: "center",
-        width: 120,
+        width: 160,
         customRender: (value) => {
           return (
             <div>
-              {(value.record?.teaching/60).toFixed(2)+'小时' || '-' }
+              {value.record?.teaching ? value.record.teaching + '分钟' : '-'}
             </div>
           );
         },
       },
       {
-        title: '学习总人数',
+        title: '参训人数',
         dataIndex: 'studys',
         key: 'studys',
         ellipsis: true, align: "center",
@@ -710,12 +691,30 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
+            </div>
+          )
+        }
+      },
+      {
+        title: '数据来源',
+        dataIndex: 'createFrom',
+        key: 'createFrom',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.createFrom == "0" || value.record.createFrom == "1"
+                ? {
+                  "0": "系统生成",
+                  "1": "手动录入",
+                }[value.record.createFrom + ""] || ""
+                : "-"}
             </div>
           )
         }
       },
-
       {
         title: '操作 ',
         dataIndex: 'operation',
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index bc22f72e..ae75b0aa 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -77,12 +77,12 @@
           <template #bodyCell="{ record, column }">
 
             <template v-if="column.key === 'orgName'">
-              <a-space style="display:flex ;justify-content: left;  ">
+              <a-space style="display:flex ;justify-content: left;">
                 <!-- <a-popover>
                   <template #content>
                     <p>{{ record.orgName}}</p>
                   </template> -->
-                  <span :title="record.orgName">{{ record.neworganizationName }}</span>
+                  <div style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="record.orgName">{{ record.neworganizationName }}</div>
                 <!-- </a-popover> -->
               </a-space>
             </template>
@@ -771,21 +771,28 @@ export default {
       }
     }
     const columns = ref([
-      {
-        title: '讲师工号 ',
-        dataIndex: 'userNo',
-        key: 'userNo',
-        ellipsis: true,
-        align: "center",
-        width: 120,
-      },
+      // {
+      //   title: '讲师工号 ',
+      //   dataIndex: 'userNo',
+      //   key: 'userNo',
+      //   ellipsis: true,
+      //   align: "center",
+      //   width: 120,
+      // },
       {
         title: '讲师姓名 ',
         dataIndex: 'name',
         key: 'name',
         ellipsis: true,
         align: "center",
-        width: 120,
+        width: 180,
+        customRender: (value, record) => {
+          return (
+            <div>
+              {value.record.name}  /  {value.record.userNo}
+            </div>
+          )
+        }
       },
       {
         title: '所属组织 ',
@@ -822,7 +829,7 @@ export default {
         dataIndex: 'teaching',
         key: 'teaching',
         ellipsis: true, align: "center",
-        width: 120,
+        width: 130,
         customRender: ({text})=>{
           return text ? text+'分钟' : '-'
         }
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 7e877d9e..e7e76045 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -432,7 +432,7 @@
             ).toFixed(2) }}小时)</span> </a-descriptions-item>
           <a-descriptions-item label="授课时间">{{ formParam.teachingDate||'-' }}</a-descriptions-item>
           <a-descriptions-item label="参训人数  ">{{ formParam.studys?formParam.studys+'人':'-' }}</a-descriptions-item>
-          <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-' }}</a-descriptions-item>
+          <a-descriptions-item label="评分  ">{{ formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-' }}</a-descriptions-item>
           <!-- <a-descriptions-item label="内容分类">{{ formParam.courseTypeName||'-' }}</a-descriptions-item> -->
            <a-descriptions-item label="是否生成讲师费">{{{0:'否',1:'是'}[formParam.createdFee]}}</a-descriptions-item>
           <a-descriptions-item label="备注  ">{{ formParam.remark||'-' }}</a-descriptions-item>
@@ -766,15 +766,22 @@ export default {
         dataIndex: 'teacherName',
         key: 'teacherName',
         ellipsis: true, align: "center",
-        width: 120,
-      },
-      {
-        title: '讲师工号 ',
-        dataIndex: 'userNo',
-        key: 'userNo',
-        ellipsis: true, align: "center",
-        width: 120,
+        width: 180,
+        customRender: (value, record) => {
+          return (
+            <div>
+              {value.record.teacherName||'-'}  /  {value.record.userNo||'-'}
+            </div>
+          )
+        }
       },
+      // {
+      //   title: '讲师工号 ',
+      //   dataIndex: 'userNo',
+      //   key: 'userNo',
+      //   ellipsis: true, align: "center",
+      //   width: 120,
+      // },
       {
         title: '课程名称 ',
         dataIndex: 'courseName',
@@ -782,47 +789,7 @@ export default {
         ellipsis: true, align: "left",
         width: 200,
       },
-      {
-        title: '讲师体系 ',
-        dataIndex: 'tsystemName',
-        key: 'tsystemName',
-        ellipsis: true, align: "left",
-        width: 200,
-      },
-      {
-        title: '培训发生组织 ',
-        dataIndex: 'trainOrgName',
-        key: 'trainOrgName',
-        ellipsis: true, align: "left",
-        width: 200,
-         customRender: (value, record) => {
-          return (
-            <div>
-              {value.record.trainOrgName||'-'}
-            </div>
-          )
-        }
-      },
-      {
-        title: '数据来源',
-        dataIndex: 'createFrom',
-        key: 'createFrom',
-        ellipsis: true, align: "center",
-        width: 120,
-        customRender: (value) => {
-          return (
-            <div>
-              {value.record.createFrom == "0" || value.record.createFrom == "1"
-                ? {
-                  "0": "系统生成",
-                  "1": "手动录入",
-                }[value.record.createFrom + ""] || ""
-                : "-"}
-            </div>
-          )
-        }
-      },
-
+      
       {
         title: '课程类型 ',
         dataIndex: 'type',
@@ -846,11 +813,11 @@ export default {
         }
       },
       {
-        title: '授课时间',
+        title: '授课/课程日期',
         dataIndex: 'teachingDate',
         key: 'teachingDate',
         ellipsis: true, align: "center",
-        width: 200,
+        width: 160,
         customRender: (value) => {
           return (
             <div>
@@ -859,6 +826,14 @@ export default {
           );
         },
       },
+      // {
+      //   title: '讲师体系 ',
+      //   dataIndex: 'tsystemName',
+      //   key: 'tsystemName',
+      //   ellipsis: true, align: "left",
+      //   width: 200,
+      // },
+
       {
         title: '开课状态 ',
         dataIndex: 'courseStatus',
@@ -886,12 +861,12 @@ export default {
       //   width: 120,
       // },
       {
-        title: '授课时长(分钟) ',
+        title: '授课/课程时长(分钟)',
         dataIndex: 'teaching',
         key: 'teaching',
         ellipsis: true, align: "center",
         scopedSlots: { customRender: "teaching" },
-        width: 140,
+        width: 160,
       },
       {
         title: '参训人数',
@@ -912,7 +887,40 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
+            </div>
+          )
+        }
+      },
+      {
+        title: '数据来源',
+        dataIndex: 'createFrom',
+        key: 'createFrom',
+        ellipsis: true, align: "center",
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.createFrom == "0" || value.record.createFrom == "1"
+                ? {
+                  "0": "系统生成",
+                  "1": "手动录入",
+                }[value.record.createFrom + ""] || ""
+                : "-"}
+            </div>
+          )
+        }
+      },
+      {
+        title: '培训发生组织 ',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        ellipsis: true, align: "left",
+        width: 200,
+         customRender: (value, record) => {
+          return (
+            <div>
+              {value.record.trainOrgName||'-'}
             </div>
           )
         }
@@ -1427,7 +1435,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?recordType=1&name=${state.searchParam.name || ''}&courseName=${state.searchParam.courseName || ''}&type=${state.searchParam.type || ''}&courseStatus=${state.searchParam.courseStatus || ''}&tSystemId=${state.searchParam.tSystemId || ''}&beginTime=${state.searchParam.beginTime || ''}&endTime=${state.searchParam.endTime || ''}&orgId=${state.searchParam.orgId || ''}&courseTypeId=${state.searchParam.courseTypeId || ''}&score=${state.searchParam.score || ''}&studys=${state.searchParam.studys || ''}
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?recordType=1&name=${state.searchParam.name || ''}&courseName=${state.searchParam.courseName || ''}&type=${state.searchParam.type || ''}&courseStatus=${state.searchParam.courseStatus || ''}&createdFee=${state.searchParam.createdFee || ''}&beginTime=${state.searchParam.beginTime || ''}&endTime=${state.searchParam.endTime || ''}&trainOrgId=${state.searchParam.trainOrgId || ''}&score=${state.searchParam.score || ''}&studys=${state.searchParam.studys || ''}
       `)
       console.log(state.searchParam.name, state.searchParam, '参数')
     }
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 665e980d..be7920a5 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -125,16 +125,11 @@
                   <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
                 </a-space>
               </template>
-              <template v-if="column.key === 'trainOrg'">
-              <a-space style="display:flex ;justify-content: space-around;  ">
-                <a-popover>
-    <template #content>
-      <p>{{ record.trainOrg }}</p>
-    </template>
-    <span>{{ record.trainOrg }}</span>
-  </a-popover>
-              </a-space>
             </template>
+            <template  #trainOrg="{ record }">
+              <a-space style="display:flex ;justify-content: space-around;">
+                <div style="max-width: 180px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" :title="record.orgName">{{ orgSplit(record.orgName) }}</div>
+              </a-space>
             </template>
           </a-table>
         </div>
@@ -514,27 +509,27 @@
         </div>
   <span class="line"></span>
   <span style="font-weight: 600;">讲师费用详情</span>
-<a-descriptions style="padding-bottom: 35px;margin-top:20px;" bordered :column="2" :contentStyle="{width:'300px',}" :labelStyle="{width:'160px'}">
-    <a-descriptions-item label="讲师名称">{{formParam.name}}</a-descriptions-item>
+<a-descriptions style="padding-bottom: 35px;margin-top:20px;" bordered :column="2" :contentStyle="{width:'300px',}" :labelStyle="{width:'166px'}">
+    <a-descriptions-item label="讲师姓名">{{formParam.name}}</a-descriptions-item>
     <!-- <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item> -->
+    <a-descriptions-item label="讲师组织">{{formParam.orgName}}</a-descriptions-item>
     <a-descriptions-item label="讲师体系">{{formParam.tsystemName}}</a-descriptions-item>
     <a-descriptions-item label="讲师级别">{{formParam.tlevelName }}</a-descriptions-item>
-    <a-descriptions-item label="讲师组织">{{formParam.orgName}}</a-descriptions-item>
-    <a-descriptions-item label="发薪地">{{formParam?.payrollPlace || '-'}}</a-descriptions-item>
+    <a-descriptions-item label="讲师发薪地">{{formParam?.payrollPlace || '-'}}</a-descriptions-item>
+    <a-descriptions-item label="课程名称">{{formParam.courseName || '-'}}</a-descriptions-item>
     <a-descriptions-item label="费用类型">{{{0:'在线',1:'面授',2:'课程开发',3:'作业员入模培训',4:'其他'}[formParam?.courseType]}}</a-descriptions-item>
     <!-- <a-descriptions-item label="课程类型">{{formParam.courseType==1?'项目开课' :formParam.courseType==2 ?'路径开课':formParam.courseType==3 ?'面授开课':'-'}}</a-descriptions-item> -->
-    <a-descriptions-item label="课程名称">{{formParam.courseName || '-'}}</a-descriptions-item>
     <a-descriptions-item label="培训发生组织">{{formParam.trainOrgName || '-'}}</a-descriptions-item>
-    <a-descriptions-item label="授课日期  ">{{(formParam.teachingDate) || '-'}}</a-descriptions-item>
-    <a-descriptions-item label="授课时长  ">{{formParam.teachingTime || '-'}}分 <span v-if="formParam.teachingTime">({{(formParam.teachingTime/60).toFixed(2)}}小时)</span></a-descriptions-item>
+    <a-descriptions-item label="授课/课程开发日期  ">{{(formParam.teachingDate) || '-'}}</a-descriptions-item>
+    <a-descriptions-item label="授课/课程开发时长  ">{{formParam.teachingTime || '-'}}分 <span v-if="formParam.teachingTime">({{(formParam.teachingTime/60).toFixed(2)}}小时)</span></a-descriptions-item>
     <a-descriptions-item label="参训人数  ">{{formParam.studys?formParam.studys+'人' : '-'}}</a-descriptions-item>
-    <a-descriptions-item label="评分  ">{{formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(0)+'分':'-' }}</a-descriptions-item>
+    <a-descriptions-item label="评分  ">{{formParam.score?Number(formParam.score).toFixed(0)==0?'-':Number(formParam.score).toFixed(2)+'分':'-' }}</a-descriptions-item>
     <a-descriptions-item label="基准课酬  ">{{formParam.levelPay||formParam.levelPay==0?formParam.levelPay+'元' : '-'}}</a-descriptions-item>
     <a-descriptions-item label="计划费用  ">{{formParam.expense?formParam.expense+'元': '-'}}</a-descriptions-item>
     <!-- <a-descriptions-item label="应发费用  ">{{formParam.payableExpense || '-'}}</a-descriptions-item> -->
     <!-- <a-descriptions-item label="费用发放时间">{{formParam.payableExpenseTime || '-'}}</a-descriptions-item> -->
     <a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'审核拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
-    <a-descriptions-item label="课程类型">{{{"0": "在线课","1": "面授课","2": "课程开发","3": "作业员入模培训","4": "其他",}[formParam.courseType + ""]}}</a-descriptions-item>
+    <!-- <a-descriptions-item label="课程类型">{{{"0": "在线课","1": "面授课","2": "课程开发","3": "作业员入模培训","4": "其他",}[formParam.courseType + ""]}}</a-descriptions-item> -->
     <a-descriptions-item label="备注  ">{{formParam.remark || '-'}}</a-descriptions-item>
   </a-descriptions>
   <div style="margin-bottom: 20px;" v-if="false">
@@ -916,15 +911,22 @@ getAllLevelList().then((res) => {
           dataIndex: 'name',
           key: 'name',
         ellipsis: true, align: "center",
-          width: 120,
-        },
-        {
-          title: '讲师工号 ',
-          dataIndex: 'userNo',
-          key: 'userNo',
-        ellipsis: true, align: "center",
-          width: 120,
+          width: 180,
+          customRender: (value, index) => {
+            return (
+              <div>
+                {value.record?.name}  /  {value.record?.userNo}
+              </div>
+            );
+          },
         },
+        // {
+        //   title: '讲师工号 ',
+        //   dataIndex: 'userNo',
+        //   key: 'userNo',
+        // ellipsis: true, align: "center",
+        //   width: 120,
+        // },
         {
           title: '课程名称 ',
           dataIndex: 'courseName',
@@ -940,13 +942,43 @@ getAllLevelList().then((res) => {
         ellipsis: true, align: "left",
           width: 200,
         },
-        
         {
-          title: '授课时长 ',
+          title: '课程类型 ',
+          dataIndex: ' courseType',
+          key: ' courseType',
+          ellipsis: true,
+          align: "center",
+          width: 120,
+          customRender: (value) => {
+            return (
+              <div>
+                {String(value.record.courseType)
+                  ? {
+                    "0": "在线课",
+                    "1": "面授课",
+                    "2": "课程开发",
+                    "3": "作业员入模培训",
+                    "4": "其他",
+                  }[value.record.courseType + ""]
+                  : "-"}
+              </div>
+            )
+          }
+        },
+        {
+          title: '授课/课程开发日期',
+          dataIndex: 'teachingDate',
+          key: 'teachingDate',
+        ellipsis: true, align: "center",
+          width: 160,
+          
+        },
+        {
+          title: '授课/课程开发时长 ',
           dataIndex: 'teachingTime',
           key: 'teachingTime',
         ellipsis: true, align: "center",
-          width: 120,
+          width: 160,
           customRender:(value)=>{
             return (
               <div>
@@ -955,44 +987,6 @@ getAllLevelList().then((res) => {
             )
           }
         },
-        {
-          title: '授课日期',
-          dataIndex: 'teachingDate',
-          key: 'teachingDate',
-        ellipsis: true, align: "center",
-          width: 120,
-          
-        },
-        {
-          title: '讲师体系',
-          dataIndex: 'tsystemName',
-          key: 'tsystemName',
-        ellipsis: true, align: "left",
-          width: 200,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
-        },
-        {
-          title: '讲师级别 ',
-          dataIndex: 'tlevelName',
-          key: 'tlevelName',
-        ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
-        },
-        {
-          title: '发薪地 ',
-          dataIndex: 'payrollPlace',
-          key: 'payrollPlace',
-        ellipsis: true, align: "center",
-          width: 120,
-          customRender: ({ text })=>{
-            return text||'-'
-          }
-        },
         {
           title: '基准课酬 ',
           dataIndex: 'levelPay',
@@ -1032,34 +1026,12 @@ getAllLevelList().then((res) => {
           customRender: (value) => {
           return (
             <div>
-              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(0)+'分' : '-'}
+              {value.record.score?Number(value.record.score).toFixed(0)==0?'-':Number(value.record.score).toFixed(2)+'分' : '-'}
             </div>
           )
         }
         },
-        {
-          title: '课程类型 ',
-          dataIndex: ' courseType',
-          key: ' courseType',
-          ellipsis: true,
-          align: "center",
-          width: 120,
-          customRender: (value) => {
-            return (
-              <div>
-                {String(value.record.courseType)
-                  ? {
-                    "0": "在线课",
-                    "1": "面授课",
-                    "2": "课程开发",
-                    "3": "作业员入模培训",
-                    "4": "其他",
-                  }[value.record.courseType + ""]
-                  : "-"}
-              </div>
-            )
-          }
-        },
+
         {
           title: '状态 ',
           dataIndex: 'status',
@@ -1084,13 +1056,43 @@ getAllLevelList().then((res) => {
             )
           }
         },
+        {
+          title: '发薪地 ',
+          dataIndex: 'payrollPlace',
+          key: 'payrollPlace',
+        ellipsis: true, align: "center",
+          width: 120,
+          customRender: ({ text })=>{
+            return text||'-'
+          }
+        },
+        {
+          title: '讲师体系',
+          dataIndex: 'tsystemName',
+          key: 'tsystemName',
+        ellipsis: true, align: "left",
+          width: 200,
+          customRender: ({ text })=>{
+            return text||'-'
+          }
+        },
+        {
+          title: '讲师级别 ',
+          dataIndex: 'tlevelName',
+          key: 'tlevelName',
+        ellipsis: true, align: "center",
+          width: 120,
+          customRender: ({ text })=>{
+            return text||'-'
+          }
+        },
         {
           title: '讲师组织',
           dataIndex: 'orgName',
           key: 'orgName',
         ellipsis: true, align: "center",
           width: 200,
-          scopedSlots: { customRender: "trainOrg" },
+          slots: { customRender: "trainOrg" },
         },
         {
         title: '操作 ',
@@ -1364,6 +1366,12 @@ getAllLevelList().then((res) => {
           levelVoList: []
         }
       }
+      const orgSplit = (val) => {
+        if(val){
+          const org = val.split('/')
+          return org[org.length-1]
+        }
+      }
       //表格内查看数据操作
       const handleLook = (record) => {
         state.teachingdialog = true;
@@ -1568,15 +1576,22 @@ const column = ref([
           dataIndex: 'name',
           key: 'name',
         ellipsis: true, align: "center",
-          width: 120,
-        },
-        {
-          title: '讲师工号 ',
-          dataIndex: 'userNo',
-          key: 'userNo',
-        ellipsis: true, align: "center",
-          width: 120,
+          width: 180,
+          customRender: (value, index) => {
+            return (
+              <div>
+                {value.record?.name}  /  {value.record?.userNo}
+              </div>
+            );
+          },
         },
+        // {
+        //   title: '讲师工号 ',
+        //   dataIndex: 'userNo',
+        //   key: 'userNo',
+        // ellipsis: true, align: "center",
+        //   width: 120,
+        // },
         {
           title: '课程名称 ',
           dataIndex: 'courseName',
@@ -1847,6 +1862,7 @@ const column = ref([
         addTeacher,
         cancelTeacherDialog,
         handleLook,
+        orgSplit,
         cancel,
         // deleteModal,
         handleModify,