修了一些bug 公告添加个 平台

src/views/announcementManagement/components/DialogView.vue

@@ -11,7 +11,12 @@
 			<a-form-item label="公告标题" name="title">
 				<a-input v-model:value="formState.title" placeholder="输入公告标题"/>
 			</a-form-item>
-
+			<a-form-item label="公告标题" name="platform">
+				<a-radio-group v-model:value="formState.platform">
+					<a-radio-button value="1">课程</a-radio-button>
+					<a-radio-button value="2">考试</a-radio-button>
+				</a-radio-group>
+			</a-form-item>
 			<a-form-item label="公告内容" name="content">
 				<a-textarea v-model:value="formState.content" placeholder="输入公告内容"
 							:auto-size="{ minRows: 5, maxRows: 8 }"/>
@@ -39,10 +44,12 @@ const formState = reactive({
 	noticeId : undefined,
 	title: undefined,
 	content: undefined,
+	platform: undefined,
 })
 const rules = {
 	title: [{required: true, message: '请输入标题', trigger: 'blur'}],
 	content: [{required: true, message: '请输入内容', trigger: 'blur'}],
+	platform: [{required: true, message: '请选择平台', trigger: 'change'}],
 }
 
 watch(
@@ -72,6 +79,7 @@ const edit = (item) => {
 			formState.noticeId = item.noticeId
 			formState.content = res.data.content
 			formState.title = res.data.title
+			formState.platform = res.data.platform
 		}
 	})
 

src/views/courseAdd/components/courseProduction/addDialog.vue

@@ -134,7 +134,7 @@ const handleChange = (activeKey) => {
 					}else if(exListsRefData.value && exListsRefData.value[0]&& exListsRefData.value[0].id){
 						exListsRef.value.edit(exListsRefData.value[0].id)
 					}
-				
+
 					if(exListsRefData.value  == null){
 						exListsRef.value.open()
 					}

src/views/courseManagement/components/ListView.vue

@@ -94,12 +94,12 @@ const columns = [
 		// sorter: true,
 		width: '5%'
 	},
-	{
-		title: '院系',
-		dataIndex: 'collegeTwoIdName',
-		// sorter: true,
-		width: '8%'
-	},
+	// {
+	// 	title: '院系',
+	// 	dataIndex: 'collegeTwoIdName',
+	// 	// sorter: true,
+	// 	width: '8%'
+	// },
 	{
 		title: '课程类型',
 		dataIndex: 'courseTypeName',

src/views/courseOpen/components/DialogView.vue

@@ -54,10 +54,12 @@
 
 
 				<a-form-item label="开始节次" name="startPeriod">
-					<a-input v-model:value="formState.startPeriod" placeholder="输入开始节次" />
+<!--					<a-input v-model:value="formState.startPeriod" placeholder="输入开始节次" />-->
+					<a-input-number  v-model:value="formState.startPeriod" :min="1" :max="100" placeholder="输入开始节次" style="width: 100%;"/>
 				</a-form-item>
 				<a-form-item label="结束节次" name="endPeriod">
-					<a-input v-model:value="formState.endPeriod" placeholder="输入结束节次" />
+<!--					<a-input v-model:value="formState.endPeriod" placeholder="输入结束节次" />-->
+					<a-input-number  v-model:value="formState.endPeriod" :min="1" :max="100" placeholder="输入结束节次" style="width: 100%;"/>
 				</a-form-item>
 
 
@@ -115,8 +117,14 @@ const COURSE_OPEN_WEEK_TYPE_Options = tool.dictList('COURSE_OPEN_WEEK_TYPE')
 	const title = ref('添加') //专业
 	import {addItem,detail,editItem} from '@/api/courseopen'
 import tool from "@/utils/tool";
+import {message} from "ant-design-vue";
 	const visible = ref(false)
+
+	const startPeriodTag = ref(false)
+	const endPeriodTag = ref(false)
+
 const emit = defineEmits([ "handleAddItem" ])
+
 const formState = ref({
 		id : undefined,
 		room: undefined,
@@ -152,11 +160,43 @@ watch(
 	},
 	{ deep: true, immediate: true }
 )
+watch(
+	() => formState.value.startPeriod,
+	(newVal, oldVal) => {
+		if(Number(formState.value.endPeriod)){
+			if (newVal>formState.value.endPeriod) {
+				message.error('开始节次不能大于结束节次')
+				startPeriodTag.value =  true
+			}else{
+				startPeriodTag.value =  false
+			}
+		}
+
+	},
+	{ deep: true, immediate: true }
+)
+watch(
+	() => formState.value.endPeriod,
+	(newVal, oldVal) => {
+		if(Number(formState.value.startPeriod)) {
+			if (newVal < formState.value.startPeriod) {
+				message.error('结束节次不能小于开始节次')
+				endPeriodTag.value =  true
+			}else{
+				endPeriodTag.value =  false
+			}
+		}
+	},
+	{ deep: true, immediate: true }
+)
+
 	const open = () => {
 
 		visible.value = true
 		mode.value = 'add'
 		title.value = '添加'
+		startPeriodTag.value = false
+		endPeriodTag.value = false
 	}
 const edit = (item) => {
 	visible.value = true
@@ -164,11 +204,12 @@ const edit = (item) => {
 	title.value = '修改'
 	console.log('编辑内容',item)
 
-
+	startPeriodTag.value = false
+	endPeriodTag.value = false
 	detail({id : item.id}).then((res)=>{
 		if(res.code ==200){
-			formState.id = item.id
-			formState.value = {...res.data}
+			formState.value.id = item.id
+			formState.value = {id: item.id,...res.data}
 			formState.value.gradesId = Number(formState.value.gradesId)
 			// formState.value.semesterId = Number(formState.value.semesterId)
 
@@ -179,8 +220,10 @@ const edit = (item) => {
 
 }
 	const handleOk = (e) => {
-		formRef.value.validate().then(()=>{
-			let json = JSON.parse(JSON.stringify(formState))
+
+		if (startPeriodTag.value == false && endPeriodTag.value == false){
+			formRef.value.validate().then(()=>{
+				let json = JSON.parse(JSON.stringify(formState.value))
 
 
 				if (mode.value =='add'){
@@ -189,13 +232,19 @@ const edit = (item) => {
 						visible.value = false
 					})
 				}
-			if (mode.value =='edit'){
-				editItem(json).then((res)=>{
-					emit("handleAddItem")
-					visible.value = false
-				})
-			}
-		})
+				if (mode.value =='edit'){
+					editItem(json).then((res)=>{
+						emit("handleAddItem")
+						visible.value = false
+					})
+				}
+			})
+		}else{
+			message.error('开始节次或结束节次数据不正确')
+		}
+
+
+
 		// console.logckPoint.value = false
 	}
 	const getOrgTreeSelector = () => {

src/views/userfileconvert/components/DialogView.vue

@@ -12,6 +12,8 @@
 				<a-input v-model:value="formState.fileName" placeholder="输入公告标题"/>
 			</a-form-item>
 
+
+
 			<a-form-item label="公告内容" name="extendName">
 				<a-input v-model:value="formState.extendName" placeholder="输入公告标题"/>
 <!--				<a-textarea v-model:value="formState.content" placeholder="输入公告内容"-->
@@ -37,11 +39,13 @@ const emit = defineEmits([ "handleAddItem" ])
 const formState = reactive({
 	noticeId : undefined,
 	fileName: undefined,
+	platform: undefined,
 	extendName: undefined,
 })
 const rules = {
 	fileName: [{required: true, message: '请输入文件名称', trigger: 'blur'}],
 	extendName: [{required: true, message: '请输入后缀名称', trigger: 'blur'}],
+	platform: [{required: true, message: '请选择平台', trigger: 'change'}],
 }
 
 watch(
@@ -69,6 +73,7 @@ const edit = (item) => {
 			formState.noticeId = item.noticeId
 			formState.content = res.data.content
 			formState.title = res.data.title
+			formState.platform = res.data.platform
 		}
 	})