From cad23a159909e0651cc4c6e6adc28adf30c30974 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Wed, 8 Jan 2025 11:50:21 +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/api/Lecturer.js                        |   4 +-
 src/assets/icon.png                        | Bin 0 -> 5972 bytes
 src/assets/iconnot.png                     | Bin 0 -> 5618 bytes
 src/components/project/AddOrgContent.vue   |  11 ++++-
 src/components/project/ConfirmLecturer.vue |  53 +++++++++++++++++----
 src/views/lecturer/MonthlyStatistics.vue   |  38 +++++++++++++--
 src/views/lecturer/Organization.vue        |   2 +-
 7 files changed, 92 insertions(+), 16 deletions(-)
 create mode 100644 src/assets/icon.png
 create mode 100644 src/assets/iconnot.png

diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js
index 24ae116e..ffe4cebc 100644
--- a/src/api/Lecturer.js
+++ b/src/api/Lecturer.js
@@ -56,7 +56,7 @@ export const getUserList = (keyword) => http.get(`/admin/thirdApi/user/list?page
 //查询弹框选择的组织信息
 export const getSelectOrg = (id) => http.get(`/admin/affiliation/getSelectOrg?id=${id}`)
 //查询弹框不可选择组织（审核中的组织）
-export const getUnSelectOrg = () => http.get(`/admin/affiliation/getUnSelectOrg`)
+export const getUnSelectOrg = (isParent) => http.get(`/admin/affiliation/getUnSelectOrg?isParent=${isParent}`)
 //获取培训发生组织编号
 export const getAffiliationCode = () => http.get('/admin/affiliation/getAffiliationCode')
 //查看或编辑回显培训发生组织
@@ -79,6 +79,8 @@ export const affiliatIsConfirm = (id) => http.post(`/admin/affiliation/isConfirm
 export const expenseSummaryById = (obj) => http.get( `/admin/expenseSummary/queryById?id=${obj.id}&name=${obj.name}&trainOrgId=${obj.trainOrgId||''}&pageNo=${obj.pageNo}&pageSize=${obj.pageSize}`)
 //撤回讲师费统计详情
 export const removeBySummaryId = (obj) => http.post(`/admin/expenseSummary/removeBySummaryId?summaryId=${obj.summaryId}`,obj)
+//撤回讲师费统计详情二级页面
+export const removeBySummaryDetailId = (obj) => http.post(`/admin/expenseSummary/removeBySummaryDetailId?detailId=${obj.detailId}`,obj)
 //查看月度讲师费详情
 export const queryDetailId = (obj) => http.get(`/admin/expenseSummary/queryDetailId?summaryId=${obj.summaryId}&name=${obj.name}&startTime=${obj.startTime}&endTime=${obj.endTime}`)
 //查询未汇总的数据（批量确认弹框）
diff --git a/src/assets/icon.png b/src/assets/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d9a512011d00a3ca6abaf4731858aca17a4944a
GIT binary patch
literal 5972
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
Uj!0FaOb&RUqN7}@X!+{@0ZorclK=n!

literal 0
HcmV?d00001

diff --git a/src/assets/iconnot.png b/src/assets/iconnot.png
new file mode 100644
index 0000000000000000000000000000000000000000..c492aef5fa7162240bd6261f48717e2a63658db0
GIT binary patch
literal 5618
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
AcmMzZ

literal 0
HcmV?d00001

diff --git a/src/components/project/AddOrgContent.vue b/src/components/project/AddOrgContent.vue
index 8fffb02f..d5769b02 100644
--- a/src/components/project/AddOrgContent.vue
+++ b/src/components/project/AddOrgContent.vue
@@ -77,6 +77,10 @@ import * as lecturerApi from "@/api/Lecturer.js";
     AddContentList:{
       type:Array,
       default: ()=>[],
+    },
+    isParent:{
+      type:String,
+      default: '',
     }
   })
   const emit = defineEmits({})
@@ -119,7 +123,7 @@ import * as lecturerApi from "@/api/Lecturer.js";
   });
   const notLists = ref([])
   const getNot = () => {
-    lecturerApi.getUnSelectOrg().then(res=>{
+    lecturerApi.getUnSelectOrg(props.isParent).then(res=>{
       if(res.data.code == 200){
         notLists.value = res.data.data
       }
@@ -144,7 +148,10 @@ import * as lecturerApi from "@/api/Lecturer.js";
   const onCheck = async (checkedKey, {checked: bool, checkedNodes, node, event}) => {
     // "965356037047586816"
     let length = treeAddData.value.length
-    if(checkedNodes.length > length){
+    const checkedNodeIds = checkedNodes.map(item => item.id);
+    const treeAddDataOrgIds = treeAddData.value.map(item => item.orgId);
+    const combinedUniqueIds = [...new Set([...checkedNodeIds, ...treeAddDataOrgIds])];
+    if(combinedUniqueIds.length > length){
       await lecturerApi.getSelectOrg(node.id).then(res=>{
         const targetNode = checkedNodes.find(item=>item.id == res?.data?.data[0]?.orgId)
         if(targetNode){
diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue
index 1231e3c4..474fdd67 100644
--- a/src/components/project/ConfirmLecturer.vue
+++ b/src/components/project/ConfirmLecturer.vue
@@ -27,6 +27,7 @@
               <div class="org" :title="item?.trainOrgName">{{item?.trainOrgName||'-'}}</div>
               <div class="text org" :title="Number(item?.summaryTotal).toFixed(2)">{{item?.summaryTotal?Number(item?.summaryTotal).toFixed(2)+'元':'-'}}</div>
             </div>
+            <div class="icon" :class="activeList.includes(item.trainOrgId)?'active':'not'" @click.stop="setList(item)"></div>
           </div>
         </div>
         <div class="box">
@@ -140,16 +141,16 @@ const handleConfirm = () => {
   // }
   // numTime.value+=1
   // localStorage.setItem('numTime',numTime.value)
-  const ids = forData.value.flatMap(item => item.expenseList.map(item => item.id));
+  // const ids = forData.value.flatMap(item => item.expenseList.map(item => item.id));
   // let ids = []
   // if(searchTrue.value){
   //   ids = timesList.value.map(item=>item.id)
   // }else{
   //   ids = expenseList.value.map(item=>item.id)
   // }
-  if(!ids.length){
-    return message.error('暂无可提交的数据')
-  }
+  // if(!ids.length){
+  //   return message.error('暂无可提交的数据')
+  // }
   modalVisible.value = false;
   emit('example',true)
   api.teacherExpenseConfirm({ids:ids?.join(',')}).then(res=>{
@@ -218,6 +219,7 @@ watch(()=>props.visible,(val)=>{
     nameUserNo.value = null
     dateValue.value = null
     indexList.value = 0
+    activeList.value = []
     drawerContent.value?.$el.querySelector('.ant-table-body')?.scrollTo({top:0,behavior: 'smooth'})
   }
 })
@@ -482,8 +484,20 @@ const columns = [
   },
 ]
 const closeDrawer = () => emit("update:visible", false);
+const activeList = ref([])
+const setList = (item) => {
+  const index = activeList.value.findIndex(listItem => listItem === item.trainOrgId);
+  if (index > -1) {
+    activeList.value.splice(index, 1);
+  } else {
+    activeList.value.push(item.trainOrgId);
+  }
+}
 const qureyDrawer = () => {
-  const ids = forData.value.flatMap(item => item.expenseList.map(item => item.id));
+  const filterList = forData.value.filter(item=>{
+    return activeList.value.includes(item.trainOrgId)
+  })
+  const ids = filterList?.flatMap(item => item.expenseList?.map(item => item.id));
   // let ids = []
   // if(searchTrue.value){
   //   ids = timesList.value.map(item=>item.id)
@@ -493,7 +507,6 @@ const qureyDrawer = () => {
   if(!ids.length){
     return message.error('暂无可提交的数据')
   }
-  console.log(ids,'idssssss')
   dialog({
     content: '是否确认讲师费信息无误？提交后按“培训发生组织”汇总至审批中心，等待验证后“提交”进入审批流程。',
     ok: () => {
@@ -515,7 +528,11 @@ const qureyDrawer = () => {
   })
 }
 const config = () => {
-  if(!expenseList.value.length){
+  const filterList = forData.value.filter(item=>{
+    return activeList.value.includes(item.trainOrgId)
+  })
+  const ids = filterList?.flatMap(item => item.expenseList?.map(item => item.id));
+  if(!ids.length){
     message.error('暂无可提交的数据')
     return
   }
@@ -679,7 +696,7 @@ const config = () => {
       justify-content: space-between;
       align-items: center;
       // background-color: red;
-      margin-bottom: 20px;
+      // margin-bottom: 20px;
 
       .headerTitle {
         margin: 24px 0;
@@ -696,6 +713,7 @@ const config = () => {
         display: flex;
         align-items: center;
         overflow-x: auto;
+        padding-top: 20px;
         .list{
           display: flex;
           align-items: center;
@@ -706,6 +724,25 @@ const config = () => {
           border-radius:6px;
           margin-right: 20px;
           margin-bottom: 20px;
+          position: relative;
+          .icon{
+            position: absolute;
+            right: -10px;
+            top: -10px;
+            width:24px;
+            height:24px;
+            cursor: pointer;
+            // background: url('@/assets/icon.png') no-repeat;
+            // background-size: 100% 100%;
+          }
+          .active{
+            background: url('@/assets/icon.png') no-repeat;
+            background-size: 100% 100%;
+          }
+          .not{
+            background: url('@/assets/iconnot.png') no-repeat;
+            background-size: 100% 100%;
+          }
           .left{
             width: 35%;
             min-width: 86px;
diff --git a/src/views/lecturer/MonthlyStatistics.vue b/src/views/lecturer/MonthlyStatistics.vue
index 5ba7f779..8ca19765 100644
--- a/src/views/lecturer/MonthlyStatistics.vue
+++ b/src/views/lecturer/MonthlyStatistics.vue
@@ -133,7 +133,8 @@
 </a-form>
 <!-- <span>讲师费发放情况</span> -->
 <a-table :columns="column"  :scroll="{ x: '1000' }" :data-source="tableDatas" :loading="tableLoadings" :pagination="false">
-            <template #bodyCell="{ record, column }">
+            <template #action="{ record, column }">
+              <a-button type="link" @click="handleDetail(record)">撤回</a-button>
             </template>
           </a-table>
   <!-- <div :style="{
@@ -163,7 +164,7 @@ import { useRouter,useRoute } from "vue-router";
 import {
     UploadOutlined,
   } from '@ant-design/icons-vue';
-  import { getPayRollPlace,expenseSummaryById ,removeBySummaryId,queryDetailId} from "../../api/Lecturer";
+  import { getPayRollPlace,expenseSummaryById ,removeBySummaryId,removeBySummaryDetailId,queryDetailId} from "../../api/Lecturer";
   import { getOrganization } from "../../api/Teaching";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import {queryTeacherFeeMonthly} from "../../api/lecturerFeeStatistics";
@@ -457,7 +458,6 @@ export default {
       searchSubmitdrawer()
     }
     const handleLess = (record) => {
-      console.log(record,'record')
       dialog({
         content: '是否确认撤回 ?',
         ok:()=>{
@@ -475,6 +475,26 @@ export default {
         }
       })
     }
+    const handleDetail = (record) => {
+      dialog({
+        content: '是否确认撤回 ?',
+        ok:()=>{
+          removeBySummaryDetailId({detailId:record.detailId}).then(res=>{
+            if(res.data.code == 200){
+              message.success('撤回成功')
+              emits.emit('tableList',true)
+              searchSubmit()
+              searchSubmitdrawer()
+            }else{
+              message.error(res.data.msg)
+            }
+          }).catch(err=>{
+            message.destroy()
+            message.error(err.data.msg)
+          })
+        }
+      })
+    }
     const searchTimeChange = (e) => {
       console.log(e,'eeeee')
       if(e){
@@ -687,7 +707,16 @@ export default {
           return text ? text+'元' : '-'
         }
       },
-   
+      {
+        title: '操作 ',
+        dataIndex: 'operation',
+        key: 'operation',
+        ellipsis: true,
+        align: "center",
+        fixed: "right",
+        width: 100,
+        slots: { customRender: "action" },
+      },
     ])
          //取消按钮 清空输入的数据
       const cancelTeachingDialog = () => {
@@ -720,6 +749,7 @@ export default {
       handleFeeMonthly,
       handleLook,
       handleLess,
+      handleDetail,
       changePagination,
       pagination,
       searchTimeChange,
diff --git a/src/views/lecturer/Organization.vue b/src/views/lecturer/Organization.vue
index 2879031e..3d5cf2a0 100644
--- a/src/views/lecturer/Organization.vue
+++ b/src/views/lecturer/Organization.vue
@@ -293,7 +293,7 @@
       </div>
     </div>
     </a-drawer>
-    <AddOrgContent :Addtitle="'选择组织'" v-model:showContent="showContent" v-model:AddContentList="formParam.affiliationOrgList" />
+    <AddOrgContent :Addtitle="'选择组织'" :isParent="formParam.isParent" v-model:showContent="showContent" v-model:AddContentList="formParam.affiliationOrgList" />
         </div>
 </template>
 <script lang="jsx">