-
@@ -134,14 +134,14 @@ const addList = (item) => {
selectedRowKeys.value.push(item.id)
selectsData.value.push(item)
}
-const payableExpense = ref(0)
+const expense = ref(0)
watch(()=>selectsData.value.length,(val)=>{
if(val){
- payableExpense.value = selectsData.value.reduce((a,b)=>{
- return Number(a) + Number(b.payableExpense)
+ expense.value = selectsData.value.reduce((a,b)=>{
+ return Number(a) + Number(b.expense)
},0)
}else{
- payableExpense.value = 0
+ expense.value = 0
}
})
const removeList = (item) => {
diff --git a/src/components/project/LookExternalLecturer.vue b/src/components/project/LookExternalLecturer.vue
index 2952a66c..40f768be 100644
--- a/src/components/project/LookExternalLecturer.vue
+++ b/src/components/project/LookExternalLecturer.vue
@@ -1,7 +1,7 @@
-
+
选择讲师费汇总:{{payableExpense.toFixed(2)||0}}元
+ 选择讲师费汇总:{{expense.toFixed(2)||0}}元
diff --git a/src/components/project/LookInsideLecturer.vue b/src/components/project/LookInsideLecturer.vue
index 284efc38..989652e8 100644
--- a/src/components/project/LookInsideLecturer.vue
+++ b/src/components/project/LookInsideLecturer.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue
index 5af614ec..0fd39f33 100644
--- a/src/components/project/SearchTeacher.vue
+++ b/src/components/project/SearchTeacher.vue
@@ -158,6 +158,7 @@ const handleChange = (e,l) => {
// systemName.value = l.systemName
levelName.value = l.levelName
teacherId.value = l.key
+ byUserId(teacherId.value)
orgId.value = l.orgId
payrollPlaceCode.value = l.payrollPlaceCode
payrollPlaceName.value = l.payrollPlaceName
@@ -166,7 +167,7 @@ const handleChange = (e,l) => {
neworgName.value= neworgName.value[ neworgName.value.length-1]
}
changeValue.value = l
- emit('tlevel',l)
+ // emit('tlevel',l)
emit('tlevel',changeValue.value)
// selectData.value = teacherName.value
emit('update:value',selectData.value)
@@ -379,7 +380,7 @@ const notChange = () => {
payrollPlaceName.value = ''
}
const loadingChange = ref(false)
-watch(()=>teacherId.value,(val)=>{
+const byUserId = (val)=>{
if(val){
loadingChange.value = true
getSystemInfoByUserId(teacherId.value).then(res=>{
@@ -397,6 +398,7 @@ watch(()=>teacherId.value,(val)=>{
})
}
emit('update:system',systemName.value)
+ emit('byUserIdData',res.data?.data)
}
loadingChange.value = false
// emit('update:system',systemName.value)
@@ -405,7 +407,7 @@ watch(()=>teacherId.value,(val)=>{
loadingChange.value = false
})
}
-})
+}
const changeOut = () => {
if(!teacherName.value){
message.error('请选择讲师')
diff --git a/src/components/project/lockLecturer.vue b/src/components/project/lockLecturer.vue
index 9021b2c1..65ece596 100644
--- a/src/components/project/lockLecturer.vue
+++ b/src/components/project/lockLecturer.vue
@@ -7,6 +7,7 @@
class="drawerStyle impotergroupleader"
placement="right"
width="80%"
+ @close="closeDrawer"
>
+
diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue
index 982420a1..ffa71ada 100644
--- a/src/views/lecturer/ExternalTeaching.vue
+++ b/src/views/lecturer/ExternalTeaching.vue
@@ -105,7 +105,7 @@
handleLook(record, String(record.courseform))">查看
- handleModify(record, String(record.courseform))" v-if="record.createFrom == 1 && record.courseStatus == 0 ">编辑
+ handleModify(record, String(record.courseform))" v-if="record.createFrom == 1">编辑
deleteModal(record, String(record.courseform))">删除
@@ -204,17 +204,14 @@
-
+
-
+ -->
@@ -229,6 +226,10 @@
placeholder="请选择课程日期" />
+
+
+
+
@@ -248,9 +249,6 @@
0.00小时 -->
-
-
-
@@ -266,6 +264,10 @@
+
+
+
+
@@ -312,7 +314,7 @@
-
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index 66e29950..180d5409 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -799,7 +799,7 @@ export default {
dataIndex: 'tsystemName',
key: 'tsystemName',
ellipsis: true, align: "center",
- width: 120,
+ width: 200,
},
{
title: '级别 ',
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 4ac7288d..1278b48e 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -121,7 +121,7 @@
handleLook(record, String(record.courseform))">查看
handleModify(record, String(record.courseform))"
- v-if="record.createFrom == 1 && record.courseStatus == 0">编辑
+ v-if="record.createFrom == 1">编辑
deleteModal(record, String(record.courseform))">删除
@@ -299,14 +299,14 @@
-
+
@@ -325,10 +325,6 @@
0.00小时 -->
-
-
-
-
@@ -345,6 +341,10 @@
style="width:100%; height: 40px; border-radius: 8px ; " placeholder="请输入评分" />
+
+
+
+
@@ -389,7 +389,7 @@
-
@@ -756,7 +756,7 @@ export default {
dataIndex: 'tsystemName',
key: 'tsystemName',
ellipsis: true, align: "center",
- width: 120,
+ width: 200,
},
{
title: '培训发生组织 ',
@@ -944,7 +944,7 @@ export default {
trainOrgId: [{ required: true, message: '', log: '培训发生组织不能为空' }],
teachingDate: [{ required: true, message: '', log: '授课日期不能为空' }],
teaching: [{ required: true, message: '', log: '授课时长不能为空' }],
- courseStatus: [{ required: true, message: '', log: '开课状态不能为空' }],
+ // courseStatus: [{ required: true, message: '', log: '开课状态不能为空' }],
score: [{ required: true, message: '', log: '评分不能为空' }],
studys: [{ required: true, message: '', log: '参训人数不能为空' }],
}
diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue
index ec531af8..fae0ce32 100644
--- a/src/views/lecturer/LecturerAPPEdit.vue
+++ b/src/views/lecturer/LecturerAPPEdit.vue
@@ -837,6 +837,7 @@ export default {
}).then(res=>{
message.success('移除成功')
search()
+ state.formData.summaryTotal = Number(state.formData.summaryTotal) - Number(record.expense)
}).catch(err=>{
message.error(err.msg)
})
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 15226aae..915fbbeb 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -119,7 +119,7 @@
handleLook(record, String(record.courseform))">查看
- handleModify(record, String(record.courseform))">编辑
+ handleModify(record, String(record.courseform))">编辑
@@ -180,7 +180,7 @@
/>
讲师名称
-
@@ -912,7 +912,7 @@ getAllLevelList().then((res) => {
dataIndex: 'trainOrgName',
key: 'trainOrgName',
ellipsis: true, align: "center",
- width: 120,
+ width: 200,
},
{
@@ -1510,7 +1510,8 @@ getAllLevelList().then((res) => {
state.allFeedialog=true
}
const visibleAll = (val) => {
- state.allFeedialog = val
+ state.allFeedialog = val
+ searchSubmit()
}
const selectedRowKey = (val) => {
state.selectsIds = val?.join(',');
@@ -1708,12 +1709,19 @@ const column = ref([
])
const tlevelChange = (e) => {
- console.log(e,'eeeee')
state.formParam.tlevelName = e?.tlevelName
state.formParam.tlevelId = e?.tlevelId
// state.formParam.payrollPlace = e?.salaryName
// state.formParam.payrollPlaceId = e?.salaryId
- state.formParam.levelPay = e?.levelPay
+ // state.formParam.levelPay = e?.levelPay
+ }
+ const byUserIdData = (e) => {
+ e?.levelVoList.some(item=>{
+ if(item.id == e?.levelId){
+ state.formParam.levelPay = item.levelPay
+ return true
+ }
+ })
}
//导出功能
const handleExport = ()=>{
@@ -1817,6 +1825,7 @@ const column = ref([
column,
tableDatas,
tlevelChange,
+ byUserIdData,
validateField,
clearstudysNumber,
clearscoreNumber,
diff --git a/src/views/lecturer/LecturerFeeStatistics.vue b/src/views/lecturer/LecturerFeeStatistics.vue
index a38321aa..6669d8e5 100644
--- a/src/views/lecturer/LecturerFeeStatistics.vue
+++ b/src/views/lecturer/LecturerFeeStatistics.vue
@@ -168,6 +168,7 @@