diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
index f1b96feb..87e5ba5a 100644
--- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue
+++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue
@@ -73,11 +73,16 @@
     ></ren-process-multiple> -->
      <!-- 审批 -->
     <div class="agreeOr" v-if="taskId">
-      <div>
-        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+      <div class="approvalOperation">
+        <!-- <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('拒绝')"
           >驳回</el-button
-        >
+        > -->
+       <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'驳回')">驳回</el-button>
+        </div> 
       </div>
     </div>
     <!-- 审批弹窗 -->
@@ -221,9 +226,9 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
+      function (data,type) {
         this.dataForm.taskId = this.$route.params.taskId
-        if (this.dialogType === '同意') {
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -260,7 +265,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '拒绝') {
+        } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -341,4 +346,102 @@ export default {
     margin: 20px 0;
   }
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    line-height: 32px;
+    .el-input__inner{
+         height: 32px;
+         width: 500px;
+          line-height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin-left: 10px;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>
diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue
index 4f2a6d5c..cdb82ce9 100644
--- a/back/src/views/modules/activiti/demo/comments.vue
+++ b/back/src/views/modules/activiti/demo/comments.vue
@@ -32,11 +32,16 @@
     ></ren-process-multiple> -->
     <!-- 审批 -->
     <div class="agreeOr" v-if="taskId">
-      <div>
-        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+      <div class="approvalOperation">
+        <!-- <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('拒绝')"
           >驳回</el-button
-        >
+        > -->
+         <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'拒绝')">驳回</el-button>
+        </div> 
       </div>
     </div>
     <!-- 审批弹窗 -->
@@ -149,9 +154,9 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
+      function (data,type) {
         this.dataForm.taskId = this.$route.params.taskId
-        if (this.dialogType === '同意') {
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -188,7 +193,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '拒绝') {
+        } else if (type === '拒绝') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -291,4 +296,102 @@ export default {
   height: 100px;
   resize: none;
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    line-height: 32px;
+    .el-input__inner{
+         height: 32px;
+         width: 500px;
+          line-height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin-left: 10px;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>
diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue
index 7e1bbb0a..8df6d5fe 100644
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@@ -521,12 +521,11 @@ export default {
       })
         .then(async () => {
           let ids = []
-          if (this.deleteDataArr.length > 1) {
+          if(row.id && this.deleteDataArr.length==0){
+             ids = [row.id]
+          }else{
             ids = this.deleteDataArr
-          } else {
-            ids = [row.id]
           }
-          console.log(ids)
           this.$http
             .delete('/workdynamics/delete', {
               data: ids
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 663d940a..98a53e6d 100644
--- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
+++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
@@ -35,12 +35,18 @@
     <!-- 审批 -->
     <div class="agreeOr" v-if="taskId">
       <h3>审批</h3>
-      <div>
-        <el-button type="info" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
+      <div class="approvalOperation">
+          <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'驳回')">驳回</el-button>
+          <el-button class="transferButton" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
+        </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
-        >
+        > -->
         <!-- <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>
@@ -243,8 +249,8 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
-        if (this.dialogType === '同意') {
+      function (data,type) {
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -282,7 +288,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '驳回') {
+        } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.taskId,
@@ -358,7 +364,7 @@ export default {
 }
 ::v-deep .agreeOr > div {
   display: flex;
-  align-items: center;
+  //align-items: center;
   .el-input {
     margin-right: 10px;
     margin-left: 32px;
@@ -416,4 +422,99 @@ export default {
 .blueInput {
   width: 55px;
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    ::v-deep.el-input__inner{
+        height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>
diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue
index 5bce2930..0b863954 100644
--- a/back/src/views/modules/myAgent/demo/competency-application.vue
+++ b/back/src/views/modules/myAgent/demo/competency-application.vue
@@ -89,15 +89,18 @@
     <!-- 审批 -->
     <div class="agreeOr" v-if="dataForm.taskId">
       <h3>审批</h3>
-      <div>
+      <div class="approvalOperation">
         <!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
           <el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button>
           <el-radio-button label="退回" class="redAll" @click="showDialog('退回')">退回</el-radio-button>
         </el-radio-group> -->
         <!-- 委托 -->
-        <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>
+        <div class="contentOperation">
+          <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+          <el-button class="agreeButton" @click="agreeOrNot($store.state.contentTabsActiveName,'同意')">同意</el-button>
+          <el-button class="rejectButton"  @click="agreeOrNot($store.state.contentTabsActiveName,'驳回')">驳回</el-button>
+          <el-button class="transferButton" @click="entrustTask()" v-if='taskEntrustFlag && taskEntrustFlag2'>转办</el-button>
+        </div>
         <!-- <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> -->
@@ -107,14 +110,14 @@
         <ren-task-entrust v-if="renTaskEntrustVisible" ref="renTaskEntrust"></ren-task-entrust>
     <!--  流程详情   -->
     <ren-process-detail ref="renProcessMultiple"></ren-process-detail>
-    <el-dialog title="审批意见" :close-on-click-modal="false" :visible.sync="dialogVisible" width="30%"
+    <!-- <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-dialog> -->
   </el-card>
 </template>
 
@@ -169,6 +172,7 @@ export default {
     this.$http.get('/sys/user/info').then(({ data: res }) => {
       res.data.roleIdList.map(val => {
         this.$http.get('/sys/role/' + val).then(role => {
+          console.log('role',role);
           if (role.data.data.name === '流程管理员') {
             this.taskEntrustFlag = true
           }
@@ -190,7 +194,7 @@ export default {
       formSaveErrorCallback: null
     }
     // 初始化综合组件
-    this.initProcessMultiple(callbacks)
+    this.initProcessMultiple(callbacks);
   },
   computed: {
     // dataRule () {
@@ -410,8 +414,10 @@ export default {
     },
     // 同意与退回
     agreeOrNot: debounce(
-      function (data) {
-        if (this.dialogType === '同意') {
+      function (data,type) {
+          //console.log('datadata',data);
+          //console.log('tttttt',type);
+        if (type === '同意') {
           if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
@@ -448,7 +454,7 @@ export default {
           } else {
             this.$message.error('请输入审批意见！')
           }
-        } else if (this.dialogType === '驳回') {
+        } else if (type === '驳回') {
           if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -670,7 +676,7 @@ export default {
 
 ::v-deep .agreeOr > div {
   display: flex;
-  align-items: center;
+  //align-items: center;
 
   .el-input {
     margin-right: 10px;
@@ -737,4 +743,99 @@ export default {
 .blueInput {
   width: 55px;
 }
+.approvalOperation{
+  display: flex;
+  flex-direction: column;
+  .contentOperation{
+    display: flex;
+  flex-direction: row;
+  margin-bottom: 10px;
+  .el-input{
+    margin-left: 0px;
+    width: 500px;
+    height: 32px;
+    ::v-deep.el-input__inner{
+        height: 32px;
+    }
+  }
+  .agreeButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #ffffff;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    background-color: #0058e1;
+  }
+  .agreeButton:hover{
+    background: #65a5f9;
+    border-color: #65a5f9;
+    color: #FFF;
+  }
+  .rejectButton{
+    display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #F56C6C;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #F56C6C;
+    margin-left: 12px;
+  }
+ .rejectButton:hover{
+    background-color: #F56C6C;
+    border-color: #F56C6C;
+    color: #ffffff;
+  }
+  .transferButton{
+     display: inline-block;
+    line-height: 8px;
+    width:80px;
+    height: 32px;
+    white-space: nowrap;
+    cursor: pointer;
+    color: #0058e1;
+    -webkit-appearance: none;
+    text-align: center;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    outline: 0;
+    margin: 0;
+    -webkit-transition: .1s;
+    transition: .1s;
+    font-weight: 500;
+    //padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    border-color: #0058e1;
+    margin-left: 12px;
+  }
+  }
+}
 </style>
diff --git a/back/src/views/modules/sys/menu.vue b/back/src/views/modules/sys/menu.vue
index bbc70ae3..005b6f9e 100644
--- a/back/src/views/modules/sys/menu.vue
+++ b/back/src/views/modules/sys/menu.vue
@@ -9,6 +9,15 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__menu">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+         <el-form-item>
+          <el-input v-model="dataForm.name" :placeholder="$t('process.name')" clearable></el-input>
+        </el-form-item>
+          <el-form-item>
+          <el-button  type="primary" @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+           <el-button  type="primary" @click="resetHandle()">{{ $t('reset') }}</el-button>
+        </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:menu:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
@@ -52,11 +61,22 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/menu/list',
         deleteURL: '/sys/menu'
-      }
+      },
+       dataForm: {
+           name: null
+       },
     }
   },
   components: {
     AddOrUpdate
+  },
+    methods: {
+    resetHandle() {
+      this.dataForm.name = '';
+      this.$nextTick(() => {
+        this.getDataList()
+      })
+    },
   }
 }
 </script>
diff --git a/back/src/views/modules/sys/role.vue b/back/src/views/modules/sys/role.vue
index e6f4c2ab..4f549b1f 100644
--- a/back/src/views/modules/sys/role.vue
+++ b/back/src/views/modules/sys/role.vue
@@ -6,7 +6,7 @@
           <el-input v-model="dataForm.name" :placeholder="$t('role.name')" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()" type="primary">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:role:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>