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

front/src/views/personalCenter/components/AbilityApplication.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-21 16:54:05
+ * @LastEditTime: 2022-07-21 17:25:45
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -113,7 +113,9 @@
               <div class="ability-bottom">
                 <div class="dec">资源描述：{{ val.description }}</div>
                 <div class="result">
-                  申请结果：{{ val.ended ? '审核完成' : '审核中' }}
+                  申请结果：{{
+                    item.ended ? item.approveStatus || '审核完成' : '审核中'
+                  }}
                 </div>
               </div>
             </div>
@@ -162,6 +164,8 @@
         obj.name = key
         props.refObj.resourceApplication[key].map((item) => {
           obj.instanceId = item.instanceId
+          obj.ended = item.ended
+          obj.approveStatus = item.approveStatus
           if (item.resources.length > 0) {
             item.resources.map((val) => {
               obj.list.push(val)

front/src/views/personalCenter/components/addApplication.vue

@@ -329,7 +329,7 @@
       }
 
       const fileList = ref([])
-
+      const subimtFlag = ref(true)
       const processStartHandle = () => {
         if (id.value) {
           updateDemandForm(formName).then((upres) => {
@@ -350,19 +350,19 @@
             }
           })
         } else {
+          if (subimtFlag.value) {
+            subimtFlag.value = false
             formRef.value.validate().then(() => {
-            const detString = String(formName.detailsField)
-            formName.detailsField = detString
-            console.log(detString, formName.detailsField, 'detString')
-            debugger
               demandApply(formName).then((res) => {
                 applySuccess.value = false
                 message.success('操作成功！')
                 console.log('能力申请================>', res)
+                subimtFlag.value = true
               })
             })
           }
         }
+      }
 
       return {
         formRef,