From b48bddcc241306a9c96ef06efec6f086478f7226 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Fri, 23 Aug 2024 16:44:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E8=B5=9B=E9=98=9F=E5=91=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AnnualCompPointForm.vue        | 33 ++++++++++---------
 .../JVxeTableDemo/func-demo/JSBCDemo.vue      |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue
index 07fb9419..58a8e3bd 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointForm.vue
@@ -90,7 +90,7 @@
           <a-form-item label="队伍人数" v-bind="validateInfos.teamNumber">
             <a-input-number v-model:value="formData.teamNumber" placeholder="请输入队伍人数"
                             style="width: 100%" :disabled="disabled"/>
-            <a-button @click="showModel">设置</a-button>
+            <a-button @click="showModel">队伍比值配置</a-button>
           </a-form-item>
         </a-col>
         <a-col :span="12" v-if="formData.entryForm==='Y'">
@@ -101,9 +101,7 @@
         </a-col>
       </a-row>
 
-
-
-
+<!--
       <a-row v-if="formData.entryForm ==='Y'">
         <a-col :span="12">
           <a-form-item label="队伍第1编号" >
@@ -175,6 +173,7 @@
 
 
 
+-->
 
       <a-row>
 
@@ -341,10 +340,12 @@ import {Form} from 'ant-design-vue';
 import { JVxeTable } from '/@/components/jeecg/JVxeTable';
 import { JVxeTypes, JVxeColumn} from '/@/components/jeecg/JVxeTable/types';
 const dataSource = ref([])
-const columns = ref<any>([
+// 列配置，控制表格显示的列
+const columns = ref<JVxeColumn[]>([
+  // { key: 'num', title: '序号', width: 80, type: JVxeTypes.normal },
   {
-    title: '单行文本',
-    key: 'input',
+    title: '比值',
+    key: 'raito',
     type: JVxeTypes.input,
     width: 180,
     defaultValue: '',
@@ -354,14 +355,14 @@ const columns = ref<any>([
         required: true, // 必填
         message: '请输入${title}', // 显示的文本
       },
-      {
-        pattern: /^[a-z|A-Z][a-z|A-Z\d_-]*$/, // 正则
-        message: '必须以字母开头，可包含数字、下划线、横杠',
-      },
-      {
-        unique: true,
-        message: '${title}不能重复',
-      },
+      // {
+      //   pattern: /^[a-z|A-Z][a-z|A-Z\d_-]*$/, // 正则
+      //   message: '必须以字母开头，可包含数字、下划线、横杠',
+      // },
+      // {
+      //   unique: true,
+      //   message: '${title}不能重复',
+      // },
       {
         handler({ cellValue, row, column }, callback, target) {
           // cellValue 当前校验的值
@@ -422,7 +423,7 @@ const props = defineProps({
 const [register, { openModal }] = useModal();
 // const [register, { closeModal, setModalProps,openModal }] = useModalInner();
 const showModel = () => {
-  console.log(1111)
+  // console.log(1111)
   openModal()
 }
 
diff --git a/jeecgboot-vue3-master/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue b/jeecgboot-vue3-master/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue
index b44d4efe..2b421f6d 100644
--- a/jeecgboot-vue3-master/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue
+++ b/jeecgboot-vue3-master/src/views/demo/jeecg/JVxeTableDemo/func-demo/JSBCDemo.vue
@@ -59,7 +59,7 @@
   const dataSource = ref<Recordable[]>([]);
   // 列配置，控制表格显示的列
   const columns = ref<JVxeColumn[]>([
-    { key: 'num', title: '序号', width: 80, type: JVxeTypes.normal },
+    { key: 'num', title: '序号22', width: 80, type: JVxeTypes.normal },
     {
       // 字段key，跟后台数据的字段名匹配
       key: 'ship_name',