From 60d7bc83e8c05c96c3ac2032ef99c264972cfd22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=AE=B6=E4=B8=9C?= <1654135867@qq.com>
Date: Wed, 13 Nov 2024 09:04:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E7=9B=AE=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=AF=94=E8=B5=9B=E9=A1=B9=E7=9B=AE=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/topic/components/TopicForm.vue       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/topic/components/TopicForm.vue b/jeecgboot-vue3-master/src/views/topic/components/TopicForm.vue
index e3cb5e09..86d316bb 100644
--- a/jeecgboot-vue3-master/src/views/topic/components/TopicForm.vue
+++ b/jeecgboot-vue3-master/src/views/topic/components/TopicForm.vue
@@ -2,7 +2,7 @@
   <a-spin :spinning="confirmLoading">
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
-        <a-col :span="24">
+<!--        <a-col :span="24">
           <a-form-item label="年度比赛项目" v-bind="validateInfos.annualCompid">
             <j-popup
                 placeholder="请选择年度比赛项目"
@@ -16,7 +16,14 @@
                 :setFieldsValue="setFieldsValue"
                 :disabled="disabled"		        />
           </a-form-item>
+        </a-col>-->
+
+        <a-col :span="24">
+          <a-form-item label="年度比赛项目" v-bind="validateInfos.annualCompid">
+            <j-search-select v-model:value="formData.annualCompid" dict="annual_comp_point,obj_name,id"  disabled="true"/>
+          </a-form-item>
         </a-col>
+
         <a-col :span="24">
           <a-form-item label="题目编号" v-bind="validateInfos.number">
             <a-input v-model:value="formData.number" placeholder="请输入题目编号" :disabled="disabled"  @change="change"></a-input>
@@ -48,6 +55,7 @@
 </template>
 
 <script lang="ts" setup>
+import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
 import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
 import { defHttp } from '/@/utils/http/axios';
 import { useMessage } from '/@/hooks/web/useMessage';
@@ -62,9 +70,6 @@ import {useRoute} from "vue-router";
 import {demoArticleListApi} from "/@/api/demo/mainHome";
 const $Route = useRoute()
 //把路由中的数据转化到组件中
-
-
-
 const props = defineProps({
   formDisabled: { type: Boolean, default: false },
   formData: { type: Object, default: ()=>{} },
@@ -83,6 +88,7 @@ const formData = reactive<Record<string, any>>({
   status: undefined,
   isopen: '',
 });
+routrtodate();
 const { createMessage } = useMessage();
 const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
 const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });