From e339967189dd9b99d6c6e2866f57a0c24c7aec4e Mon Sep 17 00:00:00 2001
From: wangxuemei <283912718@qq.com>
Date: Fri, 25 Oct 2024 14:41:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=B6=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/lecturer/ExternalTeaching.vue | 22 +++++++------
 src/views/lecturer/InsideTeaching.vue   | 34 ++++++++++----------
 src/views/lecturer/LecturerFee.vue      | 41 +++++++++++--------------
 3 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index a8f1fd46..eae320f8 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -155,8 +155,8 @@
         <!-- 课程名称：name  开课状态 status-->
         <a-row :gutter="16">
           <a-col :span="12">
-            <a-form-item label="课程名称" name="name">
-              <a-input class="draitem" v-model:value="formParam.name" placeholder="请输入后搜索面授课" allowClear
+            <a-form-item label="课程名称" name="coursename">
+              <a-input class="draitem" v-model:value="formParam.coursename" placeholder="请输入后搜索面授课" allowClear
                 showSearch>
               </a-input>
             </a-form-item>
@@ -173,9 +173,9 @@
         <!-- 授课日期 beginTime  授课时长defaultTeachingTime-->
         <a-row :gutter="16">
           <a-col :span="12">
-            <a-form-item label="授课/课程日期 :" name="beginTime">
-              <a-date-picker class="draitem" v-model:value="formParam.beginTime" style="width: 100%" format="YYYY-MM-DD"
-                placeholder="请选择课程日期" />
+            <a-form-item label="授课/课程日期 :" name="formParamdate">
+              <a-date-picker class="draitem" v-model:value="formParamdate" style="width:100%" format="YYYY-MM-DD"
+                placeholder="请选择课程日期"  />
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -350,6 +350,7 @@ export default {
       pageSize: 10,
       beginTime: null, //开始时间
       endTime: null, //结束时间
+      formParamdate: undefined, //选择时间
       tableDataTotal: -1,//table列表总条数
       formParam: {
         status: 1,
@@ -384,12 +385,12 @@ export default {
     const AddressList = ref([
     ]);
     const rules = {
-      teacher: [{ required: true, message: '',log:'讲师不能为空' }],
-      coursetypeid: [{ required: true, message:'',log: '内容分类不能为空' }],
-      name: [{ required: true, message: '',log:'课程名称不能为空' }],
+      name: [{ required: true, message: '',log:'讲师不能为空' }],
+      courseTypeId: [{ required: true, message:'',log: '内容分类不能为空' }],
+      courseName: [{ required: true, message: '',log:'课程名称不能为空' }],
       status: [{ required: true, message:'',log: '讲开课状态不能为空' }],
       duration: [{ required: true, message: '',log:'授课时长不能为空' }],
-      beginTime: [{ required: true, message:'',log: '授课日期不能为空' }],
+      formParamdate: [{ required: true, message:'',log: '授课日期不能为空' }],
 
     }
     //获取开课场地
@@ -684,6 +685,7 @@ export default {
         }
       }
       state.formParam = {...state.formParam}
+      state.formParam.beginTime=state.formParamdate ? dayjs(state.formParamdate).format("YYYY-MM-DD") : ""
       if (state.vf == false) {
         updateInTeacherCourse(state.formParam).then(response => {
             message.success("修改成功");
@@ -771,7 +773,7 @@ export default {
         score: null,
         remark: null,
       }
-
+      state.formParamdate=null
     }
     //展开切换
     const handlemoreid = () => {
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index b788413b..4d5fca3d 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -218,9 +218,10 @@
         <!-- 授课日期 beginTime     开课状态 courseStatus -->
         <a-row :gutter="16">
           <a-col :span="12">
-            <a-form-item label="授课/课程日期 :" name="beginTime">
-              <a-date-picker class="draitem" v-model:value="formParam.beginTime" style="width:100%" format="YYYY-MM-DD"
-                placeholder="请选择课程日期" @change="editTimeChange" />
+            <a-form-item label="授课/课程日期 :" name="formParamdate">
+              <a-date-picker class="draitem" v-model:value="formParamdate" style="width:100%" format="YYYY-MM-DD"
+                placeholder="请选择课程日期"  />
+                <!-- @change="editTimeChange" -->
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -318,7 +319,7 @@
       <span>讲师费发放情况</span>
       </div>
       <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="column"
-        :data-source="tableDatas" :loading="tableLoadings" :pagination="false">
+        :data-source="tableDatas"  :pagination="false">
         <template #bodyCell="{ record, column }">
           <template v-if="column.key === 'operation'">
             <a-space>
@@ -437,6 +438,7 @@ export default {
       pageSize: 10,
       tableDataTotal: -1,//table列表总条数
       searchdate: undefined, //选择时间
+      formParamdate: undefined, //选择时间
       beginTime: null, //开始时间
       endTime: null, //结束时间
       tSystemNames:{
@@ -775,11 +777,11 @@ export default {
 //       //   state.searchParam.endTime = state.endTime ? state.endTime : null
 // }
 
-    const editTimeChange = (e, date) => {
-      console.log(date);
-      state.beginTime = date;
-      // console.log(date, state.searchParam.beginTime, state.searchParam.endTime);
-    };
+    // const editTimeChange = (e, date) => {
+    //   console.log(date);
+    //   state.beginTime = date;
+    //   // console.log(date, state.searchParam.beginTime, state.searchParam.endTime);
+    // };
     //重置
     const searchReset = () => {
       state.searchdate= undefined,
@@ -854,6 +856,7 @@ export default {
     }
   //保存
   const createTeacherDialog = async () => {
+    console.log( state.formParam)
       state.formParam.tSystemName = state.tSystemNames.systemName
       const formItemNames = Object.keys(rules);
       for(let i=0;i<formItemNames.length;i++){
@@ -863,6 +866,7 @@ export default {
         }
       }
       state.formParam = {...state.formParam,...state.tSystemNames}
+      state.formParam.beginTime=state.formParamdate ? dayjs(state.formParamdate).format("YYYY-MM-DD") : ""
       if (state.vf == false) {
         updateInTeacherCourse(state.formParam).then(response => {
             message.success("修改成功");
@@ -928,16 +932,14 @@ export default {
         levelId: null,
         courseName: null,
         duration:null,
-        endTime: null,
-        beginTime: null,
         studys: null,
         score: null,
         type: null,
         remark: null,
         offcourseId: null,
         createFrom: null,
-        
       }
+      state.formParamdate=null
       state.tSystemNames = {
         systemName:null,
         levelVoList: []
@@ -1091,13 +1093,13 @@ export default {
     }
     const tableDatas = ref([])
     const rules = {
-      teacher: [{ required: true, message:'',log: '讲师不能为空' }],
+      name: [{ required: true, message:'',log: '讲师不能为空' }],
       orgName: [{ required: true, message: '',log:'讲师组织不能为空' }],
       levelId: [{ required: true, message: '',log:'讲师级别不能为空' }],
       tSystemName: [{ required: true, message: '',log:'讲师体系不能为空' }],
-      id: [{ required: true, message: '',log:'内容分类不能为空' }],
+      courseTypeId: [{ required: true, message: '',log:'内容分类不能为空' }],
       courseName: [{ required: true, message: '',log:'课程名称不能为空' }],
-      beginTime: [{ required: true, message: '',log:'授课/课程日期不能为空' }],
+      formParamdate: [{ required: true, message: '',log:'授课/课程日期不能为空' }],
       duration: [{ required: true, message:'',log: '授课时长不能为空' }],
       courseStatus: [{ required: true, message: '',log:'开课状态不能为空' }],
     }
@@ -1221,7 +1223,7 @@ export default {
       getOrganizationList, 
       // searchTimeChange,
       cancelTeachingDialog,
-      editTimeChange,
+      // editTimeChange,
       scoreChange
     }
   },
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 5a24a8f6..cc2a3d1d 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -68,7 +68,7 @@
             </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
+            <a-select style="width: 235px ;margin-bottom:20px" placeholder="请选择讲师体系" v-model:value="searchParam.tsystemId" allowClear
               :options="lecturerSystemList" @change="changetlevel">
             </a-select>
           </a-form-item>
@@ -150,7 +150,7 @@
       <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" dropdown-style="drawaer"
         width="60%" :title="teacherdialogtitle">
         <a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef" >
-          <!-- 讲师姓名  name  讲师工号  teacherNo-->
+          <!-- 讲师姓名  name  讲师工号  userNo-->
           <a-row :gutter="16">
             <a-col :span="12">
               <a-form-item label="讲师名称" name="teacher">
@@ -356,7 +356,7 @@
 <span>讲师费用详情</span>
 <a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
     <a-descriptions-item label="讲师名称">{{formParam.name}}</a-descriptions-item>
-    <a-descriptions-item label="讲师工号">{{formParam.teacherNo}}</a-descriptions-item>
+    <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item>
     <a-descriptions-item label="讲师组织" :span="2">{{formParam.teacherOrg}}</a-descriptions-item>
     <a-descriptions-item label="讲师体系">{{formParam.systemName}}</a-descriptions-item>
     <a-descriptions-item label="讲师级别">{{formParam.levelName }}</a-descriptions-item>
@@ -500,10 +500,10 @@
         },
         searchdate: null, //选择时间
         searchParam: {
-          teacherNo:null,
+          userNo:null,
           name:null,
           trainorgId:null,
-          tsystemid:null,
+          tsystemId:null,
           levelId:null,
           courseType:null,
           certStatus:null,
@@ -643,8 +643,8 @@ console.log( "讲师体系id" +val);
         },
         {
           title: '讲师工号 ',
-          dataIndex: 'teacherNo',
-          key: 'teacherNo',
+          dataIndex: 'userNo',
+          key: 'userNo',
         elipsis: true, align: "center",
           width: 120,
         },
@@ -818,8 +818,8 @@ console.log( "讲师体系id" +val);
         state.searchParam = { 
           endTime:null,
         beginTime:null,
-          teacherNo:null,
-          tsystemid:null,
+          userNo:null,
+          tsystemId:null,
           levelId:null,
           courseType:null,
           certStatus:null,
@@ -1001,9 +1001,9 @@ console.log( "讲师体系id" +val);
       const cancel = () => {
         state.formParam ={
           teacher:null,
-          teacherNo:null,
+          userNo:null,
           departId:null,
-          tsystemid:null,
+          tsystemId:null,
           levelId:null,
           payrollPlaceName:null,
           tSystemName: null,
@@ -1092,7 +1092,7 @@ console.log( "讲师体系id" +val);
     }
       const rules = {
         name: [{ required: true, message:'',log: '讲师不能为空' }],
-        teacherNo: [{ required: true, message: '',log:'讲师工号不能为空' }],
+        userNo: [{ required: true, message: '',log:'讲师工号不能为空' }],
         departId: [{ required: true, message: '',log:'讲师组织不能为空' }],
         tSystemName: [{ required: true, message:'',log: '讲师体系不能为空' }],
         tLevelId: [{ required: true, message:'',log: ' 讲师级别 不能为空' }],
@@ -1109,8 +1109,8 @@ console.log( "讲师体系id" +val);
       }
       function managerChange(e, l, d, t, orgName) {
       console.log(e, l);
-      state.searchParam.teacherNo = d;
-      state.searchParam.teacherNo = t;
+      state.searchParam.userNo = d;
+      state.searchParam.userNo = t;
       // state.searchParam.trainorgName=orgName
     }
     const handleImport = () => {
@@ -1156,8 +1156,8 @@ const column = ref([
         },
         {
           title: '讲师工号 ',
-          dataIndex: 'teacherNo',
-          key: 'teacherNo',
+          dataIndex: 'userNo',
+          key: 'userNo',
         elipsis: true, align: "center",
           width: 120,
         },
@@ -1322,12 +1322,8 @@ const column = ref([
       //导出功能
       const handleExport = ()=>{
         window.open (
-          `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?pageNo=${
-            state.searchParam.pageNo
-          }&pageSize=${state.searchParam.pageSize}&name=${
-            state.searchParam.name ? state.searchParam.name : ""
-          }&tsystemid=${ state.searchParam.tsystemid ?  state.searchParam.tsystemid : ""}&levelId=${
-            state.searchParam.levelId ? state.searchParam.levelId : ""
+          `${process.env.VUE_APP_BASE_API}/admin/export/exportTeacherExpense?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""
+          }&tsystemId=${ state.searchParam.tsystemId ?  state.searchParam.tsystemId : ""}&levelId=${state.searchParam.levelId ? state.searchParam.levelId : ""
           }&courseType=${ state.searchParam.courseType ?  state.searchParam.courseType : ""}&certStatus=${
             state.searchParam.certStatus ? state.searchParam.certStatus : ""
           }&salaryName=${state.searchParam.salaryName ?  state.searchParam.salaryName : ""}&status=${state.searchParam.status ?  state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ?  state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ?  state.searchParam.endTime : ""}`
@@ -1337,7 +1333,6 @@ const column = ref([
         //       }, `project_${new Date().getTime()}.xlsx` )
           }
           const beforeUpload2 = (file) => {
-      console.log(6765555);
       console.log(file);
       const fileType = [
         "xls",