Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage

src/views/lecturer/ExternalTeaching.vue

@@ -82,9 +82,9 @@
             <UploadOutlined /> 一键生成讲师费
           </a-button>
         </div> -->
-        <a-button class="resetbtn" @click="handleImport()">
+        <!-- <a-button class="resetbtn" @click="handleImport()">
           <DownloadOutlined /> 导入
-        </a-button>
+        </a-button> -->
         <a-button @click="handleExport()" class="resetbtn">
           <UploadOutlined /> 导出
         </a-button>
@@ -120,6 +120,7 @@
             class="pagination"
             @change="changePagination"
           />
+          <!--  :show-total="total => `共 ${total} 条数据`" -->
       </div>
     </div>
     <!-- 弹窗组件 -->

src/views/lecturer/InsideTeaching.vue

@@ -62,9 +62,12 @@
           </a-select>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
-          <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.sourceBelongId"
+          <!-- <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.sourceBelongId"
             :options="getOrganizationList" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
-          </a-select>
+          </a-select> -->
+          <OrgClass v-model:value="searchParam.orgId" 
+          style="width: 230px" 
+          ></OrgClass>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
 
@@ -136,9 +139,10 @@
     </div>
     <div class="tableBox ">
       <div class="pa">
-        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="false"
+        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :showQuickJumper="true"
           :hideOnSinglePage="false" :pageSize="searchParam.pageSize" :current="searchParam.pageNo" :total="tableDataTotal"
           class="pagination" @change="changePagination" />
+          <!--  :show-total="total => `共 ${total} 条数据`" -->
       </div>
     </div>
     <!-- 弹窗组件 -->
@@ -374,7 +378,7 @@
         </div>
       </a-modal>
     </div>
-    <ImportWork v-model:showWork="showWork" :template="'内部授课记录导入模板'" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork>
+    <ImportWork v-model:showWork="showWork" :url="'/admin/export/importInTeacherRecord'" :title="title"></ImportWork>
     <!-- <div> <Upload/> </div>         -->
   </div>
 </template>
@@ -482,7 +486,8 @@ export default {
         name: null,
         createFrom: null,
         courseStatus: null,
-        sourceBelongId: null,
+        orgId: null,
+        sourceBelongFullName:null,
         tSystemId: null,
         endTime: null,
         beginTime: null,
@@ -810,7 +815,8 @@ export default {
         state.moreid = 1
         state.searchParam.createFrom = null
         state.searchParam.courseStatus = null
-        state.searchParam.sourceBelongId = null
+        state.searchParam.orgId = null
+        state.searchParam.sourceBelongFullName = null
         state.searchParam.tSystemId = null
         state.searchParam.id = null
         state.searchParam.score = undefined
@@ -852,11 +858,12 @@ export default {
         courseName: null,
         createFrom: null,
         courseStatus: null,
-        sourceBelongId: null,
+        orgId: null,
+       sourceBelongFullName :null,
         tSystemId: null,
         endTime: null,
         beginTime: null,
-        studys: [],
+        studys: undefined,
         score: undefined,
         status: null,
       };
@@ -879,7 +886,7 @@ export default {
           })
           .catch(err => {
             state.tableLoading = false
-            message.error(err.data.msg)
+            // message.error(err.data.msg)
           })
     };
     getTableDate()
@@ -1197,7 +1204,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&recordType=1&name=${state.searchParam.name ? state.searchParam.name : ''}&courseName=${state.searchParam.courseName ? state.searchParam.courseName : ''}&createFrom=${state.searchParam.createFrom ? state.searchParam.createFrom : ''}&courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ''}&tSystemId=${state.searchParam.tSystemId ? state.searchParam.tSystemId : ''}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ''}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ''}&sourceBelongId=${state.searchParam.sourceBelongId ? state.searchParam.sourceBelongId : ''}&courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ''}&score=${state.searchParam.score ? state.searchParam.score : ''}&studys=${state.searchParam.studys ? state.searchParam.studys : ' '}
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&recordType=1&name=${state.searchParam.name ? state.searchParam.name : ''}&courseName=${state.searchParam.courseName ? state.searchParam.courseName : ''}&createFrom=${state.searchParam.createFrom ? state.searchParam.createFrom : ''}&courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ''}&tSystemId=${state.searchParam.tSystemId ? state.searchParam.tSystemId : ''}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ''}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ''}&orgId=${state.searchParam.orgId ? state.searchParam.orgId : ''}&courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ''}&score=${state.searchParam.score ? state.searchParam.score : ''}&studys=${state.searchParam.studys ? state.searchParam.studys : ' '}
       `)
       console.log(state.searchParam.name, state.searchParam, '参数')
     }