From 9c991756eb3b3bcb52ec7094e3708dacacbc3d99 Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 3 Aug 2022 12:10:56 +0800
Subject: [PATCH] 784bug

---
 .../activiti/demo/abilitydemandapply.vue      | 177 ++++++++++++++++-
 .../views/modules/activiti/demo/comments.vue  | 183 +++++++++++++++++-
 .../activiti/demo/putaway-process3.vue        | 126 ++++++------
 .../myAgent/demo/ability-resource-shelf.vue   | 127 ++++++------
 .../myAgent/demo/competency-application.vue   | 124 ++++++------
 .../src/views/demandCenter/demandDetails.vue  |   2 +-
 6 files changed, 550 insertions(+), 189 deletions(-)

diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
index 94acd632..f1b96feb 100644
--- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue
+++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
@@ -64,25 +64,55 @@
       </el-form-item>
     </el-form>
     <!--  流程综合组件   -->
-    <ren-process-multiple
+    <!-- <ren-process-multiple
       v-if="processVisible"
       updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
       saveFormUrl="/processForm/tabilityapplication"
       dataFormName="dataForm"
       ref="renProcessMultiple"
-    ></ren-process-multiple>
+    ></ren-process-multiple> -->
+     <!-- 审批 -->
+    <div class="agreeOr" v-if="taskId">
+      <div>
+        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >驳回</el-button
+        >
+      </div>
+    </div>
+    <!-- 审批弹窗 -->
+     <el-dialog
+      title="审批意见"
+      :close-on-click-modal="false"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :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
+        >
+      </span>
+    </el-dialog>
   </el-card>
 </template>
 
 <script>
 // 引入工作流公共方法
 import processModule from '@/mixins/process-module'
+import qs from 'qs'
+import debounce from 'lodash/debounce'
+import bus from '@/views/bus.js'
 export default {
   // 注入公共方法
   mixins: [processModule],
   data () {
     return {
-      visible: false,
+      // visible: false,
       // 表单属性是否可编辑
       fieldDisabled: false,
       dataForm: {
@@ -94,7 +124,13 @@ export default {
         system: '',
         scene: '',
         basis: ''
-      }
+      },
+      // 审批
+      dialogVisible: false,
+      dialogType: '',
+      input: '',
+      visible: true,
+      taskId: ''
     }
   },
   created () {
@@ -113,6 +149,8 @@ export default {
     }
     // 初始化综合组件
     this.initProcessMultiple(callbacks)
+    this.taskId = this.$route.params.taskId
+    this.dataForm.taskId = this.$route.params.taskId
   },
   computed: {
     dataRule () {
@@ -164,6 +202,128 @@ export default {
         })
         .catch(() => {})
     },
+    // 审批
+    showDialog (title) {
+      this.dialogVisible = true
+      this.dialogType = title
+    },
+    handleClose (done) {
+      this.$confirm('确认关闭？')
+        .then((_) => {
+          this.input = ''
+          done()
+        })
+        .catch((_) => {})
+    },
+    handleClose2 () {
+      this.dialogVisible = false
+      this.input = ''
+    },
+    // 同意与退回
+    agreeOrNot: debounce(
+      function (data) {
+        this.dataForm.taskId = this.$route.params.taskId
+        if (this.dialogType === '同意') {
+          if (this.input !== '') {
+            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
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                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(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        } else if (this.dialogType === '拒绝') {
+          if (this.input !== '') {
+            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
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                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)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        }
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
+    },
     // 启动流程出错回调
     startProcessErrorCallback (data) {
       console.log(data)
@@ -173,3 +333,12 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.agreeOr {
+  & > div {
+    // text-align: right;
+    padding-right: 40px;
+    margin: 20px 0;
+  }
+}
+</style>
diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue
index fe6f3ddd..a21fb7cf 100644
--- a/back/src/views/modules/activiti/demo/comments.vue
+++ b/back/src/views/modules/activiti/demo/comments.vue
@@ -17,18 +17,49 @@
       </el-form>
     </div>
     <!--  流程综合组件   -->
-    <ren-process-multiple
+    <!-- <ren-process-multiple
       v-if="processVisible"
       updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
       saveFormUrl="/processForm/tabilityapplication"
       dataFormName="dataForm"
       ref="renProcessMultiple"
-    ></ren-process-multiple>
+    ></ren-process-multiple> -->
+    <!-- 审批 -->
+    <div class="agreeOr" v-if="taskId">
+      <div>
+        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >驳回</el-button
+        >
+      </div>
+    </div>
+    <!-- 审批弹窗 -->
+     <el-dialog
+      title="审批意见"
+      :close-on-click-modal="false"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :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
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import processModule from '@/mixins/process-module'
+import qs from 'qs'
+import debounce from 'lodash/debounce'
+import bus from '@/views/bus.js'
+
 export default {
   // 注入公共方法
   mixins: [processModule],
@@ -44,12 +75,19 @@ export default {
   data () {
     return {
       // processVisible: true,
-      visible: false,
+      // visible: false,
       // 表单属性是否可编辑
       fieldDisabled: false,
       dataForm: [],
       id: '',
-      shifoushizujian: true
+      shifoushizujian: true,
+      // 审批
+      dialogVisible: false,
+      dialogType: '',
+      input: '',
+      visible: true,
+      taskId: ''
+
     }
   },
   watch: {},
@@ -85,6 +123,128 @@ export default {
         // }
         console.log('this.dataForm', this.dataForm)
       })
+    },
+    // 审批
+    showDialog (title) {
+      this.dialogVisible = true
+      this.dialogType = title
+    },
+    handleClose (done) {
+      this.$confirm('确认关闭？')
+        .then((_) => {
+          this.input = ''
+          done()
+        })
+        .catch((_) => {})
+    },
+    handleClose2 () {
+      this.dialogVisible = false
+      this.input = ''
+    },
+    // 同意与退回
+    agreeOrNot: debounce(
+      function (data) {
+        this.dataForm.taskId = this.$route.params.taskId
+        if (this.dialogType === '同意') {
+          if (this.input !== '') {
+            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
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                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(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        } else if (this.dialogType === '拒绝') {
+          if (this.input !== '') {
+            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
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                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)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        }
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
     }
   },
   created () {
@@ -102,14 +262,21 @@ export default {
     }
     // 初始化综合组件
     this.initProcessMultiple(callbacks)
+    this.taskId = this.$route.params.taskId
+    this.dataForm.taskId = this.$route.params.taskId
   },
   mounted () {}
 }
 </script>
-<style lang="scss">
-  .kuandukuandukuandu{
-    max-width:1500px;
+<style lang="scss" >
+.kuandukuandukuandu {
+  max-width: 1500px;
+}
+.agreeOr {
+  & > div {
+    // text-align: right;
+    padding-right: 40px;
+    margin: 20px 0;
   }
-.wrapper {
 }
 </style>
diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue
index 659b4720..c489b1f9 100644
--- a/back/src/views/modules/activiti/demo/putaway-process3.vue
+++ b/back/src/views/modules/activiti/demo/putaway-process3.vue
@@ -106,7 +106,7 @@
         </el-radio-group> -->
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('拒绝')"
-          >拒绝</el-button
+          >驳回</el-button
         >
         <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
         <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
@@ -229,68 +229,76 @@ export default {
       function (data) {
         this.dataForm.taskId = this.$route.params.taskId
         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
-              }
-              bus.$emit('AbilityResourcesRemovedInit')
-              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)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            console.log('this.dataForm', this.dataForm)
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
             })
-            .catch(() => {})
+            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
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                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(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         } 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
-              }
-              bus.$emit('AbilityResourcesRemovedInit')
-              this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
-                duration: 500,
-                onClose: () => {
-                  this.visible = false
-                  if (this.callbacks.taskHandleSuccessCallback) {
-                    this.callbacks.taskHandleSuccessCallback(res)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            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
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                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)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         }
-        this.tabRemoveHandle(data)
-        // this.getDataList(data)
       },
       1000,
       { leading: true, trailing: false }
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 ea3cbc07..35539d3d 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -201,69 +201,78 @@ export default {
     agreeOrNot: debounce(
       function (data) {
         if (this.dialogType === '同意') {
-          console.log('this.dataForm', this.dataForm)
-          const params = qs.stringify({
-            taskId: this.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
-              }
-              bus.$emit('abilityResourceShelfInit')
-              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)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            console.log('this.dataForm', this.dataForm)
+            const params = qs.stringify({
+              taskId: this.taskId,
+              comment: this.input
             })
-            .catch(() => {})
+            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
+                }
+                bus.$emit('abilityResourceShelfInit')
+                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(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         } else if (this.dialogType === '驳回') {
-          const params = qs.stringify({
-            taskId: this.taskId,
-            comment: this.input
-          })
-          this.$http
-            // .post('/act/task/endProcess?', params)
-            .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
-              }
-              bus.$emit('abilityResourceShelfInit')
-              this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
-                duration: 500,
-                onClose: () => {
-                  this.visible = false
-                  if (this.callbacks.taskHandleSuccessCallback) {
-                    this.callbacks.taskHandleSuccessCallback(res)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            const params = qs.stringify({
+              taskId: this.taskId,
+              comment: this.input
             })
+            this.$http
+            // .post('/act/task/endProcess?', params)
+              .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
+                }
+                bus.$emit('abilityResourceShelfInit')
+                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)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         }
-        this.tabRemoveHandle(data)
       },
       1000,
       { leading: true, trailing: false }
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 4bfc3885..51e77c7a 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -380,68 +380,76 @@ export default {
     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
-              }
-              bus.$emit('competencyApplicationInit')
-              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)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            console.log('this.dataForm', this.dataForm)
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
             })
-            .catch(() => {})
+            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
+                }
+                bus.$emit('competencyApplicationInit')
+                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(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         } 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
-              }
-              bus.$emit('competencyApplicationInit')
-              this.$message({
-                message: this.$t('prompt.success'),
-                type: 'success',
-                duration: 500,
-                onClose: () => {
-                  this.visible = false
-                  if (this.callbacks.taskHandleSuccessCallback) {
-                    this.callbacks.taskHandleSuccessCallback(res)
-                  }
-                }
-              })
+          if (this.input !== '') {
+            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
+                }
+                bus.$emit('competencyApplicationInit')
+                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)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         }
-        this.tabRemoveHandle(data)
-        // this.getDataList(data)
       },
       1000,
       { leading: true, trailing: false }
diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue
index 67c8f99b..97a3c31c 100644
--- a/front/src/views/demandCenter/demandDetails.vue
+++ b/front/src/views/demandCenter/demandDetails.vue
@@ -299,7 +299,7 @@
       if (res.data.code == '0') {
         demandCommentApply({ id: res.data.data.id }).then((res1) => {
           if (res1.data.code == '0') {
-            message.success('提交评价成功，请注意查看消息通知！')
+            message.success('提交评论成功，请注意查看消息通知！')
             myComment.value = ''
             evaluateList()
           }