Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -29,12 +29,12 @@
               {{ dataForm.content.title || '--' }}</span
             ></span
           >
-          <span class="text"
+          <span class="text" v-if="dataForm.content.applicationSystem"
             >应用系统：<span>{{
               dataForm.content.applicationSystem || '--'
             }}</span></span
           >
-          <span class="text"
+          <span class="text" v-if="dataForm.content.applicationSceneStr"
             >应用场景：<span>
               {{ dataForm.content.applicationSceneStr || '--' }}</span
             ></span

front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue

@@ -60,7 +60,7 @@
     password2: '',
   })
   if (props.dataList.infoList) {
-    let obj = props.dataList.applyState
+    let obj = props.dataList.approveStatus
     if (obj !== '通过') {
       flag.value = false
     } else {
@@ -110,7 +110,7 @@
     () => props.dataList,
     (val) => {
       if (val) {
-        let obj = props.dataList.applyState
+        let obj = props.dataList.approveStatus
         if (obj !== '通过') {
           flag.value = false
         } else {

front/src/views/detailsAll/components/Application/ApplicationNavigation.vue

@@ -106,7 +106,7 @@
     if (
       props.dataList.link &&
       whoShow1.value.itShowQingDao &&
-      props.dataList.applyState === '通过'
+      props.dataList.approveStatus === '通过'
     ) {
       list.value.push('应用详情')
     }
@@ -154,7 +154,7 @@
         if (
           props.dataList.link &&
           whoShow1.value.itShowQingDao &&
-          props.dataList.applyState === '通过'
+          props.dataList.approveStatus === '通过'
         ) {
           list.value.push('应用详情')
         }