From d3dd38b883868c3dec4291ef1a0b0cbba44467da Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Thu, 13 Apr 2023 18:25:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=81=E6=B3=A23=E6=8E=92=E8=B7=AF?=
 =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E6=A0=A1=E9=AA=8C=E5=AD=97=E6=AE=B5=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
index 26fd32c25..c40b8d0fe 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
@@ -445,7 +445,8 @@ export default {
                 operation: OperationEvent.Command.commandNingBo3.Signal_command_path.operation,
                 param: {
                     pathCode: `${row.code}`
-                }
+                },
+                val: `${row.code}`
             };
             this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
                 if (valid) {

From 428524945827788fdda0cba8084c9be351b66c25 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 14 Apr 2023 13:06:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=99=E5=AD=A6=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/organization/trainingManage/index.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/organization/trainingManage/index.vue b/src/views/organization/trainingManage/index.vue
index 874a52be0..af8c6380b 100644
--- a/src/views/organization/trainingManage/index.vue
+++ b/src/views/organization/trainingManage/index.vue
@@ -75,6 +75,13 @@ export default {
                         columnValue: (row) => { return this.covertData(row); },
                         tagType: (row) => { return ''; }
                     },
+                    {
+                        title: '是否共享',
+                        prop: 'shared',
+                        type: 'tag',
+                        columnValue: (row) => { return row.shared ? '是' : '否'; },
+                        tagType: (row) => { return ''; }
+                    },
                     {
                         title: this.$t('trainingManage.labelJson'),
                         prop: 'labelJson',
@@ -97,18 +104,19 @@ export default {
                                 name: '上架',
                                 handleClick: this.handlerShelf,
                                 type: 'primary',
-                                showControl: row => row.state !== 1
+                                showControl: row => row.state !== 1 && row.orgId === this.orgId
                             },
                             {
                                 name: '下架',
                                 handleClick: this.handlerSoldOut,
                                 type: 'warning',
-                                showControl: row => row.state !== 2
+                                showControl: row => row.state !== 2 && row.orgId === this.orgId
                             },
                             {
                                 name: '删除',
                                 handleClick: this.handlerDelete,
-                                type: 'danger'
+                                type: 'danger',
+                                showControl: row => row.orgId === this.orgId
                             }
                         ]
                     }
@@ -119,6 +127,9 @@ export default {
     computed: {
         project() {
             return getSessionStorage('project');
+        },
+        orgId() {
+            return this.$store.state.user.companyId;
         }
     },
     created() {