From fab939d39f98e90eea1ec55ad52462439cfc739b Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 18 Nov 2024 20:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/InsideTeaching.vue   | 35 ++++++++++++++++++-------
 src/views/lecturer/LecturerAPPEdit.vue  | 12 ++++-----
 src/views/lecturer/LecturerApproval.vue | 21 +++++++++------
 src/views/lecturer/LecturerFee.vue      |  8 +++++-
 4 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 58270930..4ee29bf8 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -141,7 +141,7 @@
             <template v-if="column.key === 'operation'">
               <a-space>
                 <a-button type="link"    @click="() => handleLook(record, String(record.courseform))">查看</a-button>
-                <a-button type="link" @click="() => handleModify(record, String(record.courseform))"   v-if="record.createFrom == 1 && record.courseStatus == 0 ">编辑 </a-button>
+                <a-button type="link" @click="() => handleModify(record, String(record.courseform))" v-if="record.createFrom == 1 && record.courseStatus == 0 ">编辑 </a-button>
                 <a-button type="link" v-if="record.createFrom == 1 &&record.isSuperPermission==='true'" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
                 <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->
               </a-space>
@@ -165,7 +165,7 @@
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="讲师名称" name="name">
-                <SearchTeacher @tlevel="tlevelChange" v-model:value="formParam.name" v-model:lable="formParam.orgNames"
+                <SearchTeacher @tlevel="tlevelChange" v-model:value="formParam.name" v-model:lable="formParam.orgNames" v-model:id="formParam.teacherId"
                 v-model:system="tSystemNames" v-model:level="formParam.tlevelId"></SearchTeacher>
             </a-form-item>
           </a-col>
@@ -233,6 +233,14 @@
         </a-row>
         <!-- 授课日期 teachingDate     开课状态 courseStatus -->
         <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="课程归属组织" name="sourceBelongId">
+              <OrgClass
+                v-model:value="formParam.sourceBelongId"
+                v-model:name="formParam.sourceBelongFullName"
+              ></OrgClass>
+            </a-form-item>
+          </a-col>
           <a-col :span="12">
             <a-form-item label="授课/课程日期 :" name="teachingDate">
               <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD HH:mm" :show-time="{ format: 'HH:mm' }"
@@ -240,6 +248,9 @@
                 placeholder="请选择课程日期"  />
             </a-form-item>
           </a-col>
+        </a-row>
+        <!-- 授课时长 teaching  评分 score-->
+        <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="开课状态">
               <a-radio-group v-model:value="formParam.courseStatus" class="draitem">
@@ -248,9 +259,6 @@
               </a-radio-group>
             </a-form-item>
           </a-col>
-        </a-row>
-        <!-- 授课时长 teaching  评分 score-->
-        <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="授课时长" name="teaching">
               <a-input v-model:value="formParam.teaching" style="width:80%; height: 40px; border-radius: 8px ; "
@@ -263,6 +271,9 @@
               <span style="margin-left: 5px ;" v-if="formParam.teaching == null">0.00小时</span>
             </a-form-item>
           </a-col>
+        </a-row>
+        <!-- 参训人数 studys-->
+        <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="评分" name="score">
               <!-- <a-input class="draitem" v-model:value="formParam.score"  @blur="clearscoreNumber" placeholder="" allowClear showSearch>
@@ -271,10 +282,7 @@
               style="width:100%; height: 40px; border-radius: 8px ; " />
             </a-form-item>
           </a-col>
-        </a-row>
-        <!-- 参训人数 studys-->
-        <a-row :gutter="16">
-          <a-col :span="24">
+          <a-col :span="12">
             <a-form-item label="参训人数" name="studys">
               <a-input v-model:value="formParam.studys" class="draitem" placeholder="0 "   :maxLength="8"
               @blur="clearstudysNumber" allowClear showSearch>
@@ -420,6 +428,7 @@ import ImportWork from "../../components/lecturer/ImportWork.vue";
 import { fileUp } from "../../api/Lecturer";
 import SearchTeacher from "@/components/project/SearchTeacher";
 import { useStore } from "vuex";
+import OrgClass from "@/components/project/OrgClass";
 export default {
   name: "InsideTeaching",
   components: {
@@ -436,6 +445,7 @@ export default {
     UploadOutlined,//图标--导出
     DownloadOutlined,//图标-导入
     FolderAddOutlined,//图标--新增
+    OrgClass,
   },
   setup() {
     onMounted(() => {
@@ -485,7 +495,9 @@ export default {
         teaching: null,
         name:null,
         teacherName: null,
-        teachingDate:null
+        teachingDate:null,
+        sourceBelongId: null,
+        sourceBelongFullName:null,
       },
       startTime:null,
       searchParam: 
@@ -789,6 +801,7 @@ export default {
       // tsystemName: [{ required: true, message: '',log:'讲师体系不能为空' }],
       courseTypeId: [{ required: true, message: '',log:'内容分类不能为空' }],
       courseName: [{ required: true, message: '',log:'课程名称不能为空' }],
+      sourceBelongId: [{ required: true, message: '',log:'课程归属组织不能为空' }],
       teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }],
       teaching: [{ required: true, message:'',log: '授课时长不能为空' }],
       courseStatus: [{ required: true, message: '',log:'开课状态不能为空' }],
@@ -1010,6 +1023,8 @@ export default {
         score: null,
         type: null,
         remark: null,
+        sourceBelongId:null,
+        sourceBelongFullName:null,
         offcourseId: null,
         createFrom: null,
         teachingDate:null,
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index adac49f9..00889a08 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -15,12 +15,12 @@
       </div>
       <div class="desc">
         <a-descriptions :column="2" bordered>
-          <a-descriptions-item label="培训发生组织编号">{{formData?.code||'-'}}</a-descriptions-item>
+          <a-descriptions-item label="审批编号">{{formData?.code||'-'}}</a-descriptions-item>
           <a-descriptions-item label="培训发生组名称">{{formData?.trainOrgName||'-'}}</a-descriptions-item>
-          <a-descriptions-item label="是否为根节点">{{formData?.isParent==1?'否':'是'}}</a-descriptions-item>
-          <a-descriptions-item label="组织担当">{{formData?.act||'-'}}</a-descriptions-item>
+          <a-descriptions-item label="提交时间">{{formData?.summaryTime||'-'}}</a-descriptions-item>
+          <a-descriptions-item label="汇总金额">{{formData?.summaryTotal||'-'}}</a-descriptions-item>
           <a-descriptions-item label="状态">
-            {{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'审核拒绝'}[formData?.status]}}
+            {{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'审核拒绝',5:'待提交'}[formData?.status]}}
           </a-descriptions-item>
         </a-descriptions>
       </div>
@@ -613,7 +613,7 @@ export default {
         return
       }
       state.teacherdialog = true
-      getTeacherFeeDetail({id : record.id||168}).then((res) => {
+      getTeacherFeeDetail({id : record.id}).then((res) => {
         state.formParam=res.data.data
         state.formParam.courseType = String(res.data.data.courseType)
         state.formParam.levelPay = String(res.data.data.levelPay)
@@ -637,7 +637,7 @@ export default {
         content: '确定要移除此条数据吗？',
         ok: () => {
           withdrawRecord({
-            billId: 0,
+            billId: route.query.id,
 	          ids: [record.id]
           }).then(res=>{
             message.success('移除成功')
diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue
index c3ac51b6..15fd40de 100644
--- a/src/views/lecturer/LecturerApproval.vue
+++ b/src/views/lecturer/LecturerApproval.vue
@@ -125,12 +125,12 @@
 <span class="line"></span>
 <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?.trainOrgName}}</a-descriptions-item>
-    <a-descriptions-item v-if="activeKey==2" label="汇总周期" >{{formParam?.summaryDate}}</a-descriptions-item>
-    <a-descriptions-item label="提交时间">{{formParam?.summaryTime}}</a-descriptions-item>
-    <a-descriptions-item label="汇总金额">{{formParam?.summaryTotal}}</a-descriptions-item>
-    <a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'审核通过', 4:'拒绝',5:'撤回'}[formParam?.status]}}</a-descriptions-item>
+    <a-descriptions-item label="审批编号">{{formParam?.teacherName||'-'}}</a-descriptions-item>
+    <a-descriptions-item label="培训发生组织">{{formParam?.trainOrgName||'-'}}</a-descriptions-item>
+    <a-descriptions-item v-if="activeKey==2" label="汇总周期" >{{formParam?.summaryDate||'-'}}</a-descriptions-item>
+    <a-descriptions-item label="提交时间">{{formParam?.summaryTime||'-'}}</a-descriptions-item>
+    <a-descriptions-item label="汇总金额">{{formParam?.summaryTotal||'-'}}</a-descriptions-item>
+    <a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
   </a-descriptions>
   <!-- <span>审批详情</span> -->
   <span class="line" style="margin-top:12px;"></span>
@@ -464,7 +464,7 @@
               case 4:
                 return "审核拒绝"
               case 5:
-                return "撤回"
+                return "待提交"
               default:
                 return "-"
             }
@@ -687,6 +687,7 @@
       }
       const tableDataExamine = ref([])
       const gettableDataExamine = () => {
+        state.examinetableLoading = true
         queryExpnseByBillId({
           billId : state.id,
           pageNo: state.tableDataParams.pageNo,
@@ -697,7 +698,11 @@
         }).then((res) => {
           tableDataExamine.value = res.data.data.records
           state.tableDataParams.total = Number(res.data.data.total);
-        }) 
+          state.examinetableLoading = false
+        }).catch(err=>{
+          state.examinetableLoading = false
+          message.error(err.data.msg)
+        })
       };
       const pagination = computed(() => ({
         total: state.tableDataParams.total,
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index fcd45f6a..351da683 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -410,7 +410,7 @@
     <a-descriptions-item label="计划费用  ">{{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="状态">{{formParam.status=="0"?'待确认' :formParam.status=="1"?'待提交':formParam.status== "2" ?'审核中':formParam.status== "3"?'审核通过':'-'}}</a-descriptions-item>
+    <a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
     <a-descriptions-item label="备注  ">{{formParam.remark || '-'}}</a-descriptions-item>
   </a-descriptions>
   <div style="margin-bottom: 20px;">
@@ -671,6 +671,8 @@ getAllLevelList().then((res) => {
         { value:"1", label: "待提交", },
         { value:"2", label: "审核中", },
         { value:"3", label: "审核通过", },
+        { value:"4", label: "审核拒绝", },
+        { value:"5", label: "待提交", },
       ])
       watch(()=>state.formParam.name,(val)=>{
         state.formParam.userNo = val?.split('/')[1]
@@ -851,6 +853,8 @@ getAllLevelList().then((res) => {
                     "1": "待提交",
                     "2": "审核中",
                     "3": "审核通过",
+                    '4': '审核拒绝',
+                    '5': '待提交',
                   }[value.record.status + ""] || ""
                   : "-"}
               </div>
@@ -1437,6 +1441,8 @@ const column = ref([
                     "1": "待提交",
                     "2": "审核中",
                     "3": "审核通过",
+                    '4': '审核拒绝',
+                    '5': '待提交',
                   }[value.record.status + ""] || ""
                   : "-"}
               </div>