Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
- * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-20 16:16:16
+ * @LastEditors: Light
+ * @LastEditTime: 2022-10-21 09:31:25
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -94,7 +94,7 @@
           <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
         </el-radio-group> -->
         <!-- 委托 -->
-        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag'>{{ $t('process.entrustTask') }}</el-button>
+        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>{{ $t('process.entrustTask') }}</el-button>
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('驳回')">驳回</el-button>
         <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
@@ -132,6 +132,7 @@ export default {
   data () {
     return {
       taskEntrustFlag: false,
+      taskEntrustFlag2: false,
       dialogVisible: false,
       renTaskEntrustVisible: false,
       dialogType: '',
@@ -268,6 +269,9 @@ export default {
               this.dataForm,
               'elas============================'
             )
+            if (res.data.tAbilityApplicationDTOList[0].allowEntrust === true) {
+              this.taskEntrustFlag2 = true
+            }
             if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
               res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
               res.data.tAbilityApplicationDTOList[0].applicationScene.map(