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

src/components/project/ProjectManagerOutTeacher.vue

@@ -38,6 +38,10 @@ const props = defineProps({
     type: String,
     default: ''
   },
+  mobile: {
+    type: String,
+    default: ''
+  },
   disabled: Boolean,
   placeholder: {
     type: String,
@@ -73,6 +77,7 @@ const getOutTeacher = () => {
   })
 }
 const options = computed(() => userList.value.map(e => ({
+
   // label: e.name + '(' + e.userNo + ')' + e.organizationName,
   label:e.name,
   value: e.name,
@@ -129,6 +134,7 @@ function change(e, l) {
   Array.isArray(selectOptions.value) && emit('onChange', e, l)
     emit('update:name', l?.label)
     emit('update:value', l?.value)
+    emit('update:mobile', l?.label)
 }
 
 </script>

src/views/lecturer/ExternalLecturer.vue

@@ -130,13 +130,13 @@
             </a-form-item>
           </a-col>
         <a-col :span="24">
-          <a-form-item label="授课时长" name="defaultteachingtime">
+          <a-form-item label="授课时长" name="defaultTeachingTime">
-              <a-input v-model:value="formParam.defaultteachingtime" style="width:80%; height: 40px; border-radius: 8px ; "
+              <a-input v-model:value="formParam.defaultTeachingTime" style="width:80%; height: 40px; border-radius: 8px ; "
                 placeholder="0" allowClear showSearch suffix="分钟" @blur="clearNonNumber">
               </a-input>
-              <span style="margin-left: 5px ;" v-if="formParam.defaultteachingtime != null">{{ (formParam.defaultteachingtime / 60
+              <span style="margin-left: 5px ;" v-if="formParam.defaultTeachingTime !== null">{{ (formParam.defaultTeachingTime / 60
               ).toFixed(2) }}小时</span>
-              <span style="margin-left: 5px ;" v-if="formParam.defaultteachingtime == null">0.00小时</span>
+              <span style="margin-left: 5px ;" v-if="formParam.defaultTeachingTime === null">0.00小时</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -317,7 +317,7 @@ export default {
         teacherType:'2',
         photo:'',
         status:1,
-        defaultteachingtime:null,
+        defaultTeachingTime:'',
       },
       vf:true,
       searchParam: {
@@ -400,8 +400,8 @@ export default {
       },
       {
         title: '授课时长 ',
-        dataIndex: 'defaultteachingtime',
+        dataIndex: 'defaultTeachingTime',
-        key: 'defaultteachingtime',
+        key: 'defaultTeachingTime',
       elipsis: true, align: "center",
         width: 200,
       },
@@ -613,7 +613,7 @@ export default {
         status:1,
         teacherType:2,
         photo:null,
-        defaultteachingtime:null,
+        defaultTeachingTime:null,
         name: null,
         mobile: null,
         email: null,
@@ -690,7 +690,7 @@ export default {
       // }
     }
     const clearNonNumber = () => {
-      state.formParam.defaultteachingtime = state.formParam.defaultteachingtime.replace(/\D/g, '');
+      state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime.replace(/\D/g, '');
       // state.formParam.teaching
     }
     // getpromotionrecordstableData()

src/views/lecturer/ExternalTeaching.vue

@@ -603,13 +603,11 @@ export default {
           managerId: null,
           name: null,
           manager: null,
-          entryType: null,
           courseStatus: null,
           entryType: null,
           systemId: null,
           endTime: null,
           beginTime: null,
-          entryType: null
         };
       getTableDate();
     };
@@ -641,6 +639,7 @@ export default {
       cancel()
       state.teacherdialog = true;
       state.teacherdialogtitle = '添加授课记录'
+      state.formParam.entryType='1'
       state.vf = true
 
     }
@@ -786,7 +785,8 @@ export default {
         });
     }
     function managerChange(e, l, d, t, orgName) {
-      console.log(e, l);
+      console.log(e, l,);
+      state.formParam.mobile=l.mobile
       state.searchParam.userNo = d;
       state.searchParam.name = t;
       // state.searchParam.trainorgName=orgName
@@ -801,8 +801,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?pageNo=${state.searchParam.pageNo
+        `${process.env.VUE_APP_BASE_API}/admin/export/exportOutTeacherRecord?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&recordType=2&name=${state.searchParam.name ? state.searchParam.name : ""}&courseName=${state.searchParam.courseName ? state.searchParam.courseName : ""}&entryType=${state.searchParam.entryType ? state.searchParam.entryType : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}&courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ""}&courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ""}`
-        }&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&courseName=${state.searchParam.courseName ? state.searchParam.courseName : ""}&entryType=${state.searchParam.entryType ? state.searchParam.entryType : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}&courseTypeId=${state.searchParam.courseTypeId ? state.searchParam.courseTypeId : ""}&courseStatus=${state.searchParam.courseStatus ? state.searchParam.courseStatus : ""}`
       );
     }
     const clearstudysNumber = () => {

src/views/lecturer/InsideLecturer.vue

@@ -113,7 +113,7 @@
     </div>
     <!-- 弹窗组件 -->
     <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"
-      width="60%" :title="teacherdialogtitle">
+      width="40%" :title="teacherdialogtitle">
       <a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef">
         <a-row>
           <a-col :span="24">

src/views/lecturer/InsideTeaching.vue

@@ -1172,8 +1172,7 @@ export default {
     //导出功能
     const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/admin/export/exportInTeacherRecord?pageNo=${state.searchParam.pageNo
+        `${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 : ''}&scoreranges=${state.searchParam.scoreranges ? state.searchParam.scoreranges : ''}&studysranges=${state.searchParam.studysranges ? state.searchParam.studysranges : ' '}
-        }&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 : ''}&scoreranges=${state.searchParam.scoreranges ? state.searchParam.scoreranges : ''}&studysranges=${state.searchParam.studysranges ? state.searchParam.studysranges : ' '}
       `)
       console.log(state.searchParam.name,state.searchParam,'参数')
     }