所属组织页面调整

src/views/lecturer/LecturerApproval.vue

@@ -117,22 +117,21 @@
 <span>讲师费用详情</span>
 <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
     <a-descriptions-item label="讲师名称">{{formParam.teacherName}}</a-descriptions-item>
-    <a-descriptions-item label="讲师工号">{{formParam.teacherId
-}}</a-descriptions-item>
-    <a-descriptions-item label="讲师组织" :span="2">{{formParam.departId}}</a-descriptions-item>
-    <a-descriptions-item label="讲师体系">{{formParam.systemId}}</a-descriptions-item>
-    <a-descriptions-item label="讲师级别">{{formParam.levelId }}</a-descriptions-item>
+    <a-descriptions-item label="讲师工号">{{formParam.teacherNo}}</a-descriptions-item>
+    <a-descriptions-item label="讲师组织" :span="2">{{formParam.teacherOrg}}</a-descriptions-item>
+    <a-descriptions-item label="讲师体系">{{formParam.systemName}}</a-descriptions-item>
+    <a-descriptions-item label="讲师级别">{{formParam.levelName }}</a-descriptions-item>
     <a-descriptions-item label="发薪地">{{formParam.teacherpayrollPlace}}</a-descriptions-item>
     <a-descriptions-item label="费用类型">"费用类型(未命名)"</a-descriptions-item>
-    <a-descriptions-item label="课程类型">{{formParam.type==1?'项目开课' :formParam.type==2 ?'路径开课':formParam.type==3 ?'面授开课':''}}</a-descriptions-item>
-    <a-descriptions-item label="课程名称">{{formParam.name}}</a-descriptions-item>
-    <a-descriptions-item label="授课时长  ">{{formParam.duration}}</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.teachingTime}}</a-descriptions-item>
     <a-descriptions-item label="授课/课程日期  ">{{formParam.teachingDate}}</a-descriptions-item>
     <a-descriptions-item label="参训人数  ">{{formParam.studys}}</a-descriptions-item>
     <a-descriptions-item label="评分  ">{{formParam.score}}</a-descriptions-item>
     <a-descriptions-item label="课酬基准  ">{{formParam.teacherlevelPay}}</a-descriptions-item>
     <a-descriptions-item label="计划费用  ">{{formParam.expense}}</a-descriptions-item>
-    <a-descriptions-item label="应发费用  ">"应发费用(未命名)"</a-descriptions-item>
+    <a-descriptions-item label="应发费用  ">{{formParam.payableExpense}}</a-descriptions-item>
 
     <a-descriptions-item label="状态">{{formParam.status=="A10"?'待审核' :formParam.status=="A20"?'已提交':formParam.status== "A30" ?'审核中':formParam.status== "E10" ?'审核打回':formParam.status=="S20"?'审核通过':''}}</a-descriptions-item>
     <a-descriptions-item label="备注  ">{{formParam.remark}}</a-descriptions-item>
@@ -176,13 +175,13 @@
               </div>
                 <a-form style="margin-left:20px; margin-top:10px ">
                   <a-form-item label="审批" >
-                      <a-radio-group v-model:value="formParamstatues.shenpi">
-                  <a-radio value="0">同意</a-radio>
-                  <a-radio value="1">拒绝</a-radio>
+                      <a-radio-group v-model:value="formParamstatues.status">
+                  <a-radio value="S20">同意</a-radio>
+                  <a-radio value="E10">拒绝</a-radio>
                 </a-radio-group>
                   </a-form-item>
                   <a-form-item label="备注">
-                    <a-textarea v-model:value="formParam.remark" 
+                    <a-textarea v-model:value="formParamstatues.remark" 
                   style="width: 90%; height: 100px; border-radius: 8px ;"  placeholder="一旦拒绝 备注变为必填" />
                   </a-form-item>
                 </a-form>
@@ -214,7 +213,8 @@
   } from '@ant-design/icons-vue';
   import ProjectManager from "@/components/project/ProjectManagerNew";
   import {getPayRollPlace} from "../../api/Lecturer";
-  import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,updateStatusWithDraw,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement";import { getTeacherExpertise,getTeacherSystemList } from "../../api/Lecturer";
+  import {getTeacherFeeList,getTeacherFeeDetail,getTeacherFeeApprovalList ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement";
+  import { getTeacherExpertise,getTeacherSystemList } from "../../api/Lecturer";
   // lecturerFeeManagement
   // import {getProjSt} from "../../api/indexProjStu";
   // import AddTeacher from "../../components/drawers/project/AddTeacher"
@@ -257,7 +257,9 @@
           defaultTeachingTime:"0",
         },
         formParamstatues:{
-          shenpi:'0'
+          status:'S20',
+          remark: null,
+          kid:null,
         },
         searchParam: {
           teacherNo:null,
@@ -312,8 +314,8 @@
             let array = [];
             arr.map((value) => {
               let obj = {
-                value: value.id,
-                label: value.name,
+                value: value.kid,
+              label: value.systemName,
               };
               array.push(obj);
             });
@@ -592,8 +594,6 @@
       ])
       //列表数据
       const tableData = ref([
-  
-  
       ])
       // 搜索
       const searchSubmit = () => {
@@ -643,80 +643,18 @@
         state.teacherdialogtitle = '添加讲师费'
         
       }
-      //修改讲师费信息弹窗
-      const handleModify = (record) => {
-        state.teacherdialog1 = 0
-        state.teachingdialog = true;
-        state.teacherdialogtitle = '修改信息'
-        state.kid= record.kid
-        TeacherSystem()
-      }
-      //保存
-      const createTeacherDialog = () => {
-        state.formParam.teachingDate= state.formParam.teachingDate!==null? dayjs(new Date(state.formParam.teachingDate).getTime()).format("YYYY-MM-DD"): "",
-        console.log(state.formParam);
-        if (state.formParam.kid != undefined) {
-          updateTeacherFee (state.formParam).then(response => {
-                              message.success("修改成功");
-                          });
-                      }
-        else {
-        addTeacherFee(state.formParam)
-          .then((res) => {
-            message.success("保存成功");
-        }).catch((err) => {
-            console.log(err);
-          });
-         }
-         state.teachingdialog = false;
-         getTableDate();
-      };
-      //删除弹窗
-      // const deleteModal = (record) => {
-      //   state.deleteInTeacherdialog = true
-      //   state.delTeacherId = record.id 
-      // };
       //修改状态窗口
       const handleOperate = (record) => {
-        state.handleOperate1=null
-          state.handleOperate1 = record.status
         state.editTeacher = true
-        state.kid= record.kid
+        state.formParamstatues.kid= record.kid
       };
-      // //确认删除
-      // const closeDeleteTeacher=()=>{
-      //   //调用删除接口
-      //   deleteInTeacher(state.delTeacherId).then((res)=>{
-      //     if(res.data.code == 200 ){
-      //       // message.success("删除成功");
-      //       state.deleteInTeacherdialog = false
-      //       getTableDate();
-      //     }
-      //   })
-      // } 
-      //提交撤回状态
+      //提交
       const closehandleOperate= ()=>{
-         //调用接口
-         let ids ={
-        kid : state.kid
-      } 
-      console.log( state.handleOperate1)
-      console.log( state.handleOperate1 === 'A10');
-      if ( state.handleOperate1 === 'A10'){
-        updateStatusSubmit(ids).then((res) => {
-              message.success("提交成功");
-              state.editTeacher = false
-             getTableDate();
-             console.log(111);
-          })
-        }
-        else if( state.handleOperate1 === 'A20'){
-          updateStatusWithDraw(ids).then((res) => {
-              message.success("撤回成功");
+          approveTeacherFee(state.formParamstatues).then((res) => {
+              message.success("审批成功");
               state.editTeacher = false
              getTableDate();
           })
-        }
       }
       //取消按钮 清空输入的数据
       const cancelTeachingDialog = () => {
@@ -727,7 +665,6 @@
        }
          state.deleteInTeacherdialog = false 
          state.editTeacher = false 
-         state.tagsshow= 1
       };
   
       //清空数据
@@ -756,6 +693,7 @@
         state.teachingdialog = true;
         state.kid= record.kid
         TeacherSystem()
+        gettableDataExamine( )
       }
       
       //详情
@@ -771,6 +709,12 @@
       }
       const tableDataExamine = ref([
   ])
+   const gettableDataExamine = () => {
+        getTeacherFeeApprovalList({kid : state.kid})
+          .then((res) => {
+            tableDataExamine.value = res.data.data.records
+        }) 
+      };
       //二级页面
       const columnsExamine = ref([
       {
@@ -817,23 +761,6 @@
           width: 120,
         },
       ])
-      const rules = {
-        name: [{ required: true, message: '讲师不能为空' }],
-        user: [{ required: true, message: '讲师工号不能为空' }],
-        departId: [{ required: true, message: '讲师组织不能为空' }],
-        systemId: [{ required: true, message: '讲师体系不能为空' }],
-        levelId: [{ required: true, message: ' 讲师级别 不能为空' }],
-        payrollPlaceId: [{ required: true, message: '讲师发薪地 不能为空' }],
-        courseName: [{ required: true, message: '费用类型不能为空' }],
-        courseName: [{ required: true, message: '课程名称不能为空' }],
-        beginTime: [{ required: true, message: '授课日期不能为空' }],
-        defaultTeachingTime: [{ required: true, message: ' 授课时长不能为空' }],
-        studys: [{ required: true, message: ' 参训人数不能为空' }],
-        score: [{ required: true, message: ' 评分不能为空' }],
-        score: [{ required: true, message: '课酬基准 不能为空' }],
-        expense: [{ required: true, message: '计划费用不能为空' }],
-  
-      }
       //导出功能
       const handleExport = ()=>{
         window.open (
@@ -853,7 +780,8 @@
           }
       return {
         ...toRefs(state),
-        rules,handleDate,
+        gettableDataExamine,
+        handleDate,
         trainOrglist,
         trainOrglista,
         getTeacherExpertiseList,
@@ -879,10 +807,6 @@
         cancelTeachingDialog,
         handleLook,
         cancel,
-        // deleteModal,
-        handleModify,
-        // closeDeleteTeacher,
-        createTeacherDialog,
         handleOperate,
         closehandleOperate,
          getTableDate, //list接口数据调用