修改授课回显调整

2025-12-18 07:16:46 +08:00 · 2024-10-31 17:20:08 +08:00
parent 3778c721cc
commit b83bd6904e
6 changed files with 268 additions and 261 deletions
--- a/src/components/project/ProjectManagerOutTeacher.vue
+++ b/src/components/project/ProjectManagerOutTeacher.vue
@@ -60,7 +60,7 @@ function debounce(func, wait) {
    timeout = setTimeout(() => func.apply(this, args), wait);
  };
 }
-const memberParam = ref({teacherNameOrUserNo: '', pageNo:1, pageSize: 20})
+const memberParam = ref({name: '', pageNo:1, pageSize: 999,teacherType:2})

 const userList = ref([])
 const loading = ref(false)
@@ -73,7 +73,8 @@ const getOutTeacher = () => {
  })
 }
 const options = computed(() => userList.value.map(e => ({
-  label: e.name + '(' + e.userNo + ')' + e.organizationName,
+  // label: e.name + '(' + e.userNo + ')' + e.organizationName,
+  label:e.name,
  value: e.name,
  ...e,
  audienceList: null
@@ -106,19 +107,22 @@ const searchMember = (keyword) => {
  isOpen.value = true
  userList.value = []
  memberParam.value.pageNo = 1
-  memberParam.value.teacherNameOrUserNo = keyword
+  memberParam.value.teacherType=2
+  memberParam.value.name = keyword
  console.log('searchMember', memberParam.value)
  debounceObject()
 };

 function blur() {
  isOpen.value = false
-  memberParam.value.teacherNameOrUserNo = ''
+  memberParam.value.name = ''
  memberParam.value.pageNo = 1
+  memberParam.value.teacherType=2
 }

 function change(e, l) {
-  memberParam.value.teacherNameOrUserNo = ''
+  memberParam.value.name = ''
+  memberParam.value.teacherType=2
  memberParam.value.pageNo = 1
  isOpen.value = false
  Array.isArray(l) && (selectOptions.value = l)
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -88,7 +88,7 @@
                </a-upload>
              <div class="i_bottom">
                <div class="tip" style="margin-bottom: 10px;">
-                  <span style="color: #999999; margin-left: 8px">支持图片格式为jpg/jpeg/png 图片最大为500KB</span>
+                  <span style="color: #999999; margin-left: 8px">支持图片格式为jpg/jpeg/png </span>
                </div>
              </div>
            </div>
@@ -316,14 +316,12 @@ export default {
        file.type === "image/jpg" ||
        file.type === "image/jpeg" ||
        file.type === "image/png" ||
-    file.type === "image/svg" ||
        file.type === "image/bmp" ||
        file.type === "image/gif";
      if (!isJpgOrPng) {
-    message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
+        message.error("仅支持jpg、gif、png、jpeg、bmp格式!");
        return false;
      }
-
      let isLt1M = file.size < 500000;
      console.log(file.size, isLt1M)
      if (!isLt1M) {
@@ -333,6 +331,7 @@ export default {

      const formDatas = new FormData();
      formDatas.append("file", file);
+      console.log("file", file)
      fileUp(formDatas).then((res) => {
        if (res.data.code === 200) {
          console.log(res.data.data, 45);
@@ -649,16 +648,16 @@ export default {
    const sendPhone=()=>{
      console.log(state.formParam.mobile)
      const reg = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/;
-      if (!state.formParam.mobile) {
-      } else if (!reg.test(state.formParam.mobile)) {
-        message.warning( '手机号格式不正确')
-      }
+      // if (!state.formParam.mobile) {
+      // } else if (!reg.test(state.formParam.mobile)) {
+      //   message.warning( '手机号格式不正确')
+      // }
    }
    const sendEmail=()=>{
      const reg = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.\w{2,}$/;
-      if (!reg.test(state.formParam.email)) {
-        message.warning( '邮箱格式不正确')
-      }
+      // if (!reg.test(state.formParam.email)) {
+      //   message.warning( '邮箱格式不正确')
+      // }
    }
    // getpromotionrecordstableData()
    //导出功能
@@ -1088,4 +1087,7 @@ display: flex;
 justify-content: right;
 }
 }
+.item_inp .i_upload_img[data-v-e369ffe0] {
+  border-radius:50% 
+}
 </style>
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -10,24 +10,18 @@
            placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
          </a-input> -->
          <a-input style="width: 276px; height: 40px; border-radius: 8px" placeholder="请输入工号/讲师姓名进行检索" showSearch
-            allowClear v-model:courseName="searchParam.courseName"></a-input>
+            allowClear v-model:value="searchParam.name"></a-input>
        </a-form-item>
        <a-form-item class="select">
-          <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
+          <a-input v-model:value="searchParam.courseName" style="width: 276px; height: 40px; border-radius: 8px"
            placeholder="请输入课程名称进行搜索" allowClear showSearch>
          </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="['      开始时间', '        结束时间']"
-            />
+            <a-range-picker v-model:value="searchdate" style="width: 420px" format="YYYY-MM-DD" valueFormat="YYYY-MM-DD"
+              separator="至" :placeholder="['      开始时间', '        结束时间']" />
          </div>
        </a-form-item>
        <div style="display: flex; margin-bottom: 20px">
@@ -55,20 +49,13 @@
          </a-select>
        </a-form-item>
        <a-form-item class="select" v-if="moreid == 2">
-          <a-tree-select
-          style="width: 230px"
-								:fieldNames="{
+          <a-tree-select style="width: 230px" :fieldNames="{
            children: 'children',
            label: 'name',
            value: 'code',
-								}"
-								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 
+          }" 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">
          </a-tree-select>
        </a-form-item>
@@ -98,7 +85,8 @@
      <!-- 表格 -->
      <div style="padding: 10px 0">
        <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="columns"
-        :scroll="{ x: 1500 }"      :data-source="tableData" :loading="tableLoading" @expand="expandTable" :pagination="false">
+          :scroll="{ x: 1500 }" :data-source="tableData" :loading="tableLoading" @expand="expandTable"
+          :pagination="false">
          <template #bodyCell="{ record, column }">
            <template v-if="column.key === 'operation'">
              <a-space>
@@ -114,41 +102,38 @@
    </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>
    <!-- 弹窗组件 -->
-    <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"  width="60%" :title="teacherdialogtitle">
+    <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true"
+      width="60%" :title="teacherdialogtitle">
      <a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef">
        <!--讲师名称  teacherName 内容分类 coursetypeid -->
        <a-row :gutter="16">
          <a-col :span="12">
-              <!-- <ProjectManagerOutTeacher v-model:value="formParam.name" 
+       
+            <a-form-item label="讲师名称" name="teacherName">
+                   <ProjectManagerOutTeacher v-model:value="formParam.name" 
        v-model:name="formParam.teacherName"
        placeholder="请输入工号/讲师姓名进行检索"
-                            @onChange="managerChange"></ProjectManagerOutTeacher>  -->
-                          <a-form-item label="讲师名称" name="teacherName">
-                       <a-input v-model:value="formParam.teacherName"   allowClear
-                showSearch  class="draitem" placeholder="请输入讲师姓名"></a-input>
+                            @onChange="managerChange"></ProjectManagerOutTeacher> 
+                            
+              <!-- <a-input v-model:value="formParam.teacherName" allowClear showSearch class="draitem"
+                placeholder="请输入讲师姓名"></a-input> -->
            </a-form-item>
          </a-col>
          <a-col :span="12">
            <a-form-item label="内容分类" name="courseTypeId">
-              <a-tree-select
-								:fieldNames="{
+              <a-tree-select :fieldNames="{
                children: 'children',
                label: 'name',
                value: 'code',
-								}"
-								allow-clear
-								:getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
-								v-model:value="formParam.courseTypeId" 
-								show-search 
-								:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-								placeholder="请选择内容分类" 
-								tree-default-expand-all 
+              }" allow-clear :getPopupContainer="triggerNode => triggerNode.parentNode || document.body"
+                v-model:value="formParam.courseTypeId" show-search
+                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="请选择内容分类" tree-default-expand-all
                :tree-data="sysTypeOptions">
              </a-tree-select>
            </a-form-item>
@@ -158,8 +143,7 @@
        <a-row :gutter="16">
          <a-col :span="12">
            <a-form-item label="课程名称" name="coursename">
-              <a-input class="draitem" v-model:value="formParam.coursename" placeholder="请输入后搜索面授课" allowClear
-                showSearch>
+              <a-input class="draitem" v-model:value="formParam.coursename" placeholder="请输入后搜索面授课" allowClear showSearch>
              </a-input>
            </a-form-item>
          </a-col>
@@ -182,8 +166,8 @@
          </a-col>
          <a-col :span="12">
            <a-form-item label="授课时长" name="teaching">
-              <a-input v-model:value="formParam.teaching" style="width:80%; height: 40px; border-radius: 8px; "  placeholder="0"
-                allowClear showSearch suffix="分钟"   @blur="clearNonNumber">
+              <a-input v-model:value="formParam.teaching" 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.teaching != null">{{ (formParam.teaching / 60
              ).toFixed(2) }}小时</span>
@@ -195,13 +179,15 @@
        <a-row :gutter="16">
          <a-col :span="12">
            <a-form-item label="参训人数" name="studys">
-              <a-input v-model:value="formParam.studys" class="draitem" placeholder="0 " allowClear showSearch   @blur="clearstudysNumber">
+              <a-input v-model:value="formParam.studys" class="draitem" placeholder="0 " allowClear showSearch
+                @blur="clearstudysNumber">
              </a-input>
            </a-form-item>
          </a-col>
          <a-col :span="12">
            <a-form-item label="评分" name="score">
-              <a-input v-model:value="formParam.score" class="draitem" placeholder="0 " allowClear showSearch @blur="clearscoreNumber">
+              <a-input v-model:value="formParam.score" class="draitem" placeholder="0 " allowClear showSearch
+                @blur="clearscoreNumber">
              </a-input>
            </a-form-item>
          </a-col>
@@ -238,7 +224,8 @@
      <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
        <a-descriptions-item label="讲师名称">{{ formParam.teacherName }}</a-descriptions-item>
        <a-descriptions-item label="手机号码">{{ formParam.mobile }}</a-descriptions-item>
-        <a-descriptions-item label="课程类型">{{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : '' }}</a-descriptions-item>
+        <a-descriptions-item label="课程类型">{{ formParam.type == 1 ? '在线课' : formParam.type == 0 ? '面授课' : ''
+        }}</a-descriptions-item>
        <a-descriptions-item label="课程名称">{{ formParam.coursename }}</a-descriptions-item>
        <a-descriptions-item label="开课状态">{{ formParam.status == 0 ? '未开课' : formParam.status == 1
          ? '已开课' : '' }}</a-descriptions-item>
@@ -777,6 +764,7 @@ export default {
      getTeacherCourseList({ id: state.lookTeacherId }).then((res) => {
        state.formParam = res.data.data
        state.teachingDate = dayjs(res.data.data.teachingDate, 'YYYY-MM-DD'),
+        state.formParam.name=state.formParam.teacherName
          console.log(state.formParam);
      })
        .catch((err) => {
@@ -881,6 +869,7 @@ const handleImport = () => {
    margin-left: 85px !important;
  }
 }
+
 //导出按钮icon
 .daochu {
  width: 16px;
@@ -1192,25 +1181,32 @@ const handleImport = () => {
  border-radius: 8px;
  margin-right: 20px
 }
+
 ::v-deep .ant-select:not(.ant-select-customize-input) .ant-select-selector {
  border-radius: 8px;
  height: 40px;
 }
+
 .ant-col-12 {
  height: 80px;
 }
+
 .tableBox {
  padding-bottom: 20px;
  margin: 20px 38px 30px;
+
  ::v-deep .ant-select-dropdown {
    display: inline-block;
  }
+
  ::v-deep .ant-select-selection-item {
    margin-left: 3px;
  }
+
  ::v-deep .ant-pagination-options-size-changer.ant-select {
    width: 84px;
  }
+
  .pa {
    width: 100%;
    display: flex;
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -1566,4 +1566,7 @@ display: flex;
 justify-content: right;
 }
 }
+.item_inp .i_upload_img[data-v-e369ffe0] {
+  border-radius:50% 
+}
 </style >
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -683,8 +683,8 @@ export default {
            <div>
              {value.record.courseStatus == 0 || value.record.courseStatus == 1
                ? {
-                  "0": "未开课",
-                  "1": "已开课",
+                  "0": "已开课",
+                  "1": "未开课",
                }[value.record.courseStatus + ""] || ""
                : "-"}
            </div>
--- a/src/views/lecturer/LookExternalLecturer.vue
+++ b/src/views/lecturer/LookExternalLecturer.vue
@@ -253,9 +253,11 @@ export default{
    // getteacherrecordstableData()
    //授课翻页
    const teacherchangePagination = (page) => {
-      state.teacherrecords.pageNo = page;
+       state.searchParam.pageNo = page;
      // state.pageNo = page;
-      state.teacherrecords.pageSize = pageSize;
+      state.searchParam.pageSize = pageSize;
+      getTableDate();
+      state.teacherrecords.pageNo = page;
      getteacherrecordstableData();
    };
        return{