From f0505d2d8782bf31496378017cdc43b2be1b9772 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Fri, 22 Jul 2022 14:33:03 +0800
Subject: [PATCH] bug691

---
 .../activiti/demo/putaway-process3.vue        |   3 +-
 .../myAgent/demo/ability-resource-shelf.vue   |   3 +-
 .../myAgent/demo/competency-application.vue   | 169 ++++++++++++------
 3 files changed, 117 insertions(+), 58 deletions(-)

diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue
index 90f2e3cc..6b3f8901 100644
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@@ -98,7 +98,7 @@
         </div>
       </div>
     </div>
-    <div class="agreeOr">
+    <div class="agreeOr" v-if="this.dataForm.taskId">
       <div>
         <!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
           <el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button>
@@ -324,6 +324,7 @@ export default {
     taskHandleErrorCallback (data) {}
   },
   created () {
+    this.dataForm.taskId = this.$route.params.taskId
     this.init()
   },
   mounted () {}
diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
index badbbd76..7caee78f 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -33,7 +33,7 @@
       ref="renProcessMultiple"
     ></ren-process-multiple> -->
     <!-- 审批 -->
-    <div class="agreeOr">
+    <div class="agreeOr" v-if="taskId">
       <h3>审批</h3>
       <div>
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
@@ -129,6 +129,7 @@ export default {
     // 将业务KEY赋值给表单
     console.log('params=================>', this.$route, this.$route.params)
     this.taskId = this.$route.params.taskId
+    this.dataForm.taskId = this.$route.params.taskId
     this.init()
     console.log('fromList', this.$router.currentRoute.params.businessKey)
     // this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 176502cb..cf5cc2c3 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -86,7 +86,7 @@
     ></ren-process-multiple> -->
 
     <!-- 审批 -->
-    <div class="agreeOr">
+    <div class="agreeOr" v-if="dataForm.taskId">
       <h3>审批</h3>
       <div>
         <!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
@@ -167,6 +167,7 @@ export default {
     // 将业务KEY赋值给表单
     console.log('params=================>', this.$route, this.$route.params)
     this.dataForm.taskId = this.$route.params.taskId
+    this.dataForm.instanceId = this.$route.params.processInstanceId
     this.init()
     // // 流程回调
     var callbacks = {
@@ -200,10 +201,10 @@ export default {
       // this.visible = true
       this.$nextTick(() => {
         // this.$refs.dataForm.resetFields()
+        this.getInfo()
         if (this.dataForm.taskId) {
           // 如业务KEY已存在，不允许编辑
           // this.fieldDisabled = true
-          this.getInfo()
           console.log(this.dataForm, 'init')
         }
       })
@@ -234,65 +235,121 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http
-        .get(
-          `/act/task/getTaskVariables?taskId=${this.dataForm.taskId}&variableName=tAbilityApplicationDTOList`
-        )
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            console.log(res.data)
-            return this.$message.error(res.msg)
-          }
-          console.log(
-            res.data,
-            this.dataForm,
-            'elas============================'
+      let params = ''
+      if (this.dataForm.taskId) {
+        params = `taskId=${this.dataForm.taskId}`
+        this.$http
+          .get(
+            `/act/task/getTaskVariables?${params}&variableName=tAbilityApplicationDTOList`
           )
-          if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
-            res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
-            res.data.tAbilityApplicationDTOList[0].applicationScene.map(
-              (val, index) => {
-                res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
-                  val
-                if (
-                  index <
-                  res.data.tAbilityApplicationDTOList[0].applicationScene
-                    .length -
-                    1
-                ) {
-                  res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
-                    '、'
-                }
-              }
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              console.log(res.data)
+              return this.$message.error(res.msg)
+            }
+            console.log(
+              res.data,
+              this.dataForm,
+              'elas============================'
             )
-          }
-          this.dataForm.content = res.data.tAbilityApplicationDTOList[0]
-          const obj = {
-            name: '申请摄像头列表',
-            type: '基础设施',
-            describe: ''
-          }
-          let flag = false
-          res.data.tAbilityApplicationDTOList.map((val) => {
-            if (val.cameraList) {
-              flag = true
-              obj.describe += val.system
-            } else {
-              this.$http.get('/resource/' + val.resourceId).then((res1) => {
-                // console.log(res1.data.data, '1111111111111111111111111111111111')
-                this.dataList.push({
-                  name: res1.data.data.name,
-                  type: res1.data.data.type,
-                  describe: res1.data.data.description
+            if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
+              res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
+              res.data.tAbilityApplicationDTOList[0].applicationScene.map(
+                (val, index) => {
+                  res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
+                    val
+                  if (
+                    index <
+                    res.data.tAbilityApplicationDTOList[0].applicationScene
+                      .length -
+                      1
+                  ) {
+                    res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
+                      '、'
+                  }
+                }
+              )
+            }
+            this.dataForm.content = res.data.tAbilityApplicationDTOList[0]
+            const obj = {
+              name: '申请摄像头列表',
+              type: '基础设施',
+              describe: ''
+            }
+            let flag = false
+            res.data.tAbilityApplicationDTOList.map((val) => {
+              if (val.cameraList) {
+                flag = true
+                obj.describe += val.system
+              } else {
+                this.$http.get('/resource/' + val.resourceId).then((res1) => {
+                  // console.log(res1.data.data, '1111111111111111111111111111111111')
+                  this.dataList.push({
+                    name: res1.data.data.name,
+                    type: res1.data.data.type,
+                    describe: res1.data.data.description
+                  })
                 })
-              })
+              }
+            })
+            if (flag) {
+              this.dataList.push(obj)
             }
           })
-          if (flag) {
-            this.dataList.push(obj)
-          }
-        })
-        .catch(() => {})
+          .catch(() => {})
+      } else {
+        params = `instanceId=${this.dataForm.instanceId}`
+        this.$http
+          .get(
+            `/act/his/getVariablesByInstanceId?${params}&variableName=tAbilityApplicationDTOList`
+          )
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              console.log(res.data)
+              return this.$message.error(res.msg)
+            }
+            console.log(
+              res.data,
+              this.dataForm,
+              'elas============================'
+            )
+            if (res.data[0].applicationScene) {
+              res.data[0].applicationSceneStr = ''
+              res.data[0].applicationScene.map((val, index) => {
+                res.data[0].applicationSceneStr += val
+                if (index < res.data[0].applicationScene.length - 1) {
+                  res.data[0].applicationSceneStr += '、'
+                }
+              })
+            }
+            this.dataForm.content = res.data[0]
+            const obj = {
+              name: '申请摄像头列表',
+              type: '基础设施',
+              describe: ''
+            }
+            let flag = false
+            res.data.tAbilityApplicationDTOList.map((val) => {
+              if (val.cameraList) {
+                flag = true
+                obj.describe += val.system
+              } else {
+                this.$http.get('/resource/' + val.resourceId).then((res1) => {
+                  // console.log(res1.data.data, '1111111111111111111111111111111111')
+                  this.dataList.push({
+                    name: res1.data.data.name,
+                    type: res1.data.data.type,
+                    describe: res1.data.data.description
+                  })
+                })
+              }
+            })
+            if (flag) {
+              this.dataList.push(obj)
+            }
+          })
+          .catch(() => {})
+      }
     },
     // 申请能力
     applyData () {