Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage

src/views/lecturer/MonthlyStatistics.vue

@@ -26,7 +26,7 @@
                   v-on:keydown.enter="enterPressHadlerSearch"/>
           </a-form-item>
           <a-form-item class="select " >
-            <a-tree-select style="width: 230px"
+            <!-- <a-tree-select style="width: 230px"
 								:fieldNames="{
 									children: 'children',
 									label: 'name',
@@ -41,7 +41,10 @@
 								tree-default-expand-all
 								:tree-data="sysTypeOptions"
                 v-on:keydown.enter="enterPressHadlerSearch">
-							</a-tree-select>
+							</a-tree-select> -->
+            <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.courseTypeId"
+                :options="getOrganizationList">
+              </a-select>
           </a-form-item>
           <div style="display: flex; margin-bottom: 20px">
             <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
@@ -183,7 +186,7 @@ export default {
         payrollPlaceId: null,
         departId: null,
         summaryDate:null,
-        id: '2',
+        id: route.query.id,
         trainOrgId: '',
       },
       name:null,
@@ -228,7 +231,7 @@ export default {
         scopedSlots: { customRender: "teacherOrg" },
       },
       {
-        title: '讲师发薪地 ',
+        title: '发薪地',
         dataIndex: 'trainOrgName',
         key: 'trainOrgName',
         elipsis: true,
@@ -253,8 +256,8 @@ export default {
       },
       {
         title: '开发课程时长 ',
-        dataIndex: 'teachingTime',
-        key: 'teachingTime',
+        dataIndex: 'expense',
+        key: 'expense',
         elipsis: true,
         align: "center",
         width: 200,
@@ -298,6 +301,7 @@ export default {
     //获取讲师发薪地列表
     const PlaceOfPayLista = () => {
       getPayRollPlace().then((res) => {
+        
         if (res.data.code === 200) {
           let arr = res.data.data;
           let array = [];
@@ -336,12 +340,12 @@ export default {
       // console.log('getOrganizationList')
       getOrganization().then((res) => {
         if (res.data.code === 200) {
-          let arr = res.data.data;
+          let arr = res.data.data.records;
           let array = [];
-          arr.map((value) => {
+          arr?.map((value) => {
             let obj = {
-              value: value.departId,
-              label: value.orgName,
+              value: value.affiliationCode,
+              label: value.affiliationName,
             };
             array.push(obj);
           });
@@ -349,7 +353,7 @@ export default {
         }
       })
     }
-    // getOrganizationLista()
+    getOrganizationLista()
     //表格内查看数据操作
     const handleLook = (record) => {
       state.drawer={
@@ -386,11 +390,13 @@ export default {
      const searchReset = () => {
         state.searchParam = { 
           pageNo: "1",
-        pageSize: "10",
-        name : null,
-        payrollPlaceId: null,
-        departId: null,
-        summaryDate:null,
+          pageSize: "10",
+          id: route.query.id,
+          name : '',
+          payrollPlaceId: null,
+          departId: '',
+          summaryDate:'',
+          trainOrgId: '',
         };
         getTableDate();
       };