讲师管理bug

src/App.vue

@@ -8,7 +8,11 @@
         <bread-crumb/>
         <main>
           <a-config-provider :locale="zhCN">
-            <router-view/>
+            <router-view v-slot="{ Component }">
+              <keep-alive  :include="isInclude">
+                <component :is="Component"/>
+              </keep-alive>
+            </router-view>
           </a-config-provider>
         </main>
       </div>
@@ -19,7 +23,7 @@
   </div>
 </template>
 <script setup>
-import {ref, onMounted} from "vue";
+import {ref, onMounted,computed} from "vue";
 import {useStore, createStore} from "vuex";
 import NavLeft from "@/components/NavLeft";
 import NavTop from "@/components/NavTop";
@@ -33,7 +37,7 @@ import {USER_PERMISSION, VALIDATE_TOKEN} from "@/api/apis";
 
 const store = useStore();
 const isLogin = ref(false);
-
+const isInclude = computed(()=>store.state.isInclude)
 console.log("版本3.3.2------------");
 
 

src/api/Lecturer.js

@@ -63,6 +63,8 @@ export const getAffiliationCode = () => http.get('/admin/affiliation/getAffiliat
 export const getAffiliationById = (id) => http.get(`/admin/affiliation/queryById?id=${id}`)
 //删除培训发生组织
 export const affiliationDelById = (id)=>http.post(`/admin/affiliation/delById?id=${id}`)
+//撤回培训发生组织
+export const affiliatIsConfirm = (id) => http.post(`/admin/affiliation/isConfirm?id=${id}`)
 //讲师费统计详情
 export const expenseSummaryById = (obj) => http.get( `/admin/expenseSummary/queryById?id=${obj.id}&name=${obj.name}&trainOrgId=${obj.trainOrgId}`)
 //查看月度讲师费详情

src/components/project/lockLecturer.vue

@@ -41,7 +41,7 @@
           <a-tabs @change="change" v-model:activeKey="activeKey">
             <a-tab-pane key="1" tab="管理组织列表">
               <div style="margin-bottom: 30px">
-                <a-table :columns="columns" :data-source="formData?.tableData" />
+                <a-table :columns="columns" :data-source="formData?.tableData" :pagination="false"/>
               </div>
               <div style="margin-bottom: 100px">
                 <!-- <a-descriptions :column="2" bordered>
@@ -60,7 +60,7 @@
             </a-tab-pane>
             <a-tab-pane key="2" tab="审批记录" force-render>
               <div style="margin-bottom: 20px">
-                <a-table :columns="columnsThree" :data-source="formData?.tableDataTwo" >
+                <a-table :columns="columnsThree" :data-source="formData?.tableDataTwo" :pagination="false">
                   <template #action="{ record }">
                     <div class="action">
                       <div style="color: #1890ff;cursor: pointer;" class="btn" @click="lookList(record)">查看</div>
@@ -69,7 +69,7 @@
                 </a-table>
               </div>
               <div style="margin-bottom: 100px">
-                <a-table v-if="threeList" :columns="columnsTwo" :data-source="formData?.tableDataTwo" />
+                <a-table v-if="threeList" :columns="columnsTwo" :data-source="formData?.tableDataTwo" :pagination="false"/>
               </div>
             </a-tab-pane>
           </a-tabs>
@@ -102,16 +102,19 @@ const columns = [
     title: '组织的名称',
     dataIndex: 'orgName',
     key: 'orgName',
+    align: 'center',
   },
   {
     title: '类型',
     dataIndex: 'age',
     key: 'age',
+    align: 'center',
   },
   {
     title: '状态',
     dataIndex: 'address',
     key: 'address',
+    align: 'center',
   },
 ];
 const formData = ref({})
@@ -120,26 +123,31 @@ const columnsTwo = [
     title: '层级审批人',
     dataIndex: 'name',
     key: 'name',
+    align: 'center',
   },
   {
     title: '操作',
     dataIndex: 'age',
     key: 'age',
+    align: 'center',
   },
   {
     title: '审批人',
     dataIndex: 'address',
     key: 'age',
+    align: 'center',
   },
   {
     title: '审批时间',
     dataIndex: 'updateTime',
     key: 'updateTime',
+    align: 'center',
   },
   {
     title: '审批建议',
     dataIndex: 'address',
     key: 'age',
+    align: 'center',
   },
 ]
 const columnsThree = ref([
@@ -147,21 +155,25 @@ const columnsThree = ref([
     title: '审批提交时间',
     dataIndex: 'name',
     key: 'name',
+    align: 'center',
   },
   {
     title: '审批状态',
     dataIndex: 'age',
     key: 'age',
+    align: 'center',
   },
   {
     title: '审批人',
     dataIndex: 'address',
     key: 'age',
+    align: 'center',
   },
   {
     title: '操作',
     dataIndex: 'address',
     key:'age',
+    align: 'center',
     slots: { customRender: "action" },
   }
 ])

src/store/index.js

@@ -28,10 +28,14 @@ export default createStore({
     memberInitInfo: [],//学员默认
     sysType: [],//学员默认
     menus: [],
-    sysTypeMap:null
+    sysTypeMap:null,
+    isInclude: [],
   },
   getters: {},
   mutations: {
+    setShouInclude(state, value) {
+      state.isInclude = value;
+    },
     chengeOpenpages(state, list) {
       // console.log('list', list)
       state.openpages = list;

src/views/lecturer/InsideLecturer.vue

@@ -823,7 +823,7 @@ export default {
     ])
     // 搜索
     const searchSubmit = () => {
-     // store.commit("setShouInclude", ['lecturerlist']);
+      state.searchParam.pageNo = 1
       getTableDate();
     };
     //重置

src/views/lecturer/LecturerFee.vue

@@ -117,7 +117,8 @@
               <template v-if="column.key === 'operation'">
                 <a-space >
                   <a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
-                  <a-button type="link" :disabled="record.createFrom==1  ?false :true"  @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
+                  <!-- :disabled="record.createFrom==1  ?false :true" -->
+                  <a-button type="link"  @click="() => handleModify(record, String(record.courseform))">编辑</a-button>
                   <!-- <a-button :disabled="record.status==='A20' || record.status==='A30'||record.status==='S20'   ?true :false"  type="link" @click="() => handleOperate(record, String(record.courseform))">提交</a-button>
                   <a-button :disabled="record.status==='A10' && record.status!=='A20' || record.status==='A30'||record.status==='S20' ||record.status==='E10' ?true :false"  type="link" @click="() => handleOperate(record, String(record.courseform))">撤回</a-button> -->
                   <!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button> -->

src/views/lecturer/LecturerFeeStatistics.vue

@@ -173,6 +173,7 @@
 import { reactive, toRefs, ref, watch } from "vue";
 import { message } from "ant-design-vue";
 import dayjs from "dayjs";
+import { useStore } from "vuex";
 import { useRouter } from "vue-router";
 import { getOrganization } from "../../api/Teaching";
 import {  queryTeacherFeeMonthly, getTeacherFeeDetailListByTeacherNo, getTeacherFeeListByTeacherNo,TeacherFeeTotalList,createMonthSummary} from "../../api/lecturerFeeStatistics"
@@ -184,6 +185,7 @@ export default {
   components: {
   },
   setup() {
+    const store = useStore();
     const router = useRouter();
     const state = reactive({
       summaryDate: null,
@@ -282,6 +284,7 @@ export default {
     ])
     // 搜索
     const searchSubmit = () => {
+      state.searchParam.pageNo = 1
       getTableDate();
     };
      //修改时间

src/views/lecturer/LecturerList.vue

@@ -17,6 +17,7 @@
   import { reactive, toRefs, ref, watch } from "vue";
   import InsideLecturer from "../lecturer/InsideLecturer.vue"
   import ExternalLecturer from "../lecturer/ExternalLecturer.vue"
+  import { useStore } from 'vuex'
    export default {
     name: "LecturerList",
     components: {
@@ -24,6 +25,7 @@
       ExternalLecturer
     },
     setup() {
+      const store = useStore()
       const state = reactive({
         activeKey:'1'
       })
@@ -31,7 +33,6 @@
       )
      return {
         ...toRefs(state),
-    
       }
     },
   };

src/views/lecturer/Organization.vue

@@ -459,14 +459,14 @@ const getTableDate = (obj) => {
       dialog({
         content: '是否确认撤回 ?',
         ok: () => {
-          // lecturer.affiliationDelById(record.id).then(res=>{
-          //   console.log(res,'res')
-          //   message.success("删除成功")
-          //   searchSubmit();
-          // }).catch(err=>{
-          //   console.log(err,'errr')
-          //   message.error(err.msg)
-          // })
+          lecturer.affiliatIsConfirm(record.id).then(res=>{
+            console.log(res,'res')
+            message.success("撤回成功")
+            searchSubmit();
+          }).catch(err=>{
+            console.log(err,'errr')
+            message.error(err.msg)
+          })
         }
       })
     }