年度比赛项目修改为项目/赛道

main
王家东 4 months ago
parent ce1e4ac5c1
commit f96eb1c8be
  1. 12
      jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPoint.data.ts
  2. 6
      jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
  3. 8
      jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue
  4. 8
      jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue
  5. 12
      jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPoint.data.ts
  6. 6
      jeecgboot-vue3-master/src/views/annualCompPoint/department/AnnualCompPointList.vue
  7. 10
      jeecgboot-vue3-master/src/views/annualCompPoint/department/components/AnnualCompPointForm.vue
  8. 10
      jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPoint.data.ts
  9. 4
      jeecgboot-vue3-master/src/views/annualCompPoint/student/AnnualCompPointList.vue
  10. 10
      jeecgboot-vue3-master/src/views/annualCompPoint/student/components/AnnualCompPointForm.vue
  11. 10
      jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPoint.data.ts
  12. 4
      jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList.vue
  13. 4
      jeecgboot-vue3-master/src/views/annualCompPoint/student2/AnnualCompPointList2.vue
  14. 10
      jeecgboot-vue3-master/src/views/annualCompPoint/student2/components/AnnualCompPointForm.vue
  15. 12
      jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPoint.data.ts
  16. 4
      jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListAwaitPass.vue
  17. 4
      jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListAwaitReject.vue
  18. 4
      jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListPass.vue
  19. 2
      jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/AnnualCompPointListZJ.vue
  20. 10
      jeecgboot-vue3-master/src/views/annualCompPoint/superAdmin/components/AnnualCompPointForm.vue

@ -11,12 +11,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'annualCompId_dictText'
},
{
title: '项目/赛道名称',
title: '项目(赛道)名称',
align: "center",
dataIndex: 'objName'
},
{
title: '项目/赛道层次',
title: '项目(赛道)层次',
align: "center",
dataIndex: 'objLevel_dictText',
// customRender: function (objLevel) {
@ -44,7 +44,7 @@ export const columns: BasicColumn[] = [
},
},
{
title: '年度比赛项目/赛道状态',
title: '年度比赛项目(赛道)状态',
align: "center",
dataIndex: 'annualCompState',
customRender: function (annualCompState) {
@ -150,12 +150,12 @@ export const formSchema: FormSchema[] = [
},
},
{
label: '项目名称',
label: '项目(赛道)名称',
field: 'objName',
component: 'Input',
dynamicRules: ({model, schema}) => {
return [
{required: true, message: '请输入项目名称!'},
{required: true, message: '请输入项目(赛道)名称!'},
];
},
},
@ -165,7 +165,7 @@ export const formSchema: FormSchema[] = [
component: 'InputTextArea',
},
{
label: '项目层次',
label: '项目(赛道)层次',
field: 'objLevel',
component: 'JPopup',
componentProps: ({formActionType}) => {

@ -116,7 +116,7 @@
},
},
exportConfig: {
name: "年度比赛项目/赛道管理",
name: "年度比赛项目(赛道)管理",
url: getExportUrl,
params: queryParam,
},
@ -327,7 +327,7 @@
onClick: handleEdit.bind(null, record),
},
{
label: '项目赛程管理',
label: '项目(赛道)赛程管理',
onClick: handleEditscgl.bind(null, record),
},
@ -338,7 +338,7 @@
{
label: '项目能力管理',
label: '项目(赛道)能力管理',
onClick: handleEditxmnl.bind(null, record),
},

@ -19,9 +19,9 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="项目/赛道名称" v-bind="validateInfos.objName" :labelCol="labelCol"
<a-form-item label="项目(赛道)名称" v-bind="validateInfos.objName" :labelCol="labelCol"
:wrapperCol="wrapperCol">
<a-input v-model:value="formData.objName" placeholder="请输入项目/赛道名称"
<a-input v-model:value="formData.objName" placeholder="请输入项目(赛道)名称"
:disabled="disabled"></a-input>
</a-form-item>
</a-col>
@ -40,7 +40,7 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="项目层次" v-bind="validateInfos.objLevel" :labelCol="labelCol" :wrapperCol="wrapperCol7">
<a-form-item label="项目(赛道)层次" v-bind="validateInfos.objLevel" :labelCol="labelCol" :wrapperCol="wrapperCol7">
<a-radio-group v-model:value="formData.objLevel">
<a-radio v-for="item in objLevelll" :key="item.id" :value="item.id">{{ item.name }}</a-radio>
</a-radio-group>
@ -300,7 +300,7 @@ const confirmLoading = ref<boolean>(false);
//
const validatorRules = {
annualCompId: [{required: true, message: '请输入年度比赛id!'},],
objName: [{required: true, message: '请输入项目名称!'},],
objName: [{required: true, message: '请输入项目(赛道)名称!'},],
entryForm: [{required: true, message: '请输入参与形式!'},],
requireApply: [{required: true, message: '请输入是否报名!'},],
requireTopic: [{required: true, message: '请输入是否选题!'},],

@ -19,9 +19,9 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="项目/赛道名称" v-bind="validateInfos.objName" :labelCol="labelCol"
<a-form-item label="项目(赛道)名称" v-bind="validateInfos.objName" :labelCol="labelCol"
:wrapperCol="wrapperCol">
<a-input v-model:value="formData.objName" placeholder="请输入项目/赛道名称"
<a-input v-model:value="formData.objName" placeholder="请输入项目(赛道)名称"
disabled="true"></a-input>
</a-form-item>
</a-col>
@ -40,8 +40,8 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="项目层次" v-bind="validateInfos.objLevel" :labelCol="labelCol" :wrapperCol="wrapperCol7">
<j-dict-select-tag type="radio" v-model:value="formData.objLevel" placeholder="请选择项目层次" dict-code="obj_lever" disabled="true"/>
<a-form-item label="项目(赛道)层次" v-bind="validateInfos.objLevel" :labelCol="labelCol" :wrapperCol="wrapperCol7">
<j-dict-select-tag type="radio" v-model:value="formData.objLevel" placeholder="请选择项目(赛道)层次" dict-code="obj_lever" disabled="true"/>
</a-form-item>
</a-col>
</a-row>

@ -11,12 +11,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'annualCompId_dictText'
},
{
title: '项目/赛道名称',
title: '项目(赛道)名称',
align: "center",
dataIndex: 'objName'
},
{
title: '项目层次',
title: '项目(赛道)赛道层次',
align: "center",
dataIndex: 'objLevel_dictText',
// customRender: function (objLevel) {
@ -44,7 +44,7 @@ export const columns: BasicColumn[] = [
},
},
{
title: '年度比赛项目/赛道状态',
title: '年度比赛项目(赛道)状态',
align: "center",
dataIndex: 'annualCompState',
customRender: function (annualCompState) {
@ -138,12 +138,12 @@ export const formSchema: FormSchema[] = [
},
},
{
label: '项目名称',
label: '项目(赛道)名称',
field: 'objName',
component: 'Input',
dynamicRules: ({model, schema}) => {
return [
{required: true, message: '请输入项目名称!'},
{required: true, message: '请输入项目(赛道)名称!'},
];
},
},
@ -153,7 +153,7 @@ export const formSchema: FormSchema[] = [
component: 'InputTextArea',
},
{
label: '项目层次',
label: '项目(赛道)层次',
field: 'objLevel',
component: 'JPopup',
componentProps: ({formActionType}) => {

@ -86,7 +86,7 @@ const registerModal = ref();
//table
const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
tableProps: {
title: '年度比赛项目管理',
title: '年度比赛项目(赛道)管理',
api: list,
columns,
canResize: false,
@ -100,7 +100,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
},
},
exportConfig: {
name: "年度比赛项目/赛道管理",
name: "年度比赛项目(赛道)管理",
url: getExportUrl,
params: queryParam,
},
@ -210,7 +210,7 @@ function getTableAction(record) {
onClick: handleDetail.bind(null, record),
},
{
label: '项目能力管理',
label: '项目(赛道)能力管理',
onClick: handleEditxmnl.bind(null, record),
},

@ -19,9 +19,9 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="项目/赛道名称" v-bind="validateInfos.objName" :labelCol="labelCol"
<a-form-item label="项目(赛道)名称" v-bind="validateInfos.objName" :labelCol="labelCol"
:wrapperCol="wrapperCol">
<a-input v-model:value="formData.objName" placeholder="请输入项目/赛道名称"
<a-input v-model:value="formData.objName" placeholder="请输入项目(赛道)名称"
:disabled="disabled"></a-input>
</a-form-item>
</a-col>
@ -40,8 +40,8 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="项目层次" v-bind="validateInfos.objLevel" :labelCol="labelCol" :wrapperCol="wrapperCol7">
<j-dict-select-tag type="radio" v-model:value="formData.objLevel" placeholder="请选择项目层次" dictCode="projectlevel,name,id" />
<a-form-item label="项目(赛道)层次" v-bind="validateInfos.objLevel" :labelCol="labelCol" :wrapperCol="wrapperCol7">
<j-dict-select-tag type="radio" v-model:value="formData.objLevel" placeholder="请选择项目(赛道)层次" dictCode="projectlevel,name,id" />
</a-form-item>
</a-col>
</a-row>
@ -292,7 +292,7 @@ const confirmLoading = ref<boolean>(false);
//
const validatorRules = {
annualCompId: [{required: true, message: '请输入年度比赛id!'},],
objName: [{required: true, message: '请输入项目名称!'},],
objName: [{required: true, message: '请输入项目(赛道)名称!'},],
entryForm: [{required: true, message: '请输入参与形式!'},],
requireApply: [{required: true, message: '请输入是否报名!'},],
requireTopic: [{required: true, message: '请输入是否选题!'},],

@ -11,12 +11,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'annualCompId_dictText'
},
{
title: '项目/赛道名称',
title: '项目(赛道)名称',
align: "center",
dataIndex: 'objName'
},
{
title: '项目/赛道层次',
title: '项目(赛道)层次',
align: "center",
dataIndex: 'objLevel_dictText',
},
@ -100,12 +100,12 @@ export const formSchema: FormSchema[] = [
},
},
{
label: '项目/赛道名称',
label: '项目(赛道)名称',
field: 'objName',
component: 'Input',
dynamicRules: ({model, schema}) => {
return [
{required: true, message: '请输入项目/赛道名称!'},
{required: true, message: '请输入项目(赛道)名称!'},
];
},
},
@ -115,7 +115,7 @@ export const formSchema: FormSchema[] = [
component: 'InputTextArea',
},
{
label: '项目层次',
label: '项目(赛道)层次',
field: 'objLevel',
component: 'JPopup',
componentProps: ({formActionType}) => {

@ -79,7 +79,7 @@
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '年度比赛项目/赛道管理',
title: '年度比赛项目(赛道)管理',
api: list,
columns,
canResize: false,
@ -93,7 +93,7 @@
},
},
exportConfig: {
name: '年度比赛项目管理',
name: '年度比赛项目(赛道)管理',
url: getExportUrl,
params: queryParam,
},

@ -22,15 +22,15 @@
<a-row>
<a-col :span="16">
<a-form-item label="项目/赛道名称" v-bind="validateInfos.objName">
<a-input v-model:value="formData.objName" placeholder="请输入项目/赛道名称"
<a-form-item label="项目(赛道)名称" v-bind="validateInfos.objName">
<a-input v-model:value="formData.objName" placeholder="请输入项目(赛道)名称"
:disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="项目层次" v-bind="validateInfos.objLevel">
<a-form-item label="项目(赛道)层次" v-bind="validateInfos.objLevel">
<j-popup
placeholder="请选择项目层次"
placeholder="请选择项目(赛道)层次"
v-model:value="formData.objLevel_dictText"
code="xmcc"
:fieldConfig="[
@ -265,7 +265,7 @@ const confirmLoading = ref<boolean>(false);
//
const validatorRules = {
annualCompId: [{required: true, message: '请输入年度比赛id!'},],
objName: [{required: true, message: '请输入项目名称!'},],
objName: [{required: true, message: '请输入项目(赛道)名称!'},],
entryForm: [{required: true, message: '请输入参与形式!'},],
requireApply: [{required: true, message: '请输入是否报名!'},],
requireTopic: [{required: true, message: '请输入是否选题!'},],

@ -11,12 +11,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'annualCompId_dictText'
},
{
title: '项目/赛道名称',
title: '项目(赛道)名称',
align: "center",
dataIndex: 'objName'
},
{
title: '项目层次',
title: '项目(赛道)层次',
align: "center",
dataIndex: 'objLevel_dictText',
},
@ -100,12 +100,12 @@ export const formSchema: FormSchema[] = [
},
},
{
label: '项目/赛道名称',
label: '项目(赛道)名称',
field: 'objName',
component: 'Input',
dynamicRules: ({model, schema}) => {
return [
{required: true, message: '请输入项目/赛道名称!'},
{required: true, message: '请输入项目(赛道)名称!'},
];
},
},
@ -115,7 +115,7 @@ export const formSchema: FormSchema[] = [
component: 'InputTextArea',
},
{
label: '项目层次',
label: '项目(赛道)层次',
field: 'objLevel',
component: 'JPopup',
componentProps: ({formActionType}) => {

@ -79,7 +79,7 @@
//table
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '年度比赛项目/赛道管理',
title: '年度比赛项目(赛道)管理',
api: list,
columns,
canResize: false,
@ -93,7 +93,7 @@
},
},
exportConfig: {
name: '年度比赛项目/赛道管理',
name: '年度比赛项目(赛道)管理',
url: getExportUrl,
params: queryParam,
},

@ -96,7 +96,7 @@ const [signUp4TeamModal, {openModal: openSignUp4TeamModal}] = useModal();
//table
const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
tableProps: {
title: '年度比赛项目/赛道管理',
title: '年度比赛项目(赛道)管理',
api: list,
columns,
canResize: false,
@ -110,7 +110,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
},
},
exportConfig: {
name: '年度比赛项目/赛道管理',
name: '年度比赛项目(赛道)管理',
url: getExportUrl,
params: queryParam,
},

@ -22,15 +22,15 @@
<a-row>
<a-col :span="16">
<a-form-item label="项目/赛道名称" v-bind="validateInfos.objName">
<a-input v-model:value="formData.objName" placeholder="请输入项目/赛道名称"
<a-form-item label="项目(赛道)名称" v-bind="validateInfos.objName">
<a-input v-model:value="formData.objName" placeholder="请输入项目(赛道)名称"
:disabled="disabled"></a-input>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="项目/赛道层次" v-bind="validateInfos.objLevel">
<a-form-item label="项目(赛道)层次" v-bind="validateInfos.objLevel">
<j-popup
placeholder="请选择项目/赛道层次"
placeholder="请选择项目(赛道)层次"
v-model:value="formData.objLevel_dictText"
code="xmcc"
:fieldConfig="[
@ -265,7 +265,7 @@ const confirmLoading = ref<boolean>(false);
//
const validatorRules = {
annualCompId: [{required: true, message: '请输入年度比赛id!'},],
objName: [{required: true, message: '请输入项目名称!'},],
objName: [{required: true, message: '请输入项目(赛道)名称!'},],
entryForm: [{required: true, message: '请输入参与形式!'},],
requireApply: [{required: true, message: '请输入是否报名!'},],
requireTopic: [{required: true, message: '请输入是否选题!'},],

@ -11,12 +11,12 @@ export const columns: BasicColumn[] = [
dataIndex: 'annualCompId_dictText'
},
{
title: '项目/赛道名称',
title: '项目(赛道)名称',
align: "center",
dataIndex: 'objName'
},
{
title: '项目层次',
title: '项目(赛道)层次',
align: "center",
dataIndex: 'objLevel_dictText',
// customRender: function (objLevel) {
@ -44,7 +44,7 @@ export const columns: BasicColumn[] = [
},
},
{
title: '年度比赛项目/赛道状态',
title: '年度比赛项目(赛道)状态',
align: "center",
dataIndex: 'annualCompState',
customRender: function (annualCompState) {
@ -150,12 +150,12 @@ export const formSchema: FormSchema[] = [
},
},
{
label: '项目名称',
label: '项目(赛道)名称',
field: 'objName',
component: 'Input',
dynamicRules: ({model, schema}) => {
return [
{required: true, message: '请输入项目名称!'},
{required: true, message: '请输入项目(赛道)名称!'},
];
},
},
@ -165,7 +165,7 @@ export const formSchema: FormSchema[] = [
component: 'InputTextArea',
},
{
label: '项目层次',
label: '项目(赛道)层次',
field: 'objLevel',
component: 'JPopup',
componentProps: ({formActionType}) => {

@ -86,7 +86,7 @@ const registerModal = ref();
//table
const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
tableProps: {
title: '年度比赛项目/赛道管理',
title: '年度比赛项目(赛道)管理',
api: listdsh,
columns,
canResize: false,
@ -100,7 +100,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
},
},
exportConfig: {
name: "年度比赛项目/赛道管理",
name: "年度比赛项目(赛道)管理",
url: getExportUrl,
params: queryParam,
},

@ -89,7 +89,7 @@ const registerModal1 = ref();
//table
const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
tableProps: {
title: '年度比赛项目/赛道管理',
title: '年度比赛项目(赛道)管理',
api: listdbh,
columns,
canResize: false,
@ -103,7 +103,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
},
},
exportConfig: {
name: "年度比赛项目/赛道管理",
name: "年度比赛项目(赛道)管理",
url: getExportUrl,
params: queryParam,
},

@ -86,7 +86,7 @@ const registerModal = ref();
//table
const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
tableProps: {
title: '年度比赛项目/赛道管理',
title: '年度比赛项目(赛道)管理',
api: listysh,
// api: () => list({ ...params, compStatus: compStatus }),
columns,
@ -101,7 +101,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
},
},
exportConfig: {
name: "年度比赛项目/赛道管理",
name: "年度比赛项目(赛道)管理",
url: getExportUrl,
params: queryParam,
},

@ -102,7 +102,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
},
},
exportConfig: {
name: "年度比赛项目/赛道管理",
name: "年度比赛项目(赛道)管理",
url: getExportUrl,
params: queryParam,
},

@ -19,9 +19,9 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="项目/赛道名称" v-bind="validateInfos.objName" :labelCol="labelCol"
<a-form-item label="项目(赛道)名称" v-bind="validateInfos.objName" :labelCol="labelCol"
:wrapperCol="wrapperCol">
<a-input v-model:value="formData.objName" placeholder="请输入项目/赛道名称"
<a-input v-model:value="formData.objName" placeholder="请输入项目(赛道)名称"
:disabled="disabled"></a-input>
</a-form-item>
</a-col>
@ -40,9 +40,9 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="项目层次" v-bind="validateInfos.objLevel" :labelCol="labelCol"
<a-form-item label="项目(赛道)层次" v-bind="validateInfos.objLevel" :labelCol="labelCol"
:wrapperCol="wrapperCol7">
<j-dict-select-tag type="radio" v-model:value="formData.objLevel" placeholder="请选择项目层次"
<j-dict-select-tag type="radio" v-model:value="formData.objLevel" placeholder="请选择项目(赛道)层次"
dict-code="obj_lever" :disabled="disabled"/>
</a-form-item>
</a-col>
@ -296,7 +296,7 @@ const confirmLoading = ref<boolean>(false);
//
const validatorRules = {
annualCompId: [{required: true, message: '请输入年度比赛id!'},],
objName: [{required: true, message: '请输入项目名称!'},],
objName: [{required: true, message: '请输入项目(赛道)名称!'},],
entryForm: [{required: true, message: '请输入参与形式!'},],
requireApply: [{required: true, message: '请输入是否报名!'},],
requireTopic: [{required: true, message: '请输入是否选题!'},],

Loading…
Cancel
Save