hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-18 15:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

讲师管理bug

Browse Source
This commit is contained in:
zhangsir
2024-12-14 12:18:24 +08:00
parent f1ad9b18da
commit 31aea6411c
12 changed files with 591 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/project/BatchLecturer.vue
View File

@@ -224,12 +224,12 @@ const columns = [
key: 'expense', key: 'expense',
align: 'center', align: 'center',
}, },
{ // {
title: '应发费用', // title: '应发费用',
dataIndex: 'payableExpense', // dataIndex: 'payableExpense',
key: 'payableExpense', // key: 'payableExpense',
align: 'center', // align: 'center',
}, // },
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',

12
src/components/project/ConfirmLecturer.vue
View File

@@ -374,12 +374,12 @@ const columns = [
key: 'expense', key: 'expense',
align: 'center', align: 'center',
}, },
{ // {
title: '应发费用', // title: '应发费用',
dataIndex: 'payableExpense', // dataIndex: 'payableExpense',
key: 'payableExpense', // key: 'payableExpense',
align: 'center', // align: 'center',
}, // },
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',

2
src/components/project/LookExternalLecturer.vue
View File

@@ -22,7 +22,7 @@
<a-descriptions title="基本信息" style="padding:0 20px;" bordered :column="3" :contentStyle="rowCenters" :labelStyle="rowCenter"> <a-descriptions title="基本信息" style="padding:0 20px;" bordered :column="3" :contentStyle="rowCenters" :labelStyle="rowCenter">
<!-- 一层 --> <!-- 一层 -->
<a-descriptions-item label="讲师头像"> <a-image <a-descriptions-item label="讲师头像"> <a-image
:width="55" style="border-radius: 50%;" :width="55" style="border-radius: 50%;width:55px;height:55px;"
:src=formParam.photo :src=formParam.photo
/></a-descriptions-item> /></a-descriptions-item>
<a-descriptions-item label="讲师姓名">{{formParam.name||'-'}}</a-descriptions-item> <a-descriptions-item label="讲师姓名">{{formParam.name||'-'}}</a-descriptions-item>

2
src/components/project/LookInsideLecturer.vue
View File

@@ -20,7 +20,7 @@
<a-descriptions title="基本信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenters"> <a-descriptions title="基本信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenters">
<!-- 一层 --> <!-- 一层 -->
<a-descriptions-item label="讲师头像"> <a-descriptions-item label="讲师头像">
<a-image :width="55" style="border-radius: 50%;" :src=formParam.photo /> <a-image :width="55" style="border-radius: 50%;width:55px;height:55px;" :src=formParam.photo />
</a-descriptions-item> </a-descriptions-item>
<a-descriptions-item label="讲师姓名">{{formParam.name}}/{{formParam.userNo}}</a-descriptions-item> <a-descriptions-item label="讲师姓名">{{formParam.name}}/{{formParam.userNo}}</a-descriptions-item>
<a-descriptions-item label="讲师体系">{{formParam.tsystemName || '-'}}</a-descriptions-item> <a-descriptions-item label="讲师体系">{{formParam.tsystemName || '-'}}</a-descriptions-item>

12
src/components/project/SearchTeacher.vue
View File

@@ -441,13 +441,13 @@ const changeOut = () => {
left: 0px !important; left: 0px !important;
} }
.pover{ .pover{
// ::v-deep .ant-select-selector{ ::v-deep .ant-select-selector{
// height: 30px !important; height: 40px !important;
// border-radius: 4px !important; border-radius: 8px !important;
// line-height: 30px !important; line-height: 40px !important;
// } }
.search{ .search{
margin-top: 10px; // margin-top: 10px;
} }
.tree{ .tree{
margin-top: 5px; margin-top: 5px;

26
src/components/project/lockLecturer.vue
View File

@@ -67,9 +67,9 @@
</template> </template>
</a-table> </a-table>
</div> </div>
<div style="margin-bottom: 100px"> <!-- <div style="margin-bottom: 100px">
<a-table v-if="threeList" :columns="columnsThree" :loading="formData?.loadingThree" :data-source="formData?.tableDataThree" :pagination="false"/> <a-table v-if="threeList" :columns="columnsThree" :loading="formData?.loadingThree" :data-source="formData?.tableDataThree" :pagination="false"/>
</div> </div> -->
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</div> </div>
@@ -80,6 +80,11 @@
<button class="btn2" @click="confirm">撤销编辑内容</button> <button class="btn2" @click="confirm">撤销编辑内容</button>
</div> </div>
</div> </div>
<a-modal :footer="null" width="800px" v-model:visible="visibleModal" title="审批记录详情">
<div style="margin: 20px;padding-bottom: 20px;">
<a-table :columns="columnsThree" :loading="formData?.loadingThree" :data-source="formData?.tableDataThree" :pagination="false"/>
</div>
</a-modal>
</a-drawer> </a-drawer>
</template> </template>
@@ -99,6 +104,7 @@ const props = defineProps({
} }
}); });
const emit = defineEmits({}); const emit = defineEmits({});
const visibleModal = ref(false)
const columns = [ const columns = [
{ {
title: '组织的名称', title: '组织的名称',
@@ -250,9 +256,11 @@ const approvalData = ref(null)
const threeList = ref(false) const threeList = ref(false)
const lookList = (record) => { const lookList = (record) => {
console.log(record,'resssssss') console.log(record,'resssssss')
if(!threeList.value||record.approvalId!=approvalData.value){ // if(!threeList.value||record.approvalId!=approvalData.value){
threeList.value = true // threeList.value = true
approvalData.value = record.approvalId // approvalData.value = record.approvalId
formData.value.tableDataThree = []
visibleModal.value = true
formData.value.loadingThree = true formData.value.loadingThree = true
api.getApprovalResultByApprovalIdList(record.approvalId).then(res=>{ api.getApprovalResultByApprovalIdList(record.approvalId).then(res=>{
if(res.data.code == 200){ if(res.data.code == 200){
@@ -264,10 +272,10 @@ const lookList = (record) => {
formData.value.loadingThree = false formData.value.loadingThree = false
message.error(err.data.msg) message.error(err.data.msg)
}) })
}else{ // }else{
threeList.value = false // threeList.value = false
approvalData.value = null // approvalData.value = null
} // }
} }
const visible = ref(false); const visible = ref(false);
watch(visible, (val)=>{ watch(visible, (val)=>{

95
src/views/lecturer/ExternalTeaching.vue
View File

@@ -141,12 +141,20 @@
@click="cancelTeacherDialog" @click="cancelTeacherDialog"
/> />
</div> </div>
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef"> <a-form :model="formParam" layout="vertical" ref="formRef">
<!--讲师名称 teacherName 内容分类 coursetypeid --> <!--讲师名称 teacherName 内容分类 coursetypeid -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="teacherName"> <a-form-item name="teacherName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师名称
</template>
<ProjectManagerOutTeacher v-model:value="formParam.name" <ProjectManagerOutTeacher v-model:value="formParam.name"
v-model:name="formParam.teacherName" v-model:name="formParam.teacherName"
placeholder="请输入工号/讲师姓名进行检索" placeholder="请输入工号/讲师姓名进行检索"
@@ -157,7 +165,15 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="内容分类" name="courseTypeId"> <a-form-item name="courseTypeId">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
内容分类
</template>
<a-tree-select :fieldNames="{ <a-tree-select :fieldNames="{
children: 'children', children: 'children',
label: 'name', label: 'name',
@@ -174,7 +190,15 @@
<!-- 课程名称：name 开课状态 courseStatus--> <!-- 课程名称：name 开课状态 courseStatus-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课程名称" name="courseName"> <a-form-item name="courseName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
课程名称
</template>
<a-input class="draitem" v-model:value="formParam.courseName" :maxlength="20" showCount placeholder="请输入课程名称" @blur="sendName" allowClear showSearch> <a-input class="draitem" v-model:value="formParam.courseName" :maxlength="20" showCount placeholder="请输入课程名称" @blur="sendName" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
@@ -191,15 +215,31 @@
<!-- 授课日期 teachingDate 授课时长defaultTeachingTime--> <!-- 授课日期 teachingDate 授课时长defaultTeachingTime-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课/课程日期 :" name="teachingDate"> <a-form-item name="teachingDate">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
授课/课程日期 :
</template>
<a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD HH:mm" :show-time="{ format: 'HH:mm' }" <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD HH:mm" :show-time="{ format: 'HH:mm' }"
placeholder="请选择课程日期" /> placeholder="请选择课程日期" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课时长" name="teaching"> <a-form-item name="teaching">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
授课时长
</template>
<a-input v-model:value="formParam.teaching" style="width:100%; height: 40px; border-radius: 8px; " <a-input v-model:value="formParam.teaching" style="width:100%; height: 40px; border-radius: 8px; "
placeholder="0" allowClear showSearch suffix="分钟" placeholder="请输入授课时长" allowClear showSearch suffix="分钟"
:maxLength="8" @change="clearNonNumber"> :maxLength="8" @change="clearNonNumber">
</a-input> </a-input>
<!-- <span style="margin-left: 5px ;" v-if="formParam.teaching != null">{{ (formParam.teaching / 60 <!-- <span style="margin-left: 5px ;" v-if="formParam.teaching != null">{{ (formParam.teaching / 60
@@ -211,18 +251,34 @@
<!-- 参训人数 studys评分 score--> <!-- 参训人数 studys评分 score-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="参训人数" name="studys"> <a-form-item name="studys">
<a-input v-model:value="formParam.studys" class="draitem" placeholder="0 " allowClear showSearch :maxLength="8" <template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
参训人数
</template>
<a-input v-model:value="formParam.studys" class="draitem" placeholder="请输入参训人数" allowClear showSearch :maxLength="8"
@blur="clearstudysNumber"> @blur="clearstudysNumber">
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="评分" name="score"> <a-form-item name="score">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
评分
</template>
<!-- <a-input class="draitem" v-model:value="formParam.score" @blur="clearscoreNumber" placeholder="" allowClear showSearch> <!-- <a-input class="draitem" v-model:value="formParam.score" @blur="clearscoreNumber" placeholder="" allowClear showSearch>
</a-input> --> </a-input> -->
<a-input-number v-model:value="formParam.score" :precision="2" :min="0" :max="100" <a-input-number @blur="blurScore" @focus="focusScore" v-model:value="formParam.score" :precision="0" :min="0" :max="100"
style="width:100%; height: 40px; border-radius: 8px ; " /> style="width:100%; height: 40px; border-radius: 8px ; " placeholder="请输入评分" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
@@ -431,8 +487,8 @@ export default {
courseTypeId: [{ required: true, message: '', log: '内容分类不能为空' }], courseTypeId: [{ required: true, message: '', log: '内容分类不能为空' }],
courseName: [{ required: true, message: '', log: '课程名称不能为空' }], courseName: [{ required: true, message: '', log: '课程名称不能为空' }],
courseStatus: [{ required: true, message: '', log: '课程状态不能为空' }], courseStatus: [{ required: true, message: '', log: '课程状态不能为空' }],
teaching: [{ required: true, message: '', log: '授课时长不能为空' }],
teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }], teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }],
teaching: [{ required: true, message: '', log: '授课时长不能为空' }],
studys: [{ required: true, message: '', log: '参训人数不能为空' }], studys: [{ required: true, message: '', log: '参训人数不能为空' }],
score: [{ required: true, message: '', log: '评分不能为空' }], score: [{ required: true, message: '', log: '评分不能为空' }],
} }
@@ -766,8 +822,9 @@ export default {
} }
const formItemNames = Object.keys(rules); const formItemNames = Object.keys(rules);
for (let i = 0; i < formItemNames.length; i++) { for (let i = 0; i < formItemNames.length; i++) {
const result = await validateField(formItemNames[i]); // const result = await validateField(formItemNames[i]);
if (result) { const result = state.formParam[formItemNames[i]]
if (!result) {
return message.error(rules[formItemNames[i]][0].log) return message.error(rules[formItemNames[i]][0].log)
} }
} }
@@ -918,6 +975,12 @@ const enterPressHadlerSearch = e => {
const sendName=()=>{ const sendName=()=>{
state.formParam.courseName = state.formParam.courseName.replace(/\s/g, ''); state.formParam.courseName = state.formParam.courseName.replace(/\s/g, '');
} }
const blurScore = () => {
!state.formParam.score && (state.formParam.score = '0')
}
const focusScore = () => {
state.formParam.score == 0 && (state.formParam.score = null)
}
const sendRemark=()=>{ const sendRemark=()=>{
state.formParam.remark = state.formParam.remark.replace(/\s/g, ''); state.formParam.remark = state.formParam.remark.replace(/\s/g, '');
} }
@@ -926,6 +989,8 @@ const sendName=()=>{
rules, rules,
sendName, sendName,
sendRemark, sendRemark,
blurScore,
focusScore,
enterPressHadlerSearch, enterPressHadlerSearch,
treetype, treetype,
clearscoreNumber, clearscoreNumber,

129
src/views/lecturer/InsideTeaching.vue
View File

@@ -150,18 +150,34 @@
@click="cancelTeacherDialog" @click="cancelTeacherDialog"
/> />
</div> </div>
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef"> <a-form :model="formParam" layout="vertical" ref="formRef">
<!-- 讲师姓名 teacher 组织 orgName--> <!-- 讲师姓名 teacher 组织 orgName-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="name"> <a-form-item name="name">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师名称
</template>
<SearchTeacher @tlevel="tlevelChange" v-model:value="formParam.name" v-model:lable="formParam.orgNames" <SearchTeacher @tlevel="tlevelChange" v-model:value="formParam.name" v-model:lable="formParam.orgNames"
v-model:id="formParam.teacherId" v-model:system="tSystemNames" v-model:level="formParam.tlevelId"> v-model:id="formParam.teacherId" v-model:system="tSystemNames" v-model:level="formParam.tlevelId">
</SearchTeacher> </SearchTeacher>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师组织" name="orgName"> <a-form-item name="orgName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师组织
</template>
<a-popover> <a-popover>
<!-- <template #content> <!-- <template #content>
{{ formParam.orgNames }} {{ formParam.orgNames }}
@@ -177,14 +193,30 @@
<!-- 讲师体系 tsystemName 级别 tlevelId --> <!-- 讲师体系 tsystemName 级别 tlevelId -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师体系" name="tsystemName"> <a-form-item name="tsystemName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师体系
</template>
<a-input disabled v-model:value="tSystemNames.systemName" class="draitem" placeholder="自动带出讲师的体系" allowClear <a-input disabled v-model:value="tSystemNames.systemName" class="draitem" placeholder="自动带出讲师的体系" allowClear
showSearch> showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师级别" name="tlevelName"> <a-form-item name="tlevelName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师级别
</template>
<a-input disabled v-model:value="formParam.tlevelName" class="draitem" placeholder="自动带出讲师级别" allowClear <a-input disabled v-model:value="formParam.tlevelName" class="draitem" placeholder="自动带出讲师级别" allowClear
showSearch> showSearch>
</a-input> </a-input>
@@ -194,7 +226,15 @@
<!-- 内容分类 courseTypeId 课程名称 name --> <!-- 内容分类 courseTypeId 课程名称 name -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="内容分类" name="courseTypeId"> <a-form-item name="courseTypeId">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
内容分类
</template>
<a-tree-select :fieldNames="{ <a-tree-select :fieldNames="{
children: 'children', children: 'children',
label: 'name', label: 'name',
@@ -207,7 +247,15 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课程名称：" name="courseName"> <a-form-item name="courseName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
课程名称：
</template>
<a-input class="draitem" v-model:value="formParam.courseName" placeholder="请输入课程名称" allowClear showSearch <a-input class="draitem" v-model:value="formParam.courseName" placeholder="请输入课程名称" allowClear showSearch
:maxlength="20" showCount @blur="sendName"> :maxlength="20" showCount @blur="sendName">
</a-input> </a-input>
@@ -217,7 +265,15 @@
<!-- 授课日期 teachingDate 开课状态 courseStatus --> <!-- 授课日期 teachingDate 开课状态 courseStatus -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="培训发生组织" name="trainOrgId"> <a-form-item name="trainOrgId">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
培训发生组织
</template>
<a-select v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" allowClear <a-select v-model:value="formParam.trainOrgId" placeholder="请选择培训发生组织" allowClear
:options="orgList" @change="changeOrg"> :options="orgList" @change="changeOrg">
</a-select> </a-select>
@@ -225,7 +281,15 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课/课程日期 :" name="teachingDate"> <a-form-item name="teachingDate">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
授课/课程日期 :
</template>
<a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD HH:mm" <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" format="YYYY-MM-DD HH:mm"
:show-time="{ format: 'HH:mm' }" type="datetime" placeholder="请选择课程日期" /> :show-time="{ format: 'HH:mm' }" type="datetime" placeholder="请选择课程日期" />
</a-form-item> </a-form-item>
@@ -243,7 +307,15 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课时长" name="teaching"> <a-form-item name="teaching">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
授课时长
</template>
<a-input v-model:value="formParam.teaching" style="width:100%; height: 40px; border-radius: 8px ; " <a-input v-model:value="formParam.teaching" style="width:100%; height: 40px; border-radius: 8px ; "
placeholder="请输入授课时长" allowClear showSearch suffix="分钟" :maxLength="8" @blur="clearNonNumber"> placeholder="请输入授课时长" allowClear showSearch suffix="分钟" :maxLength="8" @blur="clearNonNumber">
</a-input> </a-input>
@@ -257,15 +329,31 @@
<!-- 参训人数 studys--> <!-- 参训人数 studys-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="评分" name="score"> <a-form-item name="score">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
评分
</template>
<!-- <a-input class="draitem" v-model:value="formParam.score" @blur="clearscoreNumber" placeholder="" allowClear showSearch> <!-- <a-input class="draitem" v-model:value="formParam.score" @blur="clearscoreNumber" placeholder="" allowClear showSearch>
</a-input> --> </a-input> -->
<a-input-number v-model:value="formParam.score" :precision="2" :min="0" :max="100" <a-input-number @blur="blurScore" @focus="focusScore" v-model:value="formParam.score" :precision="0" :min="0" :max="100"
style="width:100%; height: 40px; border-radius: 8px ; " placeholder="请输入评分" /> style="width:100%; height: 40px; border-radius: 8px ; " placeholder="请输入评分" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="参训人数" name="studys"> <a-form-item name="studys">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
参训人数
</template>
<a-input v-model:value="formParam.studys" class="draitem" placeholder="请输入参训人数" :maxLength="8" <a-input v-model:value="formParam.studys" class="draitem" placeholder="请输入参训人数" :maxLength="8"
@blur="clearstudysNumber" allowClear showSearch> @blur="clearstudysNumber" allowClear showSearch>
</a-input> </a-input>
@@ -845,7 +933,7 @@ export default {
tsystemName: [{ required: true, message: '', log: '讲师体系不能为空' }], tsystemName: [{ required: true, message: '', log: '讲师体系不能为空' }],
courseTypeId: [{ required: true, message: '', log: '内容分类不能为空' }], courseTypeId: [{ required: true, message: '', log: '内容分类不能为空' }],
courseName: [{ required: true, message: '', log: '课程名称不能为空' }], courseName: [{ required: true, message: '', log: '课程名称不能为空' }],
trainOrgId: [{ required: true, message: '', log: '课程归属组织不能为空' }], trainOrgId: [{ required: true, message: '', log: '培训发生组织不能为空' }],
teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }], teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }],
teaching: [{ required: true, message: '', log: '授课时长不能为空' }], teaching: [{ required: true, message: '', log: '授课时长不能为空' }],
courseStatus: [{ required: true, message: '', log: '开课状态不能为空' }], courseStatus: [{ required: true, message: '', log: '开课状态不能为空' }],
@@ -1001,8 +1089,9 @@ export default {
} }
const formItemNames = Object.keys(rules); const formItemNames = Object.keys(rules);
for (let i = 0; i < formItemNames.length; i++) { for (let i = 0; i < formItemNames.length; i++) {
const result = await validateField(formItemNames[i]); // const result = await validateField(formItemNames[i]);
if (result) { const result = state.formParam[formItemNames[i]]
if (!result) {
return message.error(rules[formItemNames[i]][0].log) return message.error(rules[formItemNames[i]][0].log)
} }
} }
@@ -1302,6 +1391,12 @@ export default {
const clearscoreNumber = () => { const clearscoreNumber = () => {
state.formParam.score = state.formParam.score.replace(/\D/g, ''); state.formParam.score = state.formParam.score.replace(/\D/g, '');
} }
const blurScore = () => {
!state.formParam.score && (state.formParam.score = '0')
}
const focusScore = () => {
state.formParam.score == 0 && (state.formParam.score = null)
}
const clearstudysNumber = () => { const clearstudysNumber = () => {
state.formParam.studys = state.formParam.studys.replace(/\D/g, ''); state.formParam.studys = state.formParam.studys.replace(/\D/g, '');
} }
@@ -1331,6 +1426,8 @@ export default {
clearNonNumber, clearNonNumber,
clearscoreNumber, clearscoreNumber,
clearstudysNumber, clearstudysNumber,
blurScore,
focusScore,
beforeUpload2, beforeUpload2,
rules, rules,
orgListDatas, orgListDatas,

189
src/views/lecturer/LecturerAPPEdit.vue
View File

@@ -13,7 +13,7 @@
<div class="content"> <div class="content">
<div class="title"> <div class="title">
<div class="line"></div> <div class="line"></div>
<div class="text">汇总信息</div> <div class="text">基本信息</div>
</div> </div>
<div class="desc"> <div class="desc">
<a-descriptions :column="2" bordered> <a-descriptions :column="2" bordered>
@@ -84,18 +84,34 @@
@click="cancelTeacherDialog" @click="cancelTeacherDialog"
/> />
</div> </div>
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef" > <a-form :model="formParam" layout="vertical" ref="formRef" >
<!-- 讲师姓名 name 讲师工号 userNo--> <!-- 讲师姓名 name 讲师工号 userNo-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="name"> <a-form-item name="name">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师名称
</template>
<SearchTeacher :disabled="true" @tlevel="tlevelChange" v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgNames" v-model:user="formParam.userNo" <SearchTeacher :disabled="true" @tlevel="tlevelChange" v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgNames" v-model:user="formParam.userNo"
v-model:system="tSystemNames" v-model:payrollPlaceCode="formParam.payrollPlaceId" v-model:system="tSystemNames" v-model:payrollPlaceCode="formParam.payrollPlaceId"
v-model:payrollPlaceName="formParam.payrollPlace" ></SearchTeacher> v-model:payrollPlaceName="formParam.payrollPlace" ></SearchTeacher>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师工号" name="userNo"> <a-form-item name="userNo">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师工号
</template>
<a-input class="draitem" v-model:value="formParam.userNo" disabled <a-input class="draitem" v-model:value="formParam.userNo" disabled
placeholder="请输入讲师工号" allowClear showSearch> placeholder="请输入讲师工号" allowClear showSearch>
</a-input> </a-input>
@@ -105,7 +121,15 @@
<!-- 讲师组织 departId 讲师体系 systemId --> <!-- 讲师组织 departId 讲师体系 systemId -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师组织" name="orgName"> <a-form-item name="orgName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师组织
</template>
<!-- <a-popover> <!-- <a-popover>
<template #content> <template #content>
{{ formParam.orgNames }} {{ formParam.orgNames }}
@@ -118,7 +142,15 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师体系" name="tsystemName"> <a-form-item name="tsystemName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师体系
</template>
<!-- <a-select class="draitem" v-model:value="formParam.tsystemName" placeholder="请选择讲师体系" allowClear <!-- <a-select class="draitem" v-model:value="formParam.tsystemName" placeholder="请选择讲师体系" allowClear
@change="changetlevel" .:options="LecturerSystemList"> @change="changetlevel" .:options="LecturerSystemList">
</a-select> --> </a-select> -->
@@ -131,14 +163,30 @@
<!-- 讲师级别 levelId 讲师发薪地 payrollPlaceName--> <!-- 讲师级别 levelId 讲师发薪地 payrollPlaceName-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师级别" name="tlevelName"> <a-form-item name="tlevelName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师级别
</template>
<a-input disabled v-model:value="formParam.tlevelName" class="draitem" <a-input disabled v-model:value="formParam.tlevelName" class="draitem"
placeholder="自动带出讲师级别" allowClear showSearch> placeholder="自动带出讲师级别" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师发薪地" name="payrollPlace"> <a-form-item name="payrollPlace">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师发薪地
</template>
<a-input disabled v-model:value="formParam.payrollPlace" class="draitem" <a-input disabled v-model:value="formParam.payrollPlace" class="draitem"
placeholder="自动带出讲师发薪地" allowClear showSearch > placeholder="自动带出讲师发薪地" allowClear showSearch >
</a-input> </a-input>
@@ -148,14 +196,30 @@
<!-- 费用类型 课程名称 courseName--> <!-- 费用类型 课程名称 courseName-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="费用类型" name="courseType"> <a-form-item name="courseType">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
费用类型
</template>
<a-select class="draitem" v-model:value="formParam.courseType" placeholder="请选择费用类型" <a-select class="draitem" v-model:value="formParam.courseType" placeholder="请选择费用类型"
:options="courseTypeList"> :options="courseTypeList">
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课程名称" name="courseName"> <a-form-item name="courseName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
课程名称
</template>
<!-- <a-radio-group v-model:value="formParam.courseName"> <!-- <a-radio-group v-model:value="formParam.courseName">
<a-radio :value="0">面授课</a-radio> <a-radio :value="0">面授课</a-radio>
<a-radio :value="1">在线课</a-radio> <a-radio :value="1">在线课</a-radio>
@@ -171,7 +235,15 @@
<!-- 授课日期 teachingDate 授课时长 teachingTime --> <!-- 授课日期 teachingDate 授课时长 teachingTime -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="培训发生组织" name="trainOrgId"> <a-form-item name="trainOrgId">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
培训发生组织
</template>
<!-- <OrgClass <!-- <OrgClass
v-model:value="formParam.sourceBelongId" v-model:value="formParam.sourceBelongId"
v-model:name="formParam.sourceBelongFullName" v-model:name="formParam.sourceBelongFullName"
@@ -182,7 +254,15 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课/课程日期 :" name="teachingDate"> <a-form-item name="teachingDate">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
授课/课程日期 :
</template>
<a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm" <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
placeholder="请选择课程日期" /> placeholder="请选择课程日期" />
</a-form-item> </a-form-item>
@@ -191,17 +271,33 @@
<!-- 参训人数 studys 评分 score --> <!-- 参训人数 studys 评分 score -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课时长" name="teachingTime"> <a-form-item name="teachingTime">
<a-input v-model:value="formParam.teachingTime" style="width:80%; height: 40px; border-radius: 8px; " <template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
授课时长
</template>
<a-input v-model:value="formParam.teachingTime" style="width:100%; height: 40px; border-radius: 8px; "
@change="clearNonNumber" placeholder="请输入授课分钟数" allowClear showSearch suffix="分钟"> @change="clearNonNumber" placeholder="请输入授课分钟数" allowClear showSearch suffix="分钟">
</a-input> </a-input>
<span style="margin-left: 5px ;" v-if="formParam.teachingTime != null">{{ <!-- <span style="margin-left: 5px ;" v-if="formParam.teachingTime != null">{{
(formParam.teachingTime / 60).toFixed(2) }}小时</span> (formParam.teachingTime / 60).toFixed(2) }}小时</span>
<span style="margin-left: 5px ;" v-if="formParam.teachingTime == null">0.00小时</span> <span style="margin-left: 5px ;" v-if="formParam.teachingTime == null">0.00小时</span> -->
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="参训人数" name="studys"> <a-form-item name="studys">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
参训人数
</template>
<a-input v-model:value="formParam.studys" class="draitem" @change="clearstudysNumber" <a-input v-model:value="formParam.studys" class="draitem" @change="clearstudysNumber"
placeholder="请输入参训人数" allowClear showSearch > placeholder="请输入参训人数" allowClear showSearch >
</a-input> </a-input>
@@ -211,14 +307,30 @@
<!-- 课酬基准 计划费用 expense--> <!-- 课酬基准 计划费用 expense-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="评分" name="score"> <a-form-item name="score">
<a-input-number class="draitem" v-model:value="formParam.score" :defaultValue="null" :max="10" :controls="false" :min="0" :precision="2" placeholder="请输入评分" <template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
评分
</template>
<a-input-number class="draitem" v-model:value="formParam.score" :defaultValue="null" :max="100" :controls="false" :min="0" :precision="0" placeholder="请输入评分"
allowClear > allowClear >
</a-input-number> </a-input-number>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课酬基准" name="levelPay"> <a-form-item name="levelPay">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
课酬基准
</template>
<a-input-number v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）" :max="99999999" :controls="false" :min="0" :precision="2" <a-input-number v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）" :max="99999999" :controls="false" :min="0" :precision="2"
@change="clearlevelPayNumber" @change="clearlevelPayNumber"
allowClear showSearch class="draitem"> allowClear showSearch class="draitem">
@@ -229,19 +341,27 @@
<!-- 应发费用 --> <!-- 应发费用 -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="计划费用" name="expense"> <a-form-item name="expense">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
计划费用
</template>
<a-input class="draitem" v-model:value="formParam.expense" placeholder="自动计算（ 授课时长（或课程时长）*课酬基准 ）" allowClear disabled <a-input class="draitem" v-model:value="formParam.expense" placeholder="自动计算（ 授课时长（或课程时长）*课酬基准 ）" allowClear disabled
showSearch> showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-item label="应发费用" name="payableExpense"> <a-form-item label="应发费用" name="payableExpense">
<a-input-number :max="99999999" :controls="false" :min="0" :precision="2" v-model:value="formParam.payableExpense" class="draitem" <a-input-number :max="99999999" :controls="false" :min="0" :precision="2" v-model:value="formParam.payableExpense" class="draitem"
placeholder="请输入应发费用" @change="clearPayableExpense" allowClear> placeholder="请输入应发费用" @change="clearPayableExpense" allowClear>
</a-input-number> </a-input-number>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
</a-row> </a-row>
<!-- 备注 remark --> <!-- 备注 remark -->
<a-row :gutter="16"> <a-row :gutter="16">
@@ -566,8 +686,9 @@ export default {
} }
const formItemNames = Object.keys(rules); const formItemNames = Object.keys(rules);
for(let i=0;i<formItemNames.length;i++){ for(let i=0;i<formItemNames.length;i++){
const result = await validateField(formItemNames[i]); // const result = await validateField(formItemNames[i]);
if (result) { const result = state.formParam[formItemNames[i]]
if (!result) {
return message.error(rules[formItemNames[i]][0].log) return message.error(rules[formItemNames[i]][0].log)
} }
} }
@@ -632,7 +753,7 @@ export default {
score: [{ required: true, message:'',log: ' 评分不能为空' }], score: [{ required: true, message:'',log: ' 评分不能为空' }],
levelPay: [{ required: true, message:'',log: '课酬基准 不能为空' }], levelPay: [{ required: true, message:'',log: '课酬基准 不能为空' }],
expense: [{ required: true, message: '',log:'计划费用不能为空' }], expense: [{ required: true, message: '',log:'计划费用不能为空' }],
payableExpense: [{ required: true, message: '',log:'应发费用不能为空' }], // payableExpense: [{ required: true, message: '',log:'应发费用不能为空' }],
} }
const closeDrawer = () => { const closeDrawer = () => {
state.params.userNoName = null state.params.userNoName = null
@@ -858,14 +979,14 @@ export default {
align: "center", align: "center",
width: 160, width: 160,
}, },
{ // {
title: '应发费用 ', // title: '应发费用 ',
dataIndex: 'payableExpense', // dataIndex: 'payableExpense',
key: 'payableExpense', // key: 'payableExpense',
ellipsis: true, // ellipsis: true,
align: "center", // align: "center",
width: 160, // width: 160,
}, // },
{ {
title: '操作 ', title: '操作 ',
dataIndex: 'operation', dataIndex: 'operation',

2
src/views/lecturer/LecturerApproval.vue
View File

@@ -131,7 +131,7 @@
/> />
</div> </div>
<span class="line"></span> <span class="line"></span>
<span style="font-weight:600;">汇总信息</span> <span style="font-weight:600;">基本信息</span>
<a-descriptions style="margin-top:16px" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter"> <a-descriptions style="margin-top:16px" bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
<a-descriptions-item label="审批编号">{{formParam?.approvalNumber||'-'}}</a-descriptions-item> <a-descriptions-item label="审批编号">{{formParam?.approvalNumber||'-'}}</a-descriptions-item>
<a-descriptions-item label="培训发生组织">{{formParam?.trainOrgName||'-'}}</a-descriptions-item> <a-descriptions-item label="培训发生组织">{{formParam?.trainOrgName||'-'}}</a-descriptions-item>

173
src/views/lecturer/LecturerFee.vue
View File

@@ -166,18 +166,34 @@
@click="cancelTeacherDialog" @click="cancelTeacherDialog"
/> />
</div> </div>
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef" > <a-form :model="formParam" layout="vertical" ref="formRef" >
<!-- 讲师姓名 name 讲师工号 userNo--> <!-- 讲师姓名 name 讲师工号 userNo-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="name"> <a-form-item name="name">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师名称
</template>
<SearchTeacher :disabled="!!id" @tlevel="tlevelChange" v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgNames" v-model:user="formParam.userNo" <SearchTeacher :disabled="!!id" @tlevel="tlevelChange" v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgNames" v-model:user="formParam.userNo"
v-model:system="tSystemNames" v-model:payrollPlaceCode="formParam.payrollPlaceId" v-model:system="tSystemNames" v-model:payrollPlaceCode="formParam.payrollPlaceId"
v-model:payrollPlaceName="formParam.payrollPlace" ></SearchTeacher> v-model:payrollPlaceName="formParam.payrollPlace" ></SearchTeacher>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师工号" name="userNo"> <a-form-item name="userNo">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师工号
</template>
<a-input class="draitem" v-model:value="formParam.userNo" disabled <a-input class="draitem" v-model:value="formParam.userNo" disabled
placeholder="请输入讲师工号" allowClear showSearch> placeholder="请输入讲师工号" allowClear showSearch>
</a-input> </a-input>
@@ -187,7 +203,15 @@
<!-- 讲师组织 departId 讲师体系 systemId --> <!-- 讲师组织 departId 讲师体系 systemId -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师组织" name="orgName"> <a-form-item name="orgName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师组织
</template>
<!-- <a-popover> <!-- <a-popover>
<template #content> <template #content>
{{ formParam.orgNames }} {{ formParam.orgNames }}
@@ -200,7 +224,15 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师体系" name="tsystemName"> <a-form-item name="tsystemName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师体系
</template>
<!-- <a-select class="draitem" v-model:value="formParam.tsystemName" placeholder="请选择讲师体系" allowClear <!-- <a-select class="draitem" v-model:value="formParam.tsystemName" placeholder="请选择讲师体系" allowClear
@change="changetlevel" .:options="LecturerSystemList"> @change="changetlevel" .:options="LecturerSystemList">
</a-select> --> </a-select> -->
@@ -213,14 +245,30 @@
<!-- 讲师级别 levelId 讲师发薪地 payrollPlaceName--> <!-- 讲师级别 levelId 讲师发薪地 payrollPlaceName-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师级别" name="tlevelName"> <a-form-item name="tlevelName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师级别
</template>
<a-input disabled v-model:value="formParam.tlevelName" class="draitem" <a-input disabled v-model:value="formParam.tlevelName" class="draitem"
placeholder="自动带出讲师级别" allowClear showSearch> placeholder="自动带出讲师级别" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师发薪地" name="payrollPlace"> <a-form-item name="payrollPlace">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
讲师发薪地
</template>
<a-input disabled v-model:value="formParam.payrollPlace" class="draitem" <a-input disabled v-model:value="formParam.payrollPlace" class="draitem"
placeholder="自动带出讲师发薪地" allowClear showSearch > placeholder="自动带出讲师发薪地" allowClear showSearch >
</a-input> </a-input>
@@ -230,14 +278,30 @@
<!-- 费用类型 课程名称 courseName--> <!-- 费用类型 课程名称 courseName-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="费用类型" name="courseType"> <a-form-item name="courseType">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
费用类型
</template>
<a-select class="draitem" v-model:value="formParam.courseType" placeholder="请选择费用类型" <a-select class="draitem" v-model:value="formParam.courseType" placeholder="请选择费用类型"
:options="courseTypeList"> :options="courseTypeList">
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课程名称" name="courseName"> <a-form-item name="courseName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
课程名称
</template>
<!-- <a-radio-group v-model:value="formParam.courseName"> <!-- <a-radio-group v-model:value="formParam.courseName">
<a-radio :value="0">面授课</a-radio> <a-radio :value="0">面授课</a-radio>
<a-radio :value="1">在线课</a-radio> <a-radio :value="1">在线课</a-radio>
@@ -253,7 +317,15 @@
<!-- 授课日期 teachingDate 授课时长 teachingTime --> <!-- 授课日期 teachingDate 授课时长 teachingTime -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="培训发生组织" name="trainOrgId"> <a-form-item name="trainOrgId">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
培训发生组织
</template>
<!-- <OrgClass <!-- <OrgClass
v-model:value="formParam.sourceBelongId" v-model:value="formParam.sourceBelongId"
v-model:name="formParam.sourceBelongFullName" v-model:name="formParam.sourceBelongFullName"
@@ -264,7 +336,15 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课/课程日期 :" name="teachingDate"> <a-form-item name="teachingDate">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
授课/课程日期 :
</template>
<a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm" <a-date-picker class="draitem" v-model:value="teachingDate" style="width:100%" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
placeholder="请选择课程日期" @select="handleSelect" /> placeholder="请选择课程日期" @select="handleSelect" />
</a-form-item> </a-form-item>
@@ -273,17 +353,33 @@
<!-- 参训人数 studys 评分 score --> <!-- 参训人数 studys 评分 score -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="授课时长" name="teachingTime"> <a-form-item name="teachingTime">
<a-input v-model:value="formParam.teachingTime" style="width:80%; height: 40px; border-radius: 8px; " <template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
授课时长
</template>
<a-input v-model:value="formParam.teachingTime" style="width:100%; height: 40px; border-radius: 8px; "
@change="clearNonNumber" placeholder="请输入授课分钟数" allowClear showSearch suffix="分钟"> @change="clearNonNumber" placeholder="请输入授课分钟数" allowClear showSearch suffix="分钟">
</a-input> </a-input>
<span style="margin-left: 5px ;" v-if="formParam.teachingTime != null">{{ <!-- <span style="margin-left: 5px ;" v-if="formParam.teachingTime != null">{{
(formParam.teachingTime / 60).toFixed(2) }}小时</span> (formParam.teachingTime / 60).toFixed(2) }}小时</span>
<span style="margin-left: 5px ;" v-if="formParam.teachingTime == null">0.00小时</span> <span style="margin-left: 5px ;" v-if="formParam.teachingTime == null">0.00小时</span> -->
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="参训人数" name="studys"> <a-form-item name="studys">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
参训人数
</template>
<a-input v-model:value="formParam.studys" class="draitem" @change="clearstudysNumber" <a-input v-model:value="formParam.studys" class="draitem" @change="clearstudysNumber"
placeholder="请输入参训人数" allowClear showSearch > placeholder="请输入参训人数" allowClear showSearch >
</a-input> </a-input>
@@ -293,14 +389,30 @@
<!-- 课酬基准 计划费用 expense--> <!-- 课酬基准 计划费用 expense-->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="评分" name="score"> <a-form-item name="score">
<a-input-number class="draitem" v-model:value="formParam.score" :defaultValue="null" :max="10" :controls="false" :min="0" :precision="2" placeholder="请输入评分" <template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
评分
</template>
<a-input-number class="draitem" v-model:value="formParam.score" :defaultValue="null" :max="100" :controls="false" :min="0" :precision="0" placeholder="请输入评分"
allowClear @change="scoreNumber"> allowClear @change="scoreNumber">
</a-input-number> </a-input-number>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="课酬基准" name="levelPay"> <a-form-item name="levelPay">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
课酬基准
</template>
<a-input-number v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）" :max="99999999" :controls="false" :min="0" :precision="2" <a-input-number v-model:value="formParam.levelPay" placeholder="自动键入系统基准（可手动更改）" :max="99999999" :controls="false" :min="0" :precision="2"
@change="clearlevelPayNumber" @change="clearlevelPayNumber"
allowClear showSearch class="draitem"> allowClear showSearch class="draitem">
@@ -311,19 +423,27 @@
<!-- 应发费用 --> <!-- 应发费用 -->
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="计划费用" name="expense"> <a-form-item name="expense">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
计划费用
</template>
<a-input class="draitem" v-model:value="formParam.expense" placeholder="自动计算（ 授课时长（或课程时长）*课酬基准 ）" allowClear disabled <a-input class="draitem" v-model:value="formParam.expense" placeholder="自动计算（ 授课时长（或课程时长）*课酬基准 ）" allowClear disabled
showSearch> showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <!-- <a-col :span="12">
<a-form-item label="应发费用" name="payableExpense"> <a-form-item label="应发费用" name="payableExpense">
<a-input-number :max="99999999" :controls="false" :min="0" :precision="2" v-model:value="formParam.payableExpense" class="draitem" <a-input-number :max="99999999" :controls="false" :min="0" :precision="2" v-model:value="formParam.payableExpense" class="draitem"
placeholder="请输入应发费用" @change="clearPayableExpense" allowClear> placeholder="请输入应发费用" @change="clearPayableExpense" allowClear>
</a-input-number> </a-input-number>
</a-form-item> </a-form-item>
</a-col> </a-col> -->
</a-row> </a-row>
<!-- 备注 remark --> <!-- 备注 remark -->
<a-row :gutter="16"> <a-row :gutter="16">
@@ -408,7 +528,7 @@
<a-descriptions-item label="评分 ">{{formParam.score || '-'}}</a-descriptions-item> <a-descriptions-item label="评分 ">{{formParam.score || '-'}}</a-descriptions-item>
<a-descriptions-item label="课酬基准 ">{{formParam.levelPay || '-'}}</a-descriptions-item> <a-descriptions-item label="课酬基准 ">{{formParam.levelPay || '-'}}</a-descriptions-item>
<a-descriptions-item label="计划费用 ">{{formParam.expense || '-'}}</a-descriptions-item> <a-descriptions-item label="计划费用 ">{{formParam.expense || '-'}}</a-descriptions-item>
<a-descriptions-item label="应发费用 ">{{formParam.payableExpense || '-'}}</a-descriptions-item> <!-- <a-descriptions-item label="应发费用 ">{{formParam.payableExpense || '-'}}</a-descriptions-item> -->
<!-- <a-descriptions-item label="费用发放时间">{{formParam.payableExpenseTime || '-'}}</a-descriptions-item> --> <!-- <a-descriptions-item label="费用发放时间">{{formParam.payableExpenseTime || '-'}}</a-descriptions-item> -->
<a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item> <a-descriptions-item label="状态">{{{0:'待确认' ,1:'待提交' ,2:'审核中', 3:'已完成', 4:'拒绝',5:'待提交'}[formParam?.status]}}</a-descriptions-item>
<a-descriptions-item label="备注 ">{{formParam.remark || '-'}}</a-descriptions-item> <a-descriptions-item label="备注 ">{{formParam.remark || '-'}}</a-descriptions-item>
@@ -1075,8 +1195,9 @@ getAllLevelList().then((res) => {
} }
const formItemNames = Object.keys(rules); const formItemNames = Object.keys(rules);
for(let i=0;i<formItemNames.length;i++){ for(let i=0;i<formItemNames.length;i++){
const result = await validateField(formItemNames[i]); // const result = await validateField(formItemNames[i]);
if (result) { const result = state.formParam[formItemNames[i]]
if (!result) {
return message.error(rules[formItemNames[i]][0].log) return message.error(rules[formItemNames[i]][0].log)
} }
} }
@@ -1375,7 +1496,7 @@ getAllLevelList().then((res) => {
score: [{ required: true, message:'',log: ' 评分不能为空' }], score: [{ required: true, message:'',log: ' 评分不能为空' }],
levelPay: [{ required: true, message:'',log: '课酬基准不能为空' }], levelPay: [{ required: true, message:'',log: '课酬基准不能为空' }],
expense: [{ required: true, message: '',log:'计划费用不能为空' }], expense: [{ required: true, message: '',log:'计划费用不能为空' }],
payableExpense: [{ required: true, message: '',log:'应发费用不能为空' }], // payableExpense: [{ required: true, message: '',log:'应发费用不能为空' }],
} }
const handleImport = () => { const handleImport = () => {

67
src/views/lecturer/Organization.vue
View File

@@ -97,7 +97,7 @@
@click="cancelTeacherDialog" @click="cancelTeacherDialog"
/> />
</div> </div>
<a-form :model="formParam" :rules="rules" layout="vertical" ref="formRef"> <a-form :model="formParam" layout="vertical" ref="formRef">
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="24"> <a-col :span="24">
<!-- <span class="line"></span><span>讲师体系基本信息</span> --> <!-- <span class="line"></span><span>讲师体系基本信息</span> -->
@@ -105,14 +105,30 @@
</a-row> </a-row>
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="培训发生组织编号：" name="affiliationCode"> <a-form-item name="affiliationCode">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
培训发生组织编号：
</template>
<a-input disabled v-model:value="formParam.affiliationCode" class="draitem" <a-input disabled v-model:value="formParam.affiliationCode" class="draitem"
placeholder="请输入讲师体系编号" allowClear showSearch> placeholder="请输入讲师体系编号" allowClear showSearch>
</a-input> </a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="培训发生组织名称：" name="affiliationName"> <a-form-item name="affiliationName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
培训发生组织名称：
</template>
<a-input :maxlength="30" show-count v-model:value="formParam.affiliationName" class="draitem" <a-input :maxlength="30" show-count v-model:value="formParam.affiliationName" class="draitem"
placeholder="请输入培训发生组织名称" allowClear showSearch> placeholder="请输入培训发生组织名称" allowClear showSearch>
</a-input> </a-input>
@@ -121,7 +137,15 @@
</a-row> </a-row>
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="是否为根节点：" name="code"> <a-form-item name="code">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
是否为根节点：
</template>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<a-radio-group style="min-width:126px;" @change="selectRadio" v-model:value="formParam.isParent" name="radioGroup"> <a-radio-group style="min-width:126px;" @change="selectRadio" v-model:value="formParam.isParent" name="radioGroup">
<a-radio :value="1">否</a-radio> <a-radio :value="1">否</a-radio>
@@ -133,7 +157,15 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="组织担当：" name="actValue"> <a-form-item name="actValue">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
组织担当：
</template>
<!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择组织负责人" <!-- <a-select v-model:value="formParam.zzfzr" placeholder="请选择组织负责人"
:options="PlaceOfPayList" allowClear showSearch/> --> :options="PlaceOfPayList" allowClear showSearch/> -->
<!-- <ProjectManager :type="0" v-model:value="formParam.actValue" :placeholder="'请选择担当'" v-model:arrayList="formParam.actArray" ></ProjectManager> --> <!-- <ProjectManager :type="0" v-model:value="formParam.actValue" :placeholder="'请选择担当'" v-model:arrayList="formParam.actArray" ></ProjectManager> -->
@@ -145,7 +177,15 @@
</a-row> </a-row>
<a-row :gutter="16" v-if="formParam.isParent"> <a-row :gutter="16" v-if="formParam.isParent">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="一级审批人" name="leveOneValue"> <a-form-item name="leveOneValue">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
一级审批人
</template>
<!-- <a-select v-model:value="formParam.yjspr" placeholder="请选择一级审批人" <!-- <a-select v-model:value="formParam.yjspr" placeholder="请选择一级审批人"
:options="PlaceOfPayList" allowClear showSearch/> --> :options="PlaceOfPayList" allowClear showSearch/> -->
<!-- <ProjectManager :type="1" v-model:value="formParam.leveOneValue" :placeholder="'请选择一级审批人'" v-model:arrayList="formParam.leveOneArray" ></ProjectManager> --> <!-- <ProjectManager :type="1" v-model:value="formParam.leveOneValue" :placeholder="'请选择一级审批人'" v-model:arrayList="formParam.leveOneArray" ></ProjectManager> -->
@@ -183,7 +223,15 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-form-item label="选择管理组织" name="orglistName"> <a-form-item name="orglistName">
<template v-slot:label>
<img
style="margin-right:4px;width: 7px;height: 7px"
src="@/assets/images/coursewareManage/asterisk.png"
alt=""
/>
选择管理组织
</template>
<a-row :gutter="50" style="margin-bottom: 10px;"> <a-row :gutter="50" style="margin-bottom: 10px;">
<a-col :span="2"> <a-col :span="2">
<!-- <a-tag color="blue" style="line-height: 40px; ">管理业务</a-tag> --> <!-- <a-tag color="blue" style="line-height: 40px; ">管理业务</a-tag> -->
@@ -676,8 +724,9 @@ const getTableDate = (obj) => {
state.formParam.orglistName = state.formParam.affiliationOrgList?.map(item=>item.id).join(',') state.formParam.orglistName = state.formParam.affiliationOrgList?.map(item=>item.id).join(',')
const formItemNames = Object.keys(rules); const formItemNames = Object.keys(rules);
for(let i=0;i<formItemNames.length;i++){ for(let i=0;i<formItemNames.length;i++){
const result = await validateField(formItemNames[i]); // const result = await validateField(formItemNames[i]);
if (result) { const result = state.formParam[formItemNames[i]]
if (!result) {
if(formItemNames[i]=='code' && !state.formParam.isParent){ if(formItemNames[i]=='code' && !state.formParam.isParent){
return message.error(rules[formItemNames[i]][0].log2) return message.error(rules[formItemNames[i]][0].log2)
}else{ }else{