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

src/views/lecturer/ExternalLecturer.vue

@@ -7,12 +7,14 @@
         <a-form-item  class="select">
           <!--  v-model:value="searchParam.name" -->
           <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
-            placeholder="请输入讲师姓名/手机号进行检索" allowClear showSearch>
+            placeholder="请输入讲师姓名/手机号进行检索" allowClear showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-input>
         </a-form-item >
         <a-form-item  class="select">
           <a-select style="width: 276px" v-model:value="searchParam.status" placeholder="账号状态"
-            :options="AccountStatusList">
+            :options="AccountStatusList"
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item >
         <div style="display: flex; margin-bottom: 20px">
@@ -676,9 +678,18 @@ export default {
           return roleCode.some(t => t == admin)
         }
       }
+    //回车
+    const enterPressHadlerSearch = e => {
+  console.log("e",e);
+    if (e.keyCode === 13) {
+      searchSubmit()
+
+    }
+};
     return {
       ...toRefs(state),
       lecturerAdmin,
+      enterPressHadlerSearch,
       validateField,
       rules,
       rule,

src/views/lecturer/ExternalTeaching.vue

@@ -10,18 +10,22 @@
             placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
           </a-input> -->
           <a-input style="width: 276px; height: 40px; border-radius: 8px" placeholder="请输入讲师姓名/手机号进行检索" showSearch
-            allowClear v-model:value="searchParam.name"></a-input>
+            allowClear v-model:value="searchParam.name"
+            v-on:keydown.enter="enterPressHadlerSearch"></a-input>
         </a-form-item>
         <a-form-item class="select">
           <a-input v-model:value="searchParam.courseName" style="width: 276px; height: 40px; border-radius: 8px"
-            placeholder="请输入课程名称进行搜索" allowClear showSearch>
+            placeholder="请输入课程名称进行搜索" allowClear showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-input>
         </a-form-item>
         <a-form-item class="select ">
           <div class="select addTimeBox">
             <div class="addTime">创建时间：</div>
             <a-range-picker v-model:value="searchdate" style="width: 420px" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
-              separator="至" :placeholder="['      开始时间', '        结束时间']" />
+              separator="至" :placeholder="['      开始时间', '        结束时间']
+              "
+               v-on:keydown.enter="enterPressHadlerSearch" />
           </div>
         </a-form-item>
         <div style="display: flex; margin-bottom: 20px">
@@ -45,7 +49,8 @@
         <div style="width:100%"></div>
         <a-form-item class="select" v-if="moreid == 2">
           <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.entryType" placeholder="录入类型"
-            :options="entryTypeList" allowClear>
+            :options="entryTypeList" allowClear
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
@@ -56,12 +61,14 @@
           }" allow-clear :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
             v-model:value="searchParam.courseTypeId" show-search
             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类" tree-default-expand-all
-            :tree-data="sysTypeOptions">
+            :tree-data="sysTypeOptions"
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-tree-select>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
           <a-select style="width: 230px" v-model:value="searchParam.courseStatus" placeholder="开课状态"
-            :options="AuthenticationStatusList" allowClear>
+            :options="AuthenticationStatusList" allowClear
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
       </a-form>
@@ -807,9 +814,18 @@ export default {
     const clearscoreNumber = () => {
       state.formParam.score = state.formParam.score.replace(/\D/g, '');
     }
+        //回车
+const enterPressHadlerSearch = e => {
+  console.log("e",e);
+    if (e.keyCode === 13) {
+      searchSubmit()
+
+    }
+};
     return {
       ...toRefs(state),
       rules,
+      enterPressHadlerSearch,
       treetype,
       clearscoreNumber,
       clearstudysNumber,

src/views/lecturer/InsideTeaching.vue

@@ -6,12 +6,12 @@
       <a-form layout="inline" style="min-width: 1380px;">
         <a-form-item class="select">
             <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
-            placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
+            placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch" >
           </a-input>
         </a-form-item>
         <a-form-item class="select">
           <a-input v-model:value="searchParam.courseName" style="width: 276px; height: 40px; border-radius: 8px"
-            placeholder="请输入课程名称进行搜索" allowClear showSearch>
+            placeholder="请输入课程名称进行搜索" allowClear showSearch v-on:keydown.enter="enterPressHadlerSearch">
           </a-input>
         </a-form-item>
         <!-- <a-form-item class="select ">
@@ -28,6 +28,7 @@
               valueFormat="YYYY-MM-DD"
               separator="至"
               :placeholder="['      开始时间', '        结束时间']"
+              v-on:keydown.enter="enterPressHadlerSearch"
             />
             <!--    @change="searchTimeChange" -->
           </div>
@@ -53,22 +54,26 @@
         <div style="width:100%"></div>
         <a-form-item class="select" v-if="moreid == 2">
           <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.createFrom" placeholder="录入类型"
-            :options="entryTypeList" allowClear>
+            :options="entryTypeList" allowClear
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
           <a-select style="width: 230px" v-model:value="searchParam.courseStatus" placeholder="开课状态"
-            :options="AuthenticationStatusList" allowClear showSearch>
+            :options="AuthenticationStatusList" allowClear showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
           <a-select style="width: 230px" placeholder="请选择讲师体系" v-model:value="searchParam.tSystemId"
-            :options="LecturerSystemList" allowClear showSearch  @change="changetlevel">
+            :options="LecturerSystemList" allowClear showSearch  @change="changetlevel"
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
           <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.orgId"
-            :options="getOrganizationList" allowClear showSearch>
+            :options="getOrganizationList" allowClear showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
@@ -87,18 +92,21 @@
 								:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
 								placeholder="请选择内容分类" 
 								tree-default-expand-all 
-								:tree-data="sysTypeOptions">
+								:tree-data="sysTypeOptions"
+                v-on:keydown.enter="enterPressHadlerSearch">
 							</a-tree-select>
         </a-form-item>
         <div style="width: 100%;"></div>
         <a-form-item class="select" v-if="moreid == 2">
           <a-select style="min-width: 230px ; height: auto ;margin-bottom:20px" v-model:value="searchParam.scoreranges"
-            placeholder="请选择评分" :options="scoreList" allowClear showSearch mode="tags" @change="scoreChange">
+            placeholder="请选择评分" :options="scoreList" allowClear showSearch mode="tags" @change="scoreChange"
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
         </a-form-item>
         <a-form-item class="select" v-if="moreid == 2">
           <a-select style="width: 230px" v-model:value="searchParam.studysranges" placeholder="授课人数" :options="studysList"
-            allowClear showSearch>
+            allowClear showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-select>
           <!-- <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
             placeholder="授课人数" allowClear showSearch>
@@ -1201,9 +1209,18 @@ export default {
     const clearstudysNumber = () => {
       state.formParam.studys = state.formParam.studys.replace(/\D/g, '');
     }
+    //回车
+const enterPressHadlerSearch = e => {
+  console.log("e",e);
+    if (e.keyCode === 13) {
+      searchSubmit()
+
+    }
+};
     return {
       ...toRefs(state),
       sysTypeOptions,
+      enterPressHadlerSearch,
       treetype,
       validateField,
       handleformlevel,

src/views/lecturer/LecturerApproval.vue

@@ -6,7 +6,8 @@
         <a-form layout="inline" style="min-width: 1380px;">
           <a-form-item  class="select">
             <a-select style="width: 276px" v-model:value="searchParam.trainorgId" placeholder="培训发生组织" allowClear
-              :options="trainOrglist">
+              :options="trainOrglist"
+              v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
           </a-form-item>
           <a-form-item class="select ">
@@ -19,12 +20,14 @@
               valueFormat="YYYY-MM-DD"
               separator="至"
               :placeholder="['      开始时间', '        结束时间']"
+              v-on:keydown.enter="enterPressHadlerSearch"
             />
           </div>
           </a-form-item>
           <a-form-item class="select">
             <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear
-              :options="AuthenticationStatusList">
+              :options="AuthenticationStatusList"
+              v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
           </a-form-item>
           <div style="display: flex; margin-bottom: 20px">
@@ -431,7 +434,7 @@
         width: 200,
       },
       {
-          title: '提交时间(未命名)',
+          title: '提交时间',
           dataIndex: 'summaryTime',
           key: 'summaryTime',
         elipsis: true, align: "center",
@@ -890,8 +893,17 @@
         //           ...state.searchParam
         //       }, `project_${new Date().getTime()}.xlsx` )
           }
+              //回车
+    const enterPressHadlerSearch = e => {
+  console.log("e",e);
+    if (e.keyCode === 13) {
+      searchSubmit()
+
+    }
+}
       return {
         ...toRefs(state),
+        enterPressHadlerSearch,
         // searchTimeChange,
         gettableDataExamine,
         courseTypeList,

src/views/lecturer/LecturerFee.vue

@@ -11,13 +11,15 @@
             </a-input>
    -->  <div  style="width: 276px; height: 40px; border-radius: 8px"  >
     <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
-            placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
+            placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-input>
                   </div>
           </a-form-item>
           <a-form-item  class="select">
               <a-input v-model:value="searchParam.orgId" style="width: 276px; height: 40px; border-radius: 8px"
-            placeholder="请输入培训发生组织进行搜索" allowClear showSearch>
+            placeholder="请输入培训发生组织进行搜索" allowClear showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-input>
           </a-form-item>
           <a-form-item class="select ">
@@ -30,6 +32,7 @@
               valueFormat="YYYY-MM-DD"
               separator="至"
               :placeholder="['      开始时间', '        结束时间']"
+              v-on:keydown.enter="enterPressHadlerSearch"
             />
           </div>
           </a-form-item>
@@ -59,22 +62,26 @@
           </a-form-item> -->
           <a-form-item class="select" v-if="moreid == 2">
             <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="请选择课程类型" allowClear
-              :options="OnTheJobStatusList">
+              :options="OnTheJobStatusList"
+              v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
           </a-form-item>
           <a-form-item class="select" v-if="moreid == 2">
             <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear
-              :options="AuthenticationStatusList">
+              :options="AuthenticationStatusList"
+              v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
           </a-form-item>
           <a-form-item class="select" v-if="moreid == 2"> 
             <a-select style="width: 235px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.tsystemId" allowClear
-              :options="lecturerSystemList" @change="changetlevel">
+              :options="lecturerSystemList" @change="changetlevel"
+              v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
           </a-form-item>
           <a-form-item class="select"  v-if="moreid == 2">
             <a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear   :disabled="getLevelList.length!==0 ? false:true"
-              :options="getLevelList">
+              :options="getLevelList"
+              v-on:keydown.enter="enterPressHadlerSearch">
             </a-select>
           </a-form-item>
         </a-form>
@@ -1343,9 +1350,18 @@ const column = ref([
       });
       return false;
     };
+        //回车
+        const enterPressHadlerSearch = e => {
+  console.log("e",e);
+    if (e.keyCode === 13) {
+      searchSubmit()
+
+    }
+};
       return {
         ...toRefs(state),
         handleTeacher,
+        enterPressHadlerSearch,
         rules,
         formRef,
         clearNonNumber,

src/views/lecturer/LecturerFeeStatistics.vue

@@ -6,11 +6,13 @@
       <a-form layout="inline">
           <a-form-item  class="select">
             <a-select style="width: 276px" v-model:value="searchParam.trainorgId" placeholder="请选择资源归属" allowClear
-              :options="TrainOrglist" />
+              :options="TrainOrglist" 
+              v-on:keydown.enter="enterPressHadlerSearch"/>
           </a-form-item>
           <a-form-item class="select " >
             <a-date-picker  style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate"
-              :placeholder="[ '请选择汇总周期']" @change="searchTimeChange" />
+              :placeholder="[ '请选择汇总周期']" @change="searchTimeChange"
+              v-on:keydown.enter="enterPressHadlerSearch" />
           </a-form-item >  
             <!-- <a-form-item  class="select">
               <a-month-picker  placeholder="重新汇总上月周期" @change="onChange" style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate"  />
@@ -747,10 +749,18 @@ export default {
         &teacherNo=${state.queryFeeMonthly.teacherNo ? state.queryFeeMonthly.teacherNo : ""}
         &departId=${state.queryFeeMonthly.departId ? state.queryFeeMonthly.departId : ""}`)
     }
+    //回车
+    const enterPressHadlerSearch = e => {
+  console.log("e",e);
+    if (e.keyCode === 13) {
+      searchSubmit()
 
+    }
+};
     return {
       ...toRefs(state), 
       router,
+      enterPressHadlerSearch,
       searchReset,
       searchTimeChange,
       handleFeeMonthly,

src/views/lecturer/LecturerSystem.vue

@@ -8,7 +8,8 @@
           <!-- <ProjectManager v-model:value="searchParam.userNo" v-model:name="searchParam.name" placeholder="请输入工号/讲师姓名进行检索"
             @onChange="managerChange" mode="multiple"></ProjectManager> -->
             <a-input v-model:value="searchParam.systemName" style="width: 260px; height: 40px; border-radius: 8px"
-            placeholder="请输入讲师体系/编号名进行检索" allowClear showSearch>
+            placeholder="请输入讲师体系/编号名进行检索" allowClear showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-input>
         </div>
       </a-form-item> 
@@ -436,9 +437,18 @@ export default {
     },
   });
     }
+        //回车
+        const enterPressHadlerSearch = e => {
+  console.log("e",e);
+    if (e.keyCode === 13) {
+      searchSubmit()
+
+    }
+};
     return {
       ...toRefs(state),
       rules,
+      enterPressHadlerSearch,
       formRef,
       getteacherrecordstableData,
       inputRemove,

src/views/lecturer/MonthlyStatistics.vue

@@ -16,12 +16,14 @@
       <a-form layout="inline" >
           <a-form-item  class="select">
               <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
-            placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
+            placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch
+            v-on:keydown.enter="enterPressHadlerSearch">
           </a-input>
           </a-form-item>
           <a-form-item class="select">
             <a-select style="width: 230px" v-model:value="searchParam.payrollPlaceId" placeholder="发薪地"
-                  :options="PlaceOfPayList" allowClear showSearch/>
+                  :options="PlaceOfPayList" allowClear showSearch
+                  v-on:keydown.enter="enterPressHadlerSearch"/>
           </a-form-item>
           <a-form-item class="select " >
             <a-tree-select style="width: 230px"
@@ -37,7 +39,8 @@
 								:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
 								placeholder="请选择内容分类"
 								tree-default-expand-all
-								:tree-data="sysTypeOptions">
+								:tree-data="sysTypeOptions"
+                v-on:keydown.enter="enterPressHadlerSearch">
 							</a-tree-select>
           </a-form-item>
           <div style="display: flex; margin-bottom: 20px">
@@ -533,10 +536,19 @@ export default {
           startTime: '',
         }
       };
+          //回车
+    const enterPressHadlerSearch = e => {
+  console.log("e",e);
+    if (e.keyCode === 13) {
+      searchSubmit()
+
+    }
+};
     return {
       ...toRefs(state),
       tableDatas, 
       column,
+      enterPressHadlerSearch,
       cancelTeachingDialog,
       searchReset,
       handleFeeMonthly,

src/views/lecturer/Organization.vue

@@ -5,7 +5,8 @@
       <a-form   layout="inline">
         <a-form-item class="select">
           <div>
-          <a-input style="width: 276px; height: 40px; border-radius: 8px" v-model:value="searchParam.name" placeholder="请输入工号/讲师姓名进行检索" />
+          <a-input style="width: 276px; height: 40px; border-radius: 8px" v-model:value="searchParam.name" placeholder="请输入工号/讲师姓名进行检索"
+          v-on:keydown.enter="enterPressHadlerSearch" />
           </div>
         </a-form-item>
         <div style="display: flex; margin-bottom: 20px">
@@ -587,8 +588,17 @@ const getTableDate = (obj) => {
     
 
     }
+        //回车
+        const enterPressHadlerSearch = e => {
+  console.log("e",e);
+    if (e.keyCode === 13) {
+      searchSubmit()
+
+    }
+};
     return{
         ...toRefs(state),
+        enterPressHadlerSearch,
         rules,
         formRef,
         columns,