能力上架 新增转办功能

back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

@@ -36,6 +36,7 @@
     <div class="agreeOr" v-if="taskId">
       <h3>审批</h3>
       <div>
+        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('驳回')"
           >驳回</el-button
@@ -61,6 +62,7 @@
         > -->
       </div>
     </div>
+    <ren-task-entrust v-if="renTaskEntrustVisible" ref="renTaskEntrust"></ren-task-entrust>
     <!--  流程详情   -->
     <ren-process-detail></ren-process-detail>
     <el-dialog
@@ -84,6 +86,7 @@
 </template>
 
 <script>
+import RenTaskEntrust from '@/components/ren-process-running/src/ren-task-entrust'
 import bus from '@/views/bus.js'
 import ResourcesAndServices from './ResourcesAndServices.vue'
 import debounce from 'lodash/debounce'
@@ -93,7 +96,8 @@ export default {
   // 注入公共方法
   // mixins: [processModule],
   components: {
-    ResourcesAndServices
+    ResourcesAndServices,
+    RenTaskEntrust
   },
   props: {
     // fromList: {
@@ -105,6 +109,9 @@ export default {
   },
   data () {
     return {
+      taskEntrustFlag: false,
+      taskEntrustFlag2: false,
+      renTaskEntrustVisible: false,
       dialogVisible: false,
       dialogType: '',
       input: '',
@@ -132,6 +139,35 @@ export default {
     console.log('params=================>', this.$route, this.$route.params)
     this.taskId = this.$route.params.taskId
     this.dataForm.taskId = this.$route.params.taskId
+    this.$http.get('/sys/user/info').then(({ data: res }) => {
+      res.data.roleIdList.map(val => {
+        this.$http.get('/sys/role/' + val).then(role => {
+          if (role.data.data.name === '流程管理员') {
+            this.taskEntrustFlag = true
+            this.$http
+              .get(
+                '/act/task/getTaskVariables?taskId=' + this.$route.params.taskId + '&variableName=allowEntrust'
+              ).then(entrust => {
+                console.log('11111111111111', entrust, this.dataForm)
+                if (entrust.data.data.allowEntrust === true) {
+                  this.taskEntrustFlag2 = true
+                  if (this.taskEntrustFlag && this.taskEntrustFlag2) {
+                    this.$alert('当前审核部门为' + this.dataForm.deptName + '，该部门未配置审核人，请联系运维工程师配置完成后进行流程转办！', '流程提醒', {
+                      confirmButtonText: '确定',
+                      callback: action => {
+                        // this.$message({
+                        //   type: 'info',
+                        //   message: `action: ${action}`
+                        // })
+                      }
+                    })
+                  }
+                }
+              })
+          }
+        })
+      })
+    })
     this.init()
     console.log('fromList', this.$router.currentRoute.params.businessKey)
     // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
@@ -154,6 +190,15 @@ export default {
   },
   computed: {},
   methods: {
+
+    entrustTask () {
+      this.renTaskEntrustVisible = true
+      this.$nextTick(() => {
+        this.$refs.renTaskEntrust.dataForm.taskId = this.dataForm.taskId
+        this.$refs.renTaskEntrust.callbacks = this.callbacks
+        this.$refs.renTaskEntrust.init()
+      })
+    },
     getInfo (id) {
       this.$http.get('/resourceMountApply/' + id).then(({ data: res }) => {
         this.dataForm = res.data.resourceDTO

front/src/views/newHome/components/CapabilityConvergence.vue

@@ -8,40 +8,74 @@
       <div class="bottom">
         <div class="item">
           <div class="zj">组件服务</div>
-          <div class="name" v-for="(item, index) in zjList.slice(0, 5)" :key="item.name"
+          <div
-            :class="index == 4 ? 'name-last' : ''" @click="selectOne1(item.name)">
+            class="name"
+            v-for="(item, index) in zjList.slice(0, 5)"
+            :key="item.name"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne1(item.name)"
+          >
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('组件服务')">查看更多</div>
         </div>
         <div class="item">
           <div class="yy">应用资源</div>
-          <div class="name" v-for="(item, index) in yyList.slice(0, 5)" :key="item.name"
+          <div
-            :class="index == 4 ? 'name-last' : ''" @click="selectOne11(item.name)">
+            class="name"
+            v-for="(item, index) in yyList.slice(0, 5)"
+            :key="item.name"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne11(item.name)"
+          >
             {{ item.name + '-' + item.num + '项' }}
           </div>
           <div class="btn" @click="jumpPage('应用资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="jc">基础设施</div>
-          <div class="name" v-for="(item, index) in jcList.slice(0, 5)" :key="item.name"
+          <div
-            :class="index == 2 ? 'name-last' : ''" @click="selectOne2(item.name)">
+            class="name"
-            {{ item.name + '-' + item.num + '项' }}
+            v-for="(item, index) in jcList.slice(0, 5)"
+            :key="item.name"
+            :class="index == 2 ? 'name-last' : ''"
+            @click="selectOne2(item.name)"
+          >
+            {{
+              item.name +
+              '-' +
+              item.num +
+              (item.name == '会客厅'
+                ? '间'
+                : item.name == '视频会议'
+                ? '个'
+                : '项')
+            }}
           </div>
           <div class="btn" @click="jumpPage('基础设施')">查看更多</div>
         </div>
         <div class="item">
           <div class="sj">数据资源</div>
-          <div class="name" v-for="(item, index) in sjList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+          <div
-            @click="selectOne3(item.name)">
+            class="name"
+            v-for="(item, index) in sjList"
+            :key="item.id"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="selectOne3(item.name)"
+          >
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('数据资源')">查看更多</div>
         </div>
         <div class="item">
           <div class="zs">知识库</div>
-          <div class="name" v-for="(item, index) in zsList" :key="item.id" :class="index == 4 ? 'name-last' : ''"
+          <div
-            @click="openHref(item)">
+            class="name"
+            v-for="(item, index) in zsList"
+            :key="item.id"
+            :class="index == 4 ? 'name-last' : ''"
+            @click="openHref(item)"
+          >
             {{ index + 1 }}-{{ item.name }}
           </div>
           <div class="btn" @click="jumpPage('知识库')">查看更多</div>
@@ -56,7 +90,7 @@ import {
     getDataResource,
     selectInfrastructureList,
     selectCollectComponentList,
-  selectCollectResourceList
+    selectCollectResourceList,
   } from '@/api/home.js'
   import { ref, reactive } from 'vue'
   import { useRouter } from 'vue-router'
@@ -137,7 +171,7 @@ const getAppResources = (type, obj) => {
       if (type == '基础设施') {
         jcList.value = []
         selectInfrastructureList().then((res) => {
-        console.log('基础设施------res------>', res);
+          console.log('基础设施------res------>', res)
           for (const key in res.data.data) {
             if (whoShow1.value.itShowXiHaiAn) {
               if (key === '视频资源') {
@@ -146,8 +180,7 @@ const getAppResources = (type, obj) => {
                   num: res.data.data[key],
                 })
               }
-          } 
+            } else {
-          else  {  
               jcList.value.push({
                 name: key,
                 num: res.data.data[key],
@@ -184,25 +217,23 @@ const getAppResources = (type, obj) => {
               })
           }
         })
-    }
+      } else if (type == '组件服务') {
-    else if (type == '组件服务') {
         zjList.value = []
         selectCollectComponentList().then((res) => {
-        console.log('组件服务----res-------->', res);
+          console.log('组件服务----res-------->', res)
           for (const key in res.data.data) {
-          console.log('key------------>', key);
+            console.log('key------------>', key)
             zjList.value.push({
               name: key,
               num: res.data.data[key],
             })
           }
-        console.log('zjList------------>', zjList);
+          console.log('zjList------------>', zjList)
         })
-    }
+      } else if (type == '应用资源') {
-    else if (type == '应用资源') {
         yyList.value = []
         selectCollectResourceList().then((res) => {
-        console.log('应用资源---res--------->', res);
+          console.log('应用资源---res--------->', res)
           for (const key in res.data.data) {
             yyList.value.push({
               name: key,
@@ -210,8 +241,7 @@ const getAppResources = (type, obj) => {
             })
           }
         })
-    }
+      } else {
-    else {
         pageWithAttrs(paramsGetResources).then((res) => {
           console.log('object个数======>', type)
           obj.value = res.data.data.records