Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev

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;

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[

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;