讲师管理bug

src/components/project/lockLecturer.vue

@@ -59,8 +59,17 @@
               </div>
             </a-tab-pane>
             <a-tab-pane key="2" tab="审批记录" force-render>
+              <div style="margin-bottom: 20px">
+                <a-table :columns="columnsThree" :data-source="formData?.tableDataTwo" >
+                  <template #action="{ record }">
+                    <div class="action">
+                      <div style="color: #1890ff;cursor: pointer;" class="btn" @click="lookList(record)">查看</div>
+                    </div>
+                  </template>
+                </a-table>
+              </div>
               <div style="margin-bottom: 100px">
-                <a-table :columns="columnsTwo" :data-source="formData?.tableDataTwo" />
+                <a-table v-if="threeList" :columns="columnsTwo" :data-source="formData?.tableDataTwo" />
               </div>
             </a-tab-pane>
           </a-tabs>
@@ -133,10 +142,39 @@ const columnsTwo = [
     key: 'age',
   },
 ]
+const columnsThree = ref([
+  {
+    title: '审批提交时间',
+    dataIndex: 'name',
+    key: 'name',
+  },
+  {
+    title: '审批状态',
+    dataIndex: 'age',
+    key: 'age',
+  },
+  {
+    title: '审批人',
+    dataIndex: 'address',
+    key: 'age',
+  },
+  {
+    title: '操作',
+    dataIndex: 'address',
+    key:'age',
+    slots: { customRender: "action" },
+  }
+])
+const threeList = ref(false)
+const lookList = (record) => {
+  console.log(record,'resssssss')
+  threeList.value = true
+}
 const visible = ref(false);
 watch(visible, (val)=>{
   console.log(val,'val',props.id)
   if(val){
+    threeList.value = false
     api.getAffiliationById(props.id).then(res=>{
       console.log(res,'resssss')
       formData.value = res.data.data

src/views/lecturer/InsideLecturer.vue

@@ -89,12 +89,12 @@
               <a-space>
                 <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
 
-                <a-button type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
-                <a-button v-if="record.status == '1'" type="link"
+                <a-button v-if="record.isPermission" type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
+                <a-button v-if="record.status == '1'&&record.isPermission" type="link"
                   @click="() => handleOperate(record, String(record.courseform))">停用</a-button>
-                <a-button v-if="record.status == '2'" type="link"
+                <a-button v-if="record.status == '2'&&record.isPermission" type="link"
                   @click="() => handleOperate(record, String(record.courseform))">启用</a-button>
-                    <a-button v-if="lecturerAdmin('lecturer-admin')" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
+                    <a-button  v-if="record.isSuperPermission" type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
                 <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))"  
                    v-if="lecturerAdmin('Lecturer-admin')">删除</a-button> -->
               </a-space>

src/views/lecturer/LecturerAPPEdit.vue

@@ -599,7 +599,7 @@ export default {
         scopedSlots: { customRender: "teacherOrg" },
       },
       {
-        title: '讲师发薪地 ',
+        title: '讲师体系',
         dataIndex: 'trainOrgName',
         key: 'trainOrgName',
         elipsis: true,
@@ -607,7 +607,39 @@ export default {
         width: 200,
       },
       {
-        title: '授课时长(系统 ) ',
+        title: '讲师等级',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        elipsis: true,
+        align: "center",
+        width: 200,
+      },
+      {
+        title: '发薪地',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        elipsis: true,
+        align: "center",
+        width: 200,
+      },
+      {
+        title: '课程类型',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        elipsis: true,
+        align: "center",
+        width: 200,
+      },
+      {
+        title: '课程名称',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        elipsis: true,
+        align: "center",
+        width: 200,
+      },
+      {
+        title: '授课/开发课程日期',
         dataIndex: 'teachingSystem',
         key: 'teachingSystem',
         elipsis: true,
@@ -615,13 +647,37 @@ export default {
         width: 200,
       },
       {
-        title: '授课时长(录入) ',
+        title: '授课/开发课程时长 ',
         dataIndex: 'teachingEnter',
         key: 'teachingEnter',
         elipsis: true,
         align: "center",
         width: 200,
       },
+      {
+        title: '参训人数 ',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        elipsis: true,
+        align: "center",
+        width: 200,
+      },
+      {
+        title: '评分 ',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        elipsis: true,
+        align: "center",
+        width: 200,
+      },
+      {
+        title: '课程基准 ',
+        dataIndex: 'trainOrgName',
+        key: 'trainOrgName',
+        elipsis: true,
+        align: "center",
+        width: 200,
+      },
       {
         title: '计划费用 ',
         dataIndex: 'expense',

src/views/lecturer/LecturerFeeStatistics.vue

@@ -349,7 +349,7 @@ export default {
     //讲师信息弹窗
     const handleModify = (record) => {
       state.teacherdialog = true;
-      state.teacherdialogtitle = '讲师费月度统计详情'
+      state.teacherdialogtitle = '月度统计详情'
       TeacherSystem()
     }
     const TrainOrglist = ref([
@@ -357,13 +357,14 @@ export default {
     //获取培训发生组织
     const TrainOrglista = () => {
       getTrainOrg().then((res) => {
+        console.log(res,'ressss')
         if (res.data.code === 200) {
-          let arr = res.data.data;
+          let arr = res.data.data.records;
           let array = [];
-          arr.map((value) => {
+          arr?.map((value) => {
             let obj = {
               value: value.id,
-                label: value.name,
+              label: value.affiliationName,
             };
             array.push(obj);
           });
@@ -382,12 +383,12 @@ export default {
       // console.log('getOrganizationList')
       getOrganization().then((res) => {
         if (res.data.code === 200) {
-          let arr = res.data.data;
+          let arr = res.data.data.records;
           let array = [];
-          arr.map((value) => {
+          arr?.map((value) => {
             let obj = {
-              value: value.departId,
-              label: value.orgName,
+              value: value.affiliationCode,
+              label: value.affiliationName,
             };
             array.push(obj);
           });

src/views/lecturer/MonthlyStatistics.vue

@@ -26,7 +26,7 @@
                   v-on:keydown.enter="enterPressHadlerSearch"/>
           </a-form-item>
           <a-form-item class="select " >
-            <a-tree-select style="width: 230px"
+            <!-- <a-tree-select style="width: 230px"
 								:fieldNames="{
 									children: 'children',
 									label: 'name',
@@ -41,7 +41,10 @@
 								tree-default-expand-all
 								:tree-data="sysTypeOptions"
                 v-on:keydown.enter="enterPressHadlerSearch">
-							</a-tree-select>
+							</a-tree-select> -->
+            <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.courseTypeId"
+                :options="getOrganizationList">
+              </a-select>
           </a-form-item>
           <div style="display: flex; margin-bottom: 20px">
             <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
@@ -183,7 +186,7 @@ export default {
         payrollPlaceId: null,
         departId: null,
         summaryDate:null,
-        id: '2',
+        id: route.query.id,
         trainOrgId: '',
       },
       name:null,
@@ -228,7 +231,7 @@ export default {
         scopedSlots: { customRender: "teacherOrg" },
       },
       {
-        title: '讲师发薪地 ',
+        title: '发薪地',
         dataIndex: 'trainOrgName',
         key: 'trainOrgName',
         elipsis: true,
@@ -251,6 +254,14 @@ export default {
         align: "center",
         width: 200,
       },
+      {
+        title: '开发课程时长 ',
+        dataIndex: 'expense',
+        key: 'expense',
+        elipsis: true,
+        align: "center",
+        width: 200,
+      },
       {
         title: '计划费用 ',
         dataIndex: 'expense',
@@ -290,6 +301,7 @@ export default {
     //获取讲师发薪地列表
     const PlaceOfPayLista = () => {
       getPayRollPlace().then((res) => {
+        
         if (res.data.code === 200) {
           let arr = res.data.data;
           let array = [];
@@ -328,12 +340,12 @@ export default {
       // console.log('getOrganizationList')
       getOrganization().then((res) => {
         if (res.data.code === 200) {
-          let arr = res.data.data;
+          let arr = res.data.data.records;
           let array = [];
-          arr.map((value) => {
+          arr?.map((value) => {
             let obj = {
-              value: value.departId,
-              label: value.orgName,
+              value: value.affiliationCode,
+              label: value.affiliationName,
             };
             array.push(obj);
           });
@@ -341,7 +353,7 @@ export default {
         }
       })
     }
-    // getOrganizationLista()
+    getOrganizationLista()
     //表格内查看数据操作
     const handleLook = (record) => {
       state.drawer={
@@ -378,11 +390,13 @@ export default {
      const searchReset = () => {
         state.searchParam = { 
           pageNo: "1",
-        pageSize: "10",
-        name : null,
-        payrollPlaceId: null,
-        departId: null,
-        summaryDate:null,
+          pageSize: "10",
+          id: route.query.id,
+          name : '',
+          payrollPlaceId: null,
+          departId: '',
+          summaryDate:'',
+          trainOrgId: '',
         };
         getTableDate();
       };

src/views/lecturer/Organization.vue

@@ -36,10 +36,10 @@
             <template v-if="column.key === 'operation'">
               <a-space >
                 <lockLecturer :id="record.id" :title="'培训发生组织详情'">
-                    <div style="color: #1890ff;">查看</div>
+                    <div style="color: #1890ff;cursor: pointer;">查看</div>
                 </lockLecturer>
-                <a-button type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
-                <a-button type="link" @click="() => updateModal(record)">撤回</a-button>
+                <a-button v-if="record.status!=2" type="link" @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
+                <a-button v-if="record.status==2" type="link" @click="() => updateModal(record)">撤回</a-button>
                 <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
               </a-space>
             </template>
@@ -349,8 +349,8 @@ export default{
       },
       {
         title: '状态',
-        dataIndex: 'type',
-        key: 'type',
+        dataIndex: 'status',
+        key: 'status',
         ellipsis: true, align: "center",
         width: 160,
         customRender: ({text})=>{
@@ -360,9 +360,11 @@ export default{
             case '2':
               return <span>审核中</span>;
             case '3':
-              return <span>已完成</span>;
+              return <span>审核通过</span>;
             case '4':
-              return <span style={{ color: "red" }}>审核失败</span>;
+              return <span>拒绝</span>;
+            case '5':
+              return <span>撤回</span>;
             default:
               return <span>-</span>;
           }