diff --git a/src/components/import_file/index.vue b/src/components/import_file/index.vue index 3ea7cd8..8aeaea3 100644 --- a/src/components/import_file/index.vue +++ b/src/components/import_file/index.vue @@ -31,6 +31,11 @@ const props = defineProps({ required: true, default: false, }, + year: { + type: String, + required: false, + default: "", + }, title: { type: String, default: "导入", @@ -72,6 +77,7 @@ const fnSubmit = debounce( const formData = new FormData(); formData.append("FFILE", data.form.file[0].raw); formData.append("FFILEName", data.form.file[0].name); + formData.append("year", props.year); emits("submit", formData); }, { atBegin: true } diff --git a/src/request/training_process_management.js b/src/request/training_process_management.js index bc4593f..ebb40ed 100644 --- a/src/request/training_process_management.js +++ b/src/request/training_process_management.js @@ -25,7 +25,7 @@ export const setClassFinish = (params) => post("/class/finish", params); // 班 export const setClassManagementDelay = (params) => post("/class/postpone", params); // 班级管理延期 export const getPersonnelList = (params) => - post("/trainedusersign/listByEnt", { loading: false, params }); // 班级管理添加人员 + post("/trainedusersign/listByEnt", { loading: false, ...params }); // 班级管理添加人员 export const getClassManagementView = (params) => post("/class/goEdit", params); // 班级管理查看 export const setClassManagementAdd = (params) => post("/class/add", params); // 班级管理添加 export const setClassManagementEdit = (params) => post("/class/edit", params); // 班级管理修改 diff --git a/src/views/archives_management/enterprise/components/postman.vue b/src/views/archives_management/enterprise/components/postman.vue index 91dccab..18030cb 100644 --- a/src/views/archives_management/enterprise/components/postman.vue +++ b/src/views/archives_management/enterprise/components/postman.vue @@ -82,6 +82,7 @@ @@ -199,6 +200,8 @@ const fnImport = () => { const fnSubmitImport = async (formData) => { const resData = await setPostmanImport(formData); ElMessage.success(resData.msg); + fnGetData(); + fnImport(); }; const fnClose = () => { emits("update:type", 0); diff --git a/src/views/archives_management/semester/components/add_review.vue b/src/views/archives_management/semester/components/add_review.vue index 16d0ef3..644914f 100644 --- a/src/views/archives_management/semester/components/add_review.vue +++ b/src/views/archives_management/semester/components/add_review.vue @@ -77,6 +77,11 @@ const props = defineProps({ required: true, default: () => {}, }, + curriculumId: { + type: String, + required: true, + default: "", + }, }); const emits = defineEmits(["update:visible", "update:form", "get-data"]); const { visible, form } = useVModels(props, emits); @@ -121,8 +126,13 @@ const fnSubmit = debounce( Object.keys(props.outerLayerForm).forEach((key) => { formData.append(key, props.outerLayerForm[key]); }); + console.log(props.outerLayerForm); formData.append("REVIEW_USER", form.value.REVIEW_USER); + formData.append("DEPARTMENT", form.value.DEPARTMENT_NAME); + formData.append("DUTIES", form.value.DUTIES); formData.append("CHECK_OPINION", form.value.CHECK_OPINION); + formData.append("SIGN_PATH", form.value.SIGN_PICTURE); + formData.append("CURRICULUM_ID", props.curriculumId); form.value.ARCHIVES_REVIEW_RECORD_ID && formData.append( "ARCHIVES_REVIEW_RECORD_ID", diff --git a/src/views/archives_management/semester/components/paper.vue b/src/views/archives_management/semester/components/paper.vue index f08f040..53da010 100644 --- a/src/views/archives_management/semester/components/paper.vue +++ b/src/views/archives_management/semester/components/paper.vue @@ -139,4 +139,22 @@ const fnClose = () => { } } } +:deep { + .el-radio-group { + width: 100%; + justify-content: space-between; + flex-wrap: wrap; + } + .el-radio-group .el-radio { + width: 25%; + margin-right: 0; + height: auto; + min-height: 30px; + } + .el-radio__input.is-disabled + span.el-radio__label { + white-space: break-spaces; + word-break: break-all; + line-height: 20px; + } +} diff --git a/src/views/archives_management/semester/components/review.vue b/src/views/archives_management/semester/components/review.vue index 0012321..cf3ab3d 100644 --- a/src/views/archives_management/semester/components/review.vue +++ b/src/views/archives_management/semester/components/review.vue @@ -125,7 +125,8 @@ v-model:form="data.addDialog.form" :type="data.addDialog.type" :outer-layer-form="data.form" - @get-data="fnGetReviewRecordList" + :curriculum-id="curriculumId" + @get-data="fnGetData" /> @@ -185,6 +186,7 @@ const data = reactive({ BOOK_NUM: "", CORP_NAME: "", CREATTIME: "", + CURRICULUM_ID: "", enterpriseName: "", REVIEW_PERSON: "", REVIEW_TIME: "", @@ -237,6 +239,11 @@ const fnGetData = async () => { data.form.CREATTIME = reviewInfo.pd.CREATTIME; await fnGetReviewRecordList(); } + } else { + data.reviewInfo = {}; + data.reviewRecordList = []; + data.form.REVIEW_OPINIONS = + data.form.REVIEW_OPINIONS || "此教材符合相关文件要求,同意使用。"; } }; const fnGetReviewRecordList = async () => { diff --git a/src/views/archives_management/semester/index.vue b/src/views/archives_management/semester/index.vue index 435c68b..e630e4f 100644 --- a/src/views/archives_management/semester/index.vue +++ b/src/views/archives_management/semester/index.vue @@ -52,7 +52,6 @@ - +