From 879797d0c5091f2ec1cdaebaeed11a0eaf1f9b5b Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Fri, 29 Jul 2022 16:02:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF1111?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/modules/activiti/demo/putaway-process3.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue
index 4f1e12cc..659b4720 100644
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@@ -4,7 +4,7 @@
     <div class="Ability-to-take-off-the-shelf-approval-title">能力下架审批</div>
     <div class="basic-information">
       <div class="basic-information-title">
-        <span></span><span>基本1111信息</span>
+        <span></span><span>基本信息</span>
       </div>
       <div class="basic-information-content">
         <p>
@@ -429,7 +429,7 @@ export default {
         .data-list-left {
           width: 80px;
           height: 110px;
-          background: url('~@/assets/img/Capabilitydiagram.png') no-repeat;
+          background: url("~@/assets/img/Capabilitydiagram.png") no-repeat;
           background-size: 80px 80px;
           background-position: center;
           margin-left: 10px;

From 5f0e5bb7ce8ea155b4dc73989f1f4adc1a880fcd Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Fri, 29 Jul 2022 18:05:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?769\753=20=20=20Bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/myAgent/demo/ResourcesAndServices.vue      |  4 ++++
 .../modules/myAgent/demo/competency-application.vue    | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
index c12c04d2..776dc574 100644
--- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@@ -235,6 +235,10 @@ export default {
                     this.dataView.children[indexView].children[indexViewSon].children[
                       indexSon
                     ].note1 = this.dataForm.type
+                  } else if (itemSon.name.indexOf('共享条件') != -1) {
+                    this.dataView.children[indexView].children[indexViewSon].children[
+                      indexSon
+                    ].note1 = this.dataForm.shareCondition
                   } else if (itemSon.name === '部门联系人') {
                     console.log('itemSon.name', itemSon.name)
                     this.dataView.children[indexView].children[indexViewSon].children[
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 44f56752..ba87c74f 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -42,6 +42,12 @@
               {{ dataForm.content.applicationSceneStr || '--' }}</span
             ></span>
         </p>
+        <p>
+          <span>
+            应用背景：<span>
+              {{ dataForm.content.applicationBackground || '--' }}</span
+            ></span>
+        </p>
         <p>
           <span>
             能力应用期望效果：<span>
@@ -573,7 +579,7 @@ export default {
     }
     .clearfix:after {
       display: block;
-      content: '';
+      content: "";
       clear: both;
     }
     .title {
@@ -583,7 +589,7 @@ export default {
       border-bottom: 0;
     }
     .title:before {
-      content: '';
+      content: "";
       width: 6px;
       height: 6px;
       display: inline-block;