接口调整

This commit is contained in:
wangxuemei
2024-10-23 17:05:10 +08:00
parent 40246afe39
commit ca46e61d8d
5 changed files with 77 additions and 175 deletions

View File

@@ -52,28 +52,28 @@
</div>
</div>
<div style="width:100%"></div>
<a-form-item class="select" v-if="moreid == 2">
<!-- <a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.courseType" placeholder="请选择费用类型" allowClear
:options="courseTypeList">
</a-select>
</a-form-item>
</a-form-item> -->
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="请选择课程类型" allowClear
<a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="请选择课程类型" allowClear
:options="OnTheJobStatusList">
</a-select>
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear
<a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.status" placeholder="请选择状态" allowClear
:options="AuthenticationStatusList">
</a-select>
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;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>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear :disabled="getLevelList.length!==0 ? false:true"
<a-select style="width: 235px ;margin-bottom:20px" v-model:value="searchParam.levelId" placeholder="请选择讲师级别" allowClear :disabled="getLevelList.length!==0 ? false:true"
:options="getLevelList">
</a-select>
</a-form-item>
@@ -189,7 +189,7 @@
</a-form-item>
</a-col>
</a-row>
<!-- 讲师级别 levelId 讲师发薪地 payrollPlaceId-->
<!-- 讲师级别 levelId 讲师发薪地 payrollPlaceName-->
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="讲师级别" name="levelName">
@@ -202,10 +202,10 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="讲师发薪地" name="payrollPlaceId ">
<a-select v-model:value="formParam.payrollPlaceId" placeholder="发薪地" disabled
:options="PlaceOfPayList" allowClear>
</a-select>
<a-form-item label="讲师发薪地" name="payrollPlaceName ">
<a-input disabled v-model:value="formParam.payrollPlaceName" class="draitem"
placeholder="自动带出讲师发薪地" allowClear showSearch >
</a-input>
</a-form-item>
</a-col>
</a-row>
@@ -446,8 +446,8 @@
} from '@ant-design/icons-vue';
import ImportWork from "../../components/project/ImportWork.vue";
import SearchTeacher from "@/components/project/SearchTeacher";
import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement";4
import { getTeacherExpertise,getTeacherSystemList,getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer";
import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTeacherLevel,deleteInTeacher,confirm} from "../../api/lecturerFeeManagement";
import {getTeacherSystemList, getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer";
// lecturerFeeManagement
// import {getProjSt} from "../../api/indexProjStu";
// import AddTeacher from "../../components/drawers/project/AddTeacher"
@@ -506,7 +506,7 @@
courseType:null,
certStatus:null,
salaryName:null,
payrollPlaceId:null,
payrollPlaceName:null,
status:null,
pageNo: "1",
pageSize: "10",
@@ -537,27 +537,7 @@
{ value: 0, label: "未认证" },
{ value: 1, label: "已认证" },
])
//获取内容分类
const getTeacherExpertiseList = ref([
// { value: 0, label: "未定级" },
])
const getTeacherExpertiseLista = () => {
getTeacherExpertise().then((res) => {
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
arr.map((value) => {
let obj = {
value: value.id,
label: value.name,
};
array.push(obj);
});
getTeacherExpertiseList.value = array;
}
})
}
getTeacherExpertiseLista()
const lecturerSystemList = ref([
]);
///获取讲师体系列表
@@ -602,51 +582,29 @@ console.log( "讲师体系id" +val);
})
}
LecturerSystemLista()
const trainOrglist=ref([])
//获取培训发生组织
const trainOrglista =() => {
let obj = {
pageNo: "1",
pageSize: "10000"
}
getTrainOrg(obj).then((res)=>{
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
arr.map((value) => {
let obj = {
value: value.trainorgId,
label: value.trainOrg,
};
array.push(obj);
});
trainOrglist.value = array;
}
})
}
trainOrglista()
//获取讲师发薪地列表
const PlaceOfPayList = ref([
// { value: 0, label: "发薪地B1" },
])
const PlaceOfPayLista =() => {
getPayRollPlace().then((res)=>{
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
arr.map((value) => {
let obj = {
value: value.id,
label: value.name,
};
array.push(obj);
});
PlaceOfPayList.value = array;
}
console.log("获取发薪地", PlaceOfPayList);
})
}
PlaceOfPayLista()
// //获取讲师发薪地列表
// const PlaceOfPayList = ref([
// // { value: 0, label: "发薪地B1" },
// ])
// const PlaceOfPayLista =() => {
// getPayRollPlace().then((res)=>{
// if (res.data.code === 200) {
// let arr = res.data.data;
// let array = [];
// arr.map((value) => {
// let obj = {
// value: value.id,
// label: value.name,
// };
// array.push(obj);
// });
// PlaceOfPayList.value = array;
// }
// console.log("获取发薪地", PlaceOfPayList);
// })
// }
// PlaceOfPayLista()
//状态
const AccountStatusList = ref([
{ value:"A10", label: "待审核", },
@@ -666,7 +624,6 @@ console.log( "讲师体系id" +val);
state.moreid=1
state.searchParam.certStatus=null
state.searchParam.salaryName=null
state.searchParam.payrollPlaceId=null
state.searchParam.status=null
}
}
@@ -861,7 +818,6 @@ console.log( "讲师体系id" +val);
courseType:null,
certStatus:null,
salaryName:null,
payrollPlaceId:null,
status:null,
pageNo: 1,
pageSize: 10 ,
@@ -1031,7 +987,7 @@ console.log( "讲师体系id" +val);
departId:null,
tsystemid:null,
levelId:null,
payrollPlaceId:null,
payrollPlaceName:null,
// 费用类型 : null
teacherpayrollPlace:null,
teachingDate:null,
@@ -1122,7 +1078,7 @@ console.log( "讲师体系id" +val);
departId: [{ required: true, message: '讲师组织不能为空' }],
systemId: [{ required: true, message: '讲师体系不能为空' }],
levelName: [{ required: true, message: ' 讲师级别 不能为空' }],
payrollPlaceId: [{ required: true, message: '讲师发薪地 不能为空' }],
payrollPlaceName: [{ required: true, message: '讲师发薪地 不能为空' }],
courseType: [{ required: true, message: '费用类型不能为空' }],
courseName: [{ required: true, message: '课程名称不能为空' }],
teachingDate: [{ required: true, message: '授课日期不能为空' }],
@@ -1353,7 +1309,7 @@ const column = ref([
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 : ""}&payrollPlaceId=${state.searchParam.payrollPlaceId ? state.searchParam.payrollPlaceId : ""}&status=${state.searchParam.status ? state.searchParam.status : ""}&beginTime=${state.searchParam.beginTime ? state.searchParam.beginTime : ""}&endTime=${state.searchParam.endTime ? state.searchParam.endTime : ""}`
}&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 : ""}`
);
// this.download('lesson_records/export', {
// ...state.searchParam
@@ -1403,18 +1359,14 @@ const column = ref([
managerChange,
courseTypeList,
// searchTimeChange,
trainOrglist,
trainOrglista,
getTeacherExpertiseList,
getTeacherExpertiseLista,
handlemoreid,
handleExport,
lecturerSystemList,
getLevelList,
OnTheJobStatusList,
PlaceOfPayLista,
// PlaceOfPayLista,
AuthenticationStatusList,
PlaceOfPayList,
// PlaceOfPayList,
AccountStatusList,
searchSubmit,
searchReset,