From 511332c1fbc00a7b334730dbaa60721d891bd47b Mon Sep 17 00:00:00 2001
From: wangxuemei <283912718@qq.com>
Date: Tue, 19 Nov 2024 18:28:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 21 ++++++++---------
 src/views/lecturer/InsideTeaching.vue   | 30 +++++++++++++++++++------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index be63e589..fb7ff5f1 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -109,9 +109,9 @@
     </div>
     <div class="tableBox ">
       <div class="pa">
-        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false" :hideOnSinglePage="true"
-          :pageSize="searchParam.pageSize" :current="searchParam.pageNo" :total="tableDataTotal" class="pagination"
-          @change="changePagination" />
+        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
+          :hideOnSinglePage="true" :pageSize="searchParam.pageSize" :current="searchParam.pageNo" :total="tableDataTotal"
+          class="pagination" @change="changePagination" />
       </div>
     </div>
     <!-- 弹窗组件 -->
@@ -151,7 +151,7 @@
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="课程名称" name="courseName">
-              <a-input class="draitem" v-model:value="formParam.courseName"  :maxlength="20"   showCount  placeholder="请输入后搜索面授课"  @blur="sendName" allowClear showSearch>
+              <a-input class="draitem" v-model:value="formParam.courseName"  :maxlength="20"   showCount  placeholder="请输入课程名称"  @blur="sendName" allowClear showSearch>
               </a-input>
             </a-form-item>
           </a-col>
@@ -329,9 +329,8 @@ export default {
   },
   setup() {
     onMounted(() => {
-      const search = sessionStorage.getItem('searchLecturer')
-      if(route.query.activeKey == 1){
-        state.moreid = 2
+      const search = sessionStorage.getItem('searchExter')
+      if(route.query.activeKey == 2&&search){
         state.searchParam = JSON.parse(search)
       }
       searchSubmit()
@@ -354,7 +353,6 @@ export default {
       teacherdialogtitle: '',//讲师弹框title内容
       teachingdialog: false,//查看抽屉
       pageSizeOptions: ['10', '20', '30', '50'], //下拉选择每页显示多少条
-      pageSize: 10,
       beginTime: null, //开始时间
       endTime: null, //结束时间
       teachingDate: undefined, //选择时间
@@ -373,7 +371,6 @@ export default {
         recordType: 2,
         pageNo: 1,
         pageSize: 10,
-        teacherName: null,
         name: null,
         address: null,
         courseStatus: null,
@@ -644,8 +641,7 @@ export default {
 
     };
     getTableDate()
-    //   // 翻页
-    const changePagination = (page) => {
+    const changePagination = (page, pageSize) => {
       state.searchParam.pageNo = page;
       // state.pageNo = page;
       state.searchParam.pageSize = pageSize;
@@ -753,7 +749,6 @@ export default {
       state.formParam = {
         courseStatus: 1,
         recordType: 2,
-        teacherName: null,
         mobile: null,
         name: null,
         type: null,
@@ -783,6 +778,8 @@ export default {
       state.teachingdialog = true
       state.lookTeacherId = record.id
       TeacherSystem()
+      state.formParam.teachingDate= state.teachingDate
+      
       // let id = record.userNo
       // router.push({ path: '/lecturer/ExternalTeachingDetail/', query: { id  } })
       // router.push({ path: '/ExternalTeachingDetail' })
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 4ee29bf8..8df971a0 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -225,7 +225,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="课程名称：" name="courseName">
-              <a-input class="draitem" v-model:value="formParam.courseName" placeholder="请输入后搜索面授课" allowClear showSearch :maxlength="20"   showCount      @blur="sendName"
+              <a-input class="draitem" v-model:value="formParam.courseName" placeholder="输入课程名称" allowClear showSearch :maxlength="20"   showCount      @blur="sendName"
               >
               </a-input>
             </a-form-item>
@@ -345,6 +345,7 @@
         <a-descriptions-item label="内容分类">{{ formParam.courseTypeName }}</a-descriptions-item>
         <a-descriptions-item label="备注  ">{{ formParam.remark }}</a-descriptions-item>
       </a-descriptions>
+      <div  v-if="formParam.createFrom == '0'">
       <div style="margin-top:20px ;line-height: 24px;"  >
       <span class="line"></span>
       <span>讲师费发放情况</span>
@@ -359,6 +360,7 @@
           </template>
         </template>
       </a-table>
+</div>
       <div :style="{
         position: 'absolute',
         right: 0,
@@ -501,7 +503,19 @@ export default {
       },
       startTime:null,
       searchParam: 
-      { "recordType": 1, "pageNo": 1, "pageSize": 10, "managerId": null, "name": null, "createFrom": null, "courseStatus": null, "sourceBelongId": null, "tSystemId": null, "endTime": null, "beginTime":null, "studys": [], "score": undefined }
+      { recordType: 1, 
+      pageNo: 1, 
+      pageSize: 10, 
+      managerId: null, 
+      name: null,
+       createFrom: null, 
+       courseStatus: null,
+        sourceBelongId: null,
+         tSystemId: null, 
+         endTime: null,
+         beginTime:null,
+          studys: [], 
+          score: undefined }
     })
     // watch(()=>state.formParam.name,(val)=>{
     //     state.formParam.teacherName = val?.split('/')[1]
@@ -795,10 +809,10 @@ export default {
 
     ])
     const rules = {
-      // name: [{ required: true, message:'',log: '讲师不能为空' }],
-      // orgName: [{ required: true, message: '',log:'讲师组织不能为空' }],
-      // tlevelName: [{ required: true, message: '',log:'讲师级别不能为空' }],
-      // tsystemName: [{ required: true, message: '',log:'讲师体系不能为空' }],
+      name: [{ required: true, message:'',log: '讲师不能为空' }],
+      orgName: [{ required: true, message: '',log:'讲师组织不能为空' }],
+      tlevelName: [{ required: true, message: '',log:'讲师级别不能为空' }],
+      tsystemName: [{ required: true, message: '',log:'讲师体系不能为空' }],
       courseTypeId: [{ required: true, message: '',log:'内容分类不能为空' }],
       courseName: [{ required: true, message: '',log:'课程名称不能为空' }],
       sourceBelongId: [{ required: true, message: '',log:'课程归属组织不能为空' }],
@@ -1188,7 +1202,6 @@ export default {
           state.tableDataTotal = Number(res.data.data.total);
         }).catch(err=>{
           message.destroy()
-          message.error(err.data.msg)
         })
     }
     const tableDatas = ref([])
@@ -1700,4 +1713,7 @@ display: flex;
 justify-content: right;
 }
 }
+.item_inp .i_upload_img[data-v-6b882d01] {
+  border-radius:50% 
+}
 </style>
\ No newline at end of file