Merge branch 'gst4base' of http://182.92.169.222:3000/zhc077/hnjd_comp into gst4base

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 } });