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

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

@@ -65,7 +65,7 @@
             <a-popconfirm v-if="!item.ended" title="是否终止此流程?" ok-text="是" cancel-text="否"
               @confirm="endThis(item.instanceId)" @cancel="cancel">
               <a-button type="primary" danger style="margin-left: 10px">
-                流程终止
+                撤回申请
               </a-button>
             </a-popconfirm>
           </div>
@@ -271,10 +271,10 @@ console.log(props.refObj, '=====================================')
 const endThis = (instanceId) => {
   endProcess({ instanceId: instanceId }).then((res) => {
     if (res.data.code == 0) {
-      message.success('流程终止成功！')
+      message.success('撤回申请成功！')
       mybus.emit('closeModal', { type: '能力申请', index: 0 })
     } else {
-      message.warning('流程终止失败！')
+      message.warning('撤回申请失败！')
     }
   })
 }

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

@@ -19,7 +19,7 @@
         @confirm="endThis"
         @cancel="cancel"
       >
-        <a-button type="primary" danger>流程终止</a-button>
+        <a-button type="primary" danger>撤回申请</a-button>
       </a-popconfirm>
       <div v-else></div>
     </div>
@@ -54,10 +54,10 @@
   const endThis = () => {
     endProcess({ instanceId: props.refObj.processInstanceId }).then((res) => {
       if (res.data.code == 0) {
-        message.success('流程终止成功！')
+        message.success('撤回申请成功！')
         mybus.emit('closeModal', { type: '能力上架', index: 2 })
       } else {
-        message.warning('流程终止失败！')
+        message.warning('撤回申请失败！')
       }
     })
   }