From ba7add01b7b0ebd944f27ce5edc257d085ed3452 Mon Sep 17 00:00:00 2001
From: wangxuemei <283912718@qq.com>
Date: Tue, 10 Sep 2024 17:46:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B41?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalLecturer.vue |  3 +++
 src/views/lecturer/ExternalTeaching.vue | 13 +++++++++++++
 src/views/lecturer/InsideLecturer.vue   |  3 +--
 src/views/lecturer/InsideTeaching.vue   |  3 ++-
 src/views/lecturer/LecturerFee.vue      | 21 ++++++++-------------
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index f0b3d297..b7a95cb4 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -670,6 +670,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+::v-deep .ant-upload.ant-upload-select-picture-card {
+  border-radius: 50% !important;
+}
 //导出按钮icon
 .daochu {
   width: 16px;
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 4f925d89..ab2ca596 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -76,6 +76,9 @@
             <UploadOutlined /> 一键生成讲师费
           </a-button>
         </div> -->
+        <a-button class="resetbtn" @click="handleImport()" >
+            <DownloadOutlined /> 导入
+          </a-button>
         <a-button @click="handleExport()" class="resetbtn">
           <UploadOutlined /> 导出
         </a-button>
@@ -270,6 +273,7 @@
       </a-modal>
     </div>
     <!-- <div> <ImageUpload/> </div>         -->
+    <ImportWork v-model:showWork="showWork" :url="'/importTeacherCourseRecord'" :title="title "></ImportWork>
   </div>
 </template>
 <script lang="jsx">
@@ -283,6 +287,7 @@ import {
   FolderAddOutlined,
   DownloadOutlined
 } from '@ant-design/icons-vue';
+import ImportWork from "../../components/project/ImportWork.vue";
 import { message } from "ant-design-vue";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import ProjectManagerOutTeacher from "@/components/project/ProjectManagerOutTeacher";
@@ -301,6 +306,7 @@ export default {
     FolderAddOutlined,//图标--新增
     ProjectManager,
     ProjectManagerOutTeacher,
+    ImportWork,
   },
   setup() {
     const formRef = ref();
@@ -308,7 +314,9 @@ export default {
     const router = useRouter();
     const state = reactive({
       vf: false,
+      showWork: false,
       moreid: 1,
+      title:"导入外部授课记录",
       tableLoading: false,
       delTeacherId: null, //删除id确认 
       userNoid: null,    //详情工号确认 
@@ -761,6 +769,10 @@ export default {
     }
     const clearNonNumber=()=>{
   state.formParam.defaultteachingTime = state.formParam.defaultteachingTime.replace(/\D/g, '');
+}
+//导入功能
+const handleImport = () => {
+      state.showWork = true
 }
     //导出功能
     const handleExport = () => {
@@ -782,6 +794,7 @@ export default {
       ...toRefs(state),
       rules,
       formRef,
+      handleImport,
       clearNonNumber,
       managerChange,
       entryTypeList,
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 58ad9b0a..51a2ff3b 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -1017,7 +1017,7 @@ export default {
       cancel()
       state.teacherdialog = true;
       state.teacherdialogtitle = '新增讲师'
-      // state.formParam.photo = state.formParam.photo === null ? 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png' : state.formParam.photo
+      state.formParam.photo ='https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png' 
       state.formParam.status = '1'
       state.vf = true
     }
@@ -1193,7 +1193,6 @@ export default {
         state.log = true
         message.warning('讲师不能为空')
         return
-        600000000000000000000000000000000
       }
       if (state.formParam.departId == null) {
         state.log = true
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index f74a3c7f..58b72faa 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -346,7 +346,7 @@
         </div>
       </a-modal>
     </div>
-    <ImportWork v-model:showWork="showWork" :url="'/importTeacherCourseRecord'"></ImportWork>
+    <ImportWork v-model:showWork="showWork" :url="'/importTeacherCourseRecord'" :title="title"></ImportWork>
     <!-- <div> <Upload/> </div>         -->
   </div>
 </template>
@@ -393,6 +393,7 @@ export default {
     const router = useRouter();
     const state = reactive({
       moreid: 1,
+      title:'导入内部授课记录',
       vf: false,
       log: false,
       close: false,
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index cf6370db..b2707e0c 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -89,19 +89,12 @@
               <UploadOutlined /> 一键生成讲师费
             </a-button>
           </div> -->
-          <a-upload
-                      multiple
-                      :headers="headers"
-                      :show-upload-list="false"
-                      :before-upload="beforeUpload2"
-                    >
-          <a-button  class="resetbtn" @click="handleImport()">
+                    <a-button class="resetbtn" @click="handleImport()" >
             <DownloadOutlined /> 导入
           </a-button>
-        </a-upload>
-          <a-button @click="handleExport()" class="resetbtn">
-            <UploadOutlined /> 导出
-          </a-button>
+        <a-button @click="handleExport()" class="resetbtn">
+          <UploadOutlined /> 导出
+        </a-button>
        
           <div     style="line-height: 40px;" >当前页面汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">1,230,490</span>元     当前总汇总金额：<span style="line-height: 40px; font-size: 24px; color: rgb(207, 34, 34) ;font-weight: 600;">9,230,490</span>元</div>
          </div>
@@ -391,7 +384,7 @@
         </a-button>
       </div>
 </a-drawer>  
-<ImportWork v-model:showWork="showWork" :url="'/importTeacherCourseRecord'"></ImportWork>
+<ImportWork v-model:showWork="showWork" :url="'/importTeacherCourseRecord'" :title="title"></ImportWork>
     </div>
     
   </template>
@@ -421,11 +414,13 @@
       UploadOutlined,//图标--导出
       DownloadOutlined,//图标-导入
       FolderAddOutlined,//图标--新增
-      SearchTeacher
+      SearchTeacher,
+      ImportWork,
     },
     setup() {
       const formRef = ref();
       const state = reactive({
+        title:'导入讲师费记录',
         teachingdialog:false,
         showWork: false,
         vf:true,