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

Merge branch 'master_20250318-lyc' into test20250220

Browse Source 
# Conflicts:
#	src/views/courselibrary/CoursewareManage.vue
This commit is contained in:
joshen
2025-03-20 09:23:11 +08:00
parent 372de0dc6d c1e56d56f8
commit f5bd93571d
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/courselibrary/CoursewareManage.vue
View File

@@ -3474,7 +3474,9 @@ function onFocusEnd(){
}; };
const logT = () => { const logT = () => {
state.examInfo = {}; state.examInfo = {};
state.EditTestId = null; state.EditTestId = null; // 新增
state.assessmentId = null; // 新增
state.assessmentName = ""; // 新增
}; };
const removePG = () => { const removePG = () => {
console.log("11111"); console.log("11111");
@@ -3929,7 +3931,6 @@ function onFocusEnd(){
// handleRestTable(); // handleRestTable();
}; };
const createkk = () => { const createkk = () => {
//todo 创建开课
state.xjkkinputV1 = state.newCourseName state.xjkkinputV1 = state.newCourseName
state.offcoursePlanId = null; state.offcoursePlanId = null;
state.itemType = 3; state.itemType = 3;
@@ -3941,9 +3942,6 @@ function onFocusEnd(){
}] }]
state.changeName = true state.changeName = true
state.xjkkinputV3 = [moment().format('YYYY-MM-DD HH:mm'),''] state.xjkkinputV3 = [moment().format('YYYY-MM-DD HH:mm'),'']
state.examInfo = {};
//清除缓存
state.cstm_hs = true; state.cstm_hs = true;
}; };
const handleCancelStu = () => { const handleCancelStu = () => {
@@ -3979,8 +3977,6 @@ function onFocusEnd(){
//保存开课 //保存开课
const handleSureStu = async () => { const handleSureStu = async () => {
console.log("编辑的状况 state.kk_eidt",state.kk_eidt)
console.log("编辑的状况 state.examInfo",state.examInfo)
if(editBeginClass.value){ if(editBeginClass.value){
message.info('讲师费已进入审批阶段，无法编辑') message.info('讲师费已进入审批阶段，无法编辑')
return return
@@ -4007,7 +4003,7 @@ function onFocusEnd(){
let t = state.signCom ? "1," : "0,"; let t = state.signCom ? "1," : "0,";
let p = state.comLeave ? "1" : "0"; let p = state.comLeave ? "1" : "0";
let type = t.concat(p); let type = t.concat(p);
let postData = { const postData = {
offcourseId: state.offcourseId, offcourseId: state.offcourseId,
id: state.offcoursePlanId, //开课ID,不传代表新增 id: state.offcoursePlanId, //开课ID,不传代表新增
address: state.xjkkinputV2, address: state.xjkkinputV2,
@@ -4124,7 +4120,6 @@ function onFocusEnd(){
let editBeginClass = ref(false) let editBeginClass = ref(false)
//编辑开课 //编辑开课
const handelEditStu = async (item) => { const handelEditStu = async (item) => {
console.log("gx handelEditStu item",item)
nums.value = 0 nums.value = 0
editBeginClass.value = false editBeginClass.value = false
if (item.expenseStatus && item.expenseStatus !== 'A10' && item.expenseStatus !== 'S00') { if (item.expenseStatus && item.expenseStatus !== 'A10' && item.expenseStatus !== 'S00') {
@@ -4143,7 +4138,6 @@ function onFocusEnd(){
if (item.testId) { if (item.testId) {
queryExaminationDetailById({ examinationId: item.testId }).then( queryExaminationDetailById({ examinationId: item.testId }).then(
(res) => (state.examInfo = res.data.data) (res) => (state.examInfo = res.data.data)
); );
} }
// if(item.evalFlag){ // if(item.evalFlag){

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

@@ -508,7 +508,7 @@
<!-- <a-descriptions-item <!-- <a-descriptions-item
label="评分 ">{{ formParam.score ? Number(formParam.score).toFixed(0) == 0 ? '-' : Number(formParam.score).toFixed(2) + '分' : '-' label="评分 ">{{ formParam.score ? Number(formParam.score).toFixed(0) == 0 ? '-' : Number(formParam.score).toFixed(2) + '分' : '-'
}}</a-descriptions-item>--> }}</a-descriptions-item>-->
<a-descriptions-item label="评分 ">{{formParam.score +'分' }}</a-descriptions-item> <a-descriptions-item label="评分 ">{{formParam.score }}</a-descriptions-item>
<a-descriptions-item label="基准课酬 ">{{ formParam.levelPay || formParam.levelPay == 0 ? formParam.levelPay + '元' : <a-descriptions-item label="基准课酬 ">{{ formParam.levelPay || formParam.levelPay == 0 ? formParam.levelPay + '元' :
'-'}}</a-descriptions-item> '-'}}</a-descriptions-item>
<a-descriptions-item label="计划费用 ">{{ formParam.expense ? formParam.expense + '元' : '-' }}</a-descriptions-item> <a-descriptions-item label="计划费用 ">{{ formParam.expense ? formParam.expense + '元' : '-' }}</a-descriptions-item>