From 574c69f39de1949ac67110bf8023c44aaf4da22a Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Sat, 6 Jan 2024 16:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/basicsskill/Basicsskill.data.ts     | 15 +++++++++++++++
 .../src/views/basicsskill/BasicsskillList.vue     |  2 +-
 .../src/views/compskill/Compskill.data.ts         |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/jeecgboot-vue3-master/src/views/basicsskill/Basicsskill.data.ts b/jeecgboot-vue3-master/src/views/basicsskill/Basicsskill.data.ts
index 4b92ba9d..2361447b 100644
--- a/jeecgboot-vue3-master/src/views/basicsskill/Basicsskill.data.ts
+++ b/jeecgboot-vue3-master/src/views/basicsskill/Basicsskill.data.ts
@@ -19,6 +19,14 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'remark',
   },
+  {
+    title: '启停',
+    align: "center",
+    dataIndex: 'startstop',
+    customRender:({text}) => {
+      return  render.renderSwitch(text, [{text:'启动',value:'Y'},{text:'停止',value:'N'}]);
+    },
+  },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [];
@@ -49,6 +57,13 @@ export const formSchema: FormSchema[] = [
     field: 'remark',
     component: 'InputTextArea',
   },
+  {
+    label: '启停',
+    field: 'startstop',
+    component: 'JSwitch',
+    componentProps:{
+    },
+  },
   // TODO 主键隐藏字段，目前写死为ID
   {
     label: '',
diff --git a/jeecgboot-vue3-master/src/views/basicsskill/BasicsskillList.vue b/jeecgboot-vue3-master/src/views/basicsskill/BasicsskillList.vue
index bdd8e15c..8373f087 100644
--- a/jeecgboot-vue3-master/src/views/basicsskill/BasicsskillList.vue
+++ b/jeecgboot-vue3-master/src/views/basicsskill/BasicsskillList.vue
@@ -275,7 +275,7 @@
    * 操作栏
    */
   function getTableAction(record) {
-    if(record.pid == "无上级"){
+    if(record.pid == "专业认证能力评价体系"||record.pid == "创新能力评价体系"){
       return [
         {
           label: '编辑',
diff --git a/jeecgboot-vue3-master/src/views/compskill/Compskill.data.ts b/jeecgboot-vue3-master/src/views/compskill/Compskill.data.ts
index ce627922..cd55732e 100644
--- a/jeecgboot-vue3-master/src/views/compskill/Compskill.data.ts
+++ b/jeecgboot-vue3-master/src/views/compskill/Compskill.data.ts
@@ -67,7 +67,7 @@ export const formSchema: FormSchema[] = [
     },
 
     dynamicRules: ({ model, schema }) => {
-      return [{ required: true, message: '请输入能力id!' }];
+      return [{ required: true, message: '请选择能力!' }];
     },
   },
   {