From 66e479ed5f2e0af3060d88e33c2cafedca1987d9 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 21 Jul 2022 13:52:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../myAgent/demo/ability-resource-shelf.vue   | 133 ++++----
 .../myAgent/demo/competency-application.vue   | 286 +++++++++++-------
 2 files changed, 249 insertions(+), 170 deletions(-)

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 248d4ef9..f98d027f 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -37,7 +37,9 @@
       <h3>审批</h3>
       <div>
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
-        <el-button  type="danger" plain @click="showDialog('拒绝')">拒绝</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >拒绝</el-button
+        >
         <!-- <el-radio-group v-model="agreeOrList" style="width: 230px">
           <el-radio-button label="同意" class="blueAll">同意</el-radio-button>
           <el-radio-button label="退回" class="redAll">退回</el-radio-button>
@@ -63,11 +65,16 @@
       title="审批意见"
       :visible.sync="dialogVisible"
       width="30%"
-      :before-close="handleClose">
+      :before-close="handleClose"
+    >
       <el-input v-model="input" placeholder="请输入审批意见"></el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose2">取 消</el-button>
-        <el-button type="primary" @click="agreeOrNot()">确 定</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
   </div>
@@ -157,11 +164,11 @@ export default {
     },
     handleClose (done) {
       this.$confirm('确认关闭？')
-        .then(_ => {
+        .then((_) => {
           this.input = ''
           done()
         })
-        .catch(_ => {})
+        .catch((_) => {})
     },
     handleClose2 () {
       this.dialogVisible = false
@@ -185,61 +192,73 @@ export default {
       })
     },
     // 同意与退回
-    agreeOrNot: debounce(function () {
-      if (this.dialogType === '同意') {
-        console.log('this.dataForm', this.dataForm)
-        const params = qs.stringify({
-          taskId: this.dataForm.taskId,
-          comment: this.input
-        })
-        console.log(params)
-        this.$http.post('/act/task/complete?' + params).then(({ data: res }) => {
-          if (res.code !== 0) {
-            this.$message.error(res.msg)
-            if (this.callbacks.taskHandleErrorCallback) {
-              this.callbacks.taskHandleErrorCallback(res)
-            }
-            return
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              if (this.callbacks.taskHandleSuccessCallback) {
-                this.callbacks.taskHandleSuccessCallback(res)
-              }
-            }
+    agreeOrNot: debounce(
+      function (data) {
+        if (this.dialogType === '同意') {
+          console.log('this.dataForm', this.dataForm)
+          const params = qs.stringify({
+            taskId: this.taskId,
+            comment: this.input
           })
-        }).catch(() => {})
-      } else if (this.dialogType === '拒绝') {
-        const params = qs.stringify({
-          taskId: this.dataForm.taskId,
-          comment: this.input
-        })
-        this.$http.post('/act/task/backToFirst?', params).then(({ data: res }) => {
-          if (res.code !== 0) {
-            this.$message.error(res.msg)
-            if (this.callbacks.taskHandleErrorCallback) {
-              this.callbacks.taskHandleErrorCallback(res)
-            }
-            return
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              if (this.callbacks.taskHandleSuccessCallback) {
-                this.callbacks.taskHandleSuccessCallback(res)
+          console.log(params)
+          this.$http
+            .post('/act/task/complete?' + params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
+                }
+                return
               }
-            }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.dialogVisible = false
+                  this.input = ''
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
+                  }
+                }
+              })
+            })
+            .catch(() => {})
+        } else if (this.dialogType === '拒绝') {
+          const params = qs.stringify({
+            taskId: this.dataForm.taskId,
+            comment: this.input
           })
-        })
-      }
-    }, 1000, { leading: true, trailing: false }),
+          this.$http
+            .post('/act/task/backToFirst?', params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
+                }
+                return
+              }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
+                  }
+                }
+              })
+            })
+        }
+        this.tabRemoveHandle(data)
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
     tabRemoveHandle (tabName) {
       console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
       if (tabName === 'home') {
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index d03ef956..1301e325 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -7,49 +7,77 @@
 -->
 <!--  流程业务表单   -->
 <template>
-  <el-card shadow="never" class="aui-card--fill" :key='showKey'>
-  <!-- 申请人详情 -->
-  <div>
-     <h3>申请人信息</h3>
-    <div class="big-BOX">
-      <p>
-        <span class="text">申请人：<span> {{dataForm.content.user || '--'}}</span></span>
-        <span class="text">电话：<span>{{dataForm.content.phone || '--'}}</span></span>
-        <span class="text">单位：<span>{{dataForm.content.unit || '--'}}</span></span>
-      </p>
-      <p>
-        <span class="text"> 能力申请标题：<span> {{dataForm.content.title|| '--'}}</span></span>
-        <span class="text">应用系统：<span>{{dataForm.content.applicationSystem || '--'}}</span></span>
-        <span class="text">应用场景：<span> {{dataForm.content.applicationSceneStr || '--'}}</span></span>
-      </p>
-      <p>
-        <span> 能力应用期望效果：<span> {{dataForm.content.effectWish|| '--'}}</span></span>
-      </p>
-      <p v-if="dataForm.content.enclosure">
-      <span> 申请附件：<span> {{dataForm.content.enclosure|| '--'}}<button  @click="downloadFile2(dataForm.content.enclosure)">预览</button></span></span>
-
-      </p>
+  <el-card shadow="never" class="aui-card--fill" :key="showKey">
+    <!-- 申请人详情 -->
+    <div>
+      <h3>申请人信息</h3>
+      <div class="big-BOX">
+        <p>
+          <span class="text"
+            >申请人：<span> {{ dataForm.content.user || '--' }}</span></span
+          >
+          <span class="text"
+            >电话：<span>{{ dataForm.content.phone || '--' }}</span></span
+          >
+          <span class="text"
+            >单位：<span>{{ dataForm.content.unit || '--' }}</span></span
+          >
+        </p>
+        <p>
+          <span class="text">
+            能力申请标题：<span>
+              {{ dataForm.content.title || '--' }}</span
+            ></span
+          >
+          <span class="text"
+            >应用系统：<span>{{
+              dataForm.content.applicationSystem || '--'
+            }}</span></span
+          >
+          <span class="text"
+            >应用场景：<span>
+              {{ dataForm.content.applicationSceneStr || '--' }}</span
+            ></span
+          >
+        </p>
+        <p>
+          <span>
+            能力应用期望效果：<span>
+              {{ dataForm.content.effectWish || '--' }}</span
+            ></span
+          >
+        </p>
+        <p v-if="dataForm.content.enclosure">
+          <span>
+            申请附件：<span>
+              {{ dataForm.content.enclosure || '--'
+              }}<button @click="downloadFile2(dataForm.content.enclosure)">
+                预览
+              </button></span
+            ></span
+          >
+        </p>
+      </div>
     </div>
-  </div>
 
-  <!-- 申请能力 -->
-  <div class="AbilityApply">
-     <h3>申请能力</h3>
-    <ul  v-for="item in dataList" :key="item.id">
-      <!-- <li class="title">{{item.address}}</li> -->
-      <li class="clearfix">
-            <img
-              src="~@/assets/img/imgLeft.png"
-            />
-            <div>
-            <h2>{{item.name}}<span>{{item.type}}</span></h2>
-            <p>{{item.describe}}</p>
-            </div>
-      </li>
-    </ul>
-  </div>
+    <!-- 申请能力 -->
+    <div class="AbilityApply">
+      <h3>申请能力</h3>
+      <ul v-for="item in dataList" :key="item.id">
+        <!-- <li class="title">{{item.address}}</li> -->
+        <li class="clearfix">
+          <img src="~@/assets/img/imgLeft.png" />
+          <div>
+            <h2>
+              {{ item.name }}<span>{{ item.type }}</span>
+            </h2>
+            <p>{{ item.describe }}</p>
+          </div>
+        </li>
+      </ul>
+    </div>
     <!--  流程综合组件   -->
-  <!--   <ren-process-multiple
+    <!--   <ren-process-multiple
       v-if="processVisible"
       updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
       saveFormUrl="/processForm/tabilityapplication"
@@ -66,24 +94,31 @@
           <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
         </el-radio-group> -->
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
-        <el-button  type="danger" plain @click="showDialog('拒绝')">拒绝</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >拒绝</el-button
+        >
         <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
         <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
          <el-button class="inputBule" @click="agreeOrNot">提交</el-button> -->
       </div>
     </div>
 
- <!--  流程详情   -->
+    <!--  流程详情   -->
     <ren-process-detail></ren-process-detail>
     <el-dialog
       title="审批意见"
       :visible.sync="dialogVisible"
       width="30%"
-      :before-close="handleClose">
+      :before-close="handleClose"
+    >
       <el-input v-model="input" placeholder="请输入审批意见"></el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose2">取 消</el-button>
-        <el-button type="primary" @click.native="agreeOrNot($store.state.contentTabsActiveName)">确 定</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
       </span>
     </el-dialog>
   </el-card>
@@ -179,11 +214,11 @@ export default {
     },
     handleClose (done) {
       this.$confirm('确认关闭？')
-        .then(_ => {
+        .then((_) => {
           this.input = ''
           done()
         })
-        .catch(_ => {})
+        .catch((_) => {})
     },
     handleClose2 () {
       this.dialogVisible = false
@@ -193,28 +228,43 @@ export default {
       console.log(window.SITE_CONFIG.previewUrl)
       window.open(
         window.SITE_CONFIG.previewUrl +
-        'hisense_office/onlinePreview?url=' +
-        btoa(encodeURI(url))
+          'hisense_office/onlinePreview?url=' +
+          btoa(encodeURI(url))
       )
     },
     // 获取信息
     getInfo () {
       this.$http
-        .get(`/act/task/getTaskVariables?taskId=${this.dataForm.taskId}&variableName=tAbilityApplicationDTOList`)
+        .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============================')
+          console.log(
+            res.data,
+            this.dataForm,
+            'elas============================'
+          )
           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 += '、'
+            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 = {
@@ -223,12 +273,12 @@ export default {
             describe: ''
           }
           let flag = false
-          res.data.tAbilityApplicationDTOList.map(val => {
+          res.data.tAbilityApplicationDTOList.map((val) => {
             if (val.cameraList) {
               flag = true
               obj.describe += val.system
             } else {
-              this.$http.get('/resource/' + val.resourceId).then(res1 => {
+              this.$http.get('/resource/' + val.resourceId).then((res1) => {
                 // console.log(res1.data.data, '1111111111111111111111111111111111')
                 this.dataList.push({
                   name: res1.data.data.name,
@@ -260,63 +310,73 @@ export default {
         .catch(() => {})
     },
     // 同意与退回
-    agreeOrNot: debounce(function (data) {
-      if (this.dialogType === '同意') {
-        console.log('this.dataForm', this.dataForm)
-        const params = qs.stringify({
-          taskId: this.dataForm.taskId,
-          comment: this.input
-        })
-        console.log(params)
-        this.$http.post('/act/task/complete?' + params).then(({ data: res }) => {
-          if (res.code !== 0) {
-            this.$message.error(res.msg)
-            if (this.callbacks.taskHandleErrorCallback) {
-              this.callbacks.taskHandleErrorCallback(res)
-            }
-            return
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              if (this.callbacks.taskHandleSuccessCallback) {
-                this.callbacks.taskHandleSuccessCallback(res)
-              }
-            }
+    agreeOrNot: debounce(
+      function (data) {
+        if (this.dialogType === '同意') {
+          console.log('this.dataForm', this.dataForm)
+          const params = qs.stringify({
+            taskId: this.dataForm.taskId,
+            comment: this.input
           })
-        }).catch(() => {})
-      } else if (this.dialogType === '拒绝') {
-        const params = qs.stringify({
-          taskId: this.dataForm.taskId,
-          comment: this.input
-        })
-        this.$http.post('/act/task/backToFirst?', params).then(({ data: res }) => {
-          if (res.code !== 0) {
-            this.$message.error(res.msg)
-            if (this.callbacks.taskHandleErrorCallback) {
-              this.callbacks.taskHandleErrorCallback(res)
-            }
-            return
-          }
-          this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.visible = false
-              if (this.callbacks.taskHandleSuccessCallback) {
-                this.callbacks.taskHandleSuccessCallback(res)
+          console.log(params)
+          this.$http
+            .post('/act/task/complete?' + params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
+                }
+                return
               }
-            }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  this.dialogVisible = false
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
+                  }
+                }
+              })
+            })
+            .catch(() => {})
+        } else if (this.dialogType === '拒绝') {
+          const params = qs.stringify({
+            taskId: this.dataForm.taskId,
+            comment: this.input
           })
-        })
-      }
-      this.tabRemoveHandle(data)
-      // this.getDataList(data)
-    }, 1000, { leading: true, trailing: false }),
+          this.$http
+            .post('/act/task/backToFirst?', params)
+            .then(({ data: res }) => {
+              if (res.code !== 0) {
+                this.$message.error(res.msg)
+                if (this.callbacks.taskHandleErrorCallback) {
+                  this.callbacks.taskHandleErrorCallback(res)
+                }
+                return
+              }
+              this.$message({
+                message: this.$t('prompt.success'),
+                type: 'success',
+                duration: 500,
+                onClose: () => {
+                  this.visible = false
+                  if (this.callbacks.taskHandleSuccessCallback) {
+                    this.callbacks.taskHandleSuccessCallback(res)
+                  }
+                }
+              })
+            })
+        }
+        this.tabRemoveHandle(data)
+        // this.getDataList(data)
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
     tabRemoveHandle (tabName) {
       console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
       if (tabName === 'home') {
@@ -450,7 +510,7 @@ export default {
     }
     .clearfix:after {
       display: block;
-      content: "";
+      content: '';
       clear: both;
     }
     .title {
@@ -460,7 +520,7 @@ export default {
       border-bottom: 0;
     }
     .title:before {
-      content: "";
+      content: '';
       width: 6px;
       height: 6px;
       display: inline-block;