diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue index 8a8dc4b..cdc20f0 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue @@ -263,6 +263,7 @@ for(var i=0;i - + @@ -46,7 +46,7 @@ import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods'; import { queryWjxWjxxTmxxListByMainId, queryDataById, saveOrUpdate } from '../WjxWjxxTmlb.api'; import { JVxeTable } from '/@/components/jeecg/JVxeTable'; - import {wjxWjxxTmxxColumns} from '../WjxWjxxTmlb.data'; + import {wjxWjxxTmxxColumns,wjxWjdcColumns} from '../WjxWjxxTmlb.data'; import { Form } from 'ant-design-vue'; const useForm = Form.useForm; @@ -67,11 +67,6 @@ setup(props, {emit}) { const loading = ref(false); const wjxWjxxTmxxTableRef = ref(); - const wjxWjxxTmxxTable = reactive>({ - loading: false, - columns: wjxWjxxTmxxColumns, - dataSource: [] - }); const activeKey = ref('wjxWjxxTmxx'); const formData = reactive>({ id: '', @@ -79,6 +74,12 @@ wjScore: '', }); + console.log(`🚀 ~ setup ~ formData.wjLeixing:`, formData.wjLeixing) + const wjxWjxxTmxxTable = reactive>({ + loading: false, + columns: formData.wjLeixing=='1'?wjxWjdcColumns:wjxWjxxTmxxColumns, + dataSource: [] + }); //表单验证 const validatorRules = reactive({ }); diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue index faf7789..d866283 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue @@ -123,7 +123,7 @@ const baseApiUrl = globSetting.domainUrl; //教学大纲提交附件 function jxdgChange(record){ console.log(`🚀 ~ jxdgChange ~ record:`, record) - var model = {id:jxdgInfo.value.id,filePath:record,rwbh:rwbh,xqxn:xqxn} + var model = {id:jxdgInfo.value.id,filePath:record,rwbh,xqxn} defHttp.post({ url: '/zyJxdg/zyJxdg/jxdgScfj', params: model }).then((res) => { getKcjsJxdg(); }); @@ -131,7 +131,7 @@ const baseApiUrl = globSetting.domainUrl; function jxrlChange(record){ console.log(`🚀 ~ jxdgChange ~ record:`, record) - var model = {id:jxdgInfo.value.id,jxrlFilePath:record,rwbh,xqxn:xqxn} + var model = {id:jxdgInfo.value.id,jxrlFilePath:record,rwbh,xqxn} defHttp.post({ url: '/zyJxdg/zyJxdg/jxrlScfj', params: model }).then((res) => { getKcjsJxdg(); }); diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue index abfe4fd..c677ba5 100644 --- a/src/views/zy/zyInfo/StudentZyInfoList.vue +++ b/src/views/zy/zyInfo/StudentZyInfoList.vue @@ -154,19 +154,19 @@ const baseApiUrl = globSetting.domainUrl; let timestamp = new Date().getTime(); let startTimestamp = Date.parse(record.startTime); if(timestampendTimestamp){ - createMessage.error('答卷时间已过!'); + createMessage.error('提交作业时间已过!'); return; } createConfirm({ iconType: 'warning', title: '确认上传', - content: '是否确认上传作业', + content: '作业上传后,不可修改,请仔细检查后提交', okText: '确认', cancelText: '取消', onOk: () => { diff --git a/src/views/zy/zyInfoStudent/components/SzybStudentForm.vue b/src/views/zy/zyInfoStudent/components/SzybStudentForm.vue index c24acf4..4c30557 100644 --- a/src/views/zy/zyInfoStudent/components/SzybStudentForm.vue +++ b/src/views/zy/zyInfoStudent/components/SzybStudentForm.vue @@ -102,7 +102,7 @@ const { createConfirm } = useMessage(); createConfirm({ iconType: 'warning', title: '确认提交', - content: '是否确认提交数据', + content: '作业上传后,不可修改,请仔细检查后提交', okText: '确认', cancelText: '取消', onOk: () => {