完善专项返利预提 -- 流程审批增加加签功能

anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatewithholding.js

@@ -93,6 +93,16 @@ export default {
       data: params
     })
   },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/scm/v1/scmspecialrebatewithapply/delegate',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  //
   // 代办任务驳回任务
   reject: function(params) {
     return request({

anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue

@@ -7,6 +7,7 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small" @click="openCountersign('加签')">加 签</el-button>
           <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
           <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
           <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
@@ -74,8 +75,19 @@
     <zhuanxiangfanliyutiInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
-      <el-form class="formaddcopy02" >
+      <el-form class="formaddcopy02">
-        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+        <el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="24">
+            <span class="span-sty icon">*</span>加签人员:
+            <el-form-item>
+              <el-select class="addinputInfo" v-model="countersign.assignee" placeholder="请选择" filterable>
+                <el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="currentLink">
           <el-col :span="24">
             <div class="span-sty"><span>当前环节:</span></div>
             <el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@@ -84,7 +96,9 @@
         <el-row :class="{ rowClass:!currentLink }">
           <el-col :span="24">
             <div class="span-sty"><span>意见:</span></div>
-            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputInfo addinputw" clearable ></el-input></el-form-item>
+            <el-form-item>
+              <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputInfo" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable />
+            </el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -99,6 +113,7 @@
 <script>
 import req from '@/api/specialrebate/specialrebatewithholding'
 import zhuanxiangfanliyutiInfo from './relation/zhuanxiangfanliyutiInfo'
+import { selectStaffListss } from '@/api/Common/dictcommons'
 
 export default {
   name: 'ZhuanXiangFanLiYuTiDaiBanInfo',
@@ -111,18 +126,6 @@ export default {
       index: 0,
       tableKey: 0,
       viewState: 1,
-      operation: '', // 点击操作按钮
-      dialogList: {
-        comment: ''
-      },
-      startTask: true,
-      current: {
-        taskDefKey: '',
-        taskName: '' // 当前环节名称
-      },
-      nextNode: {}, // 下一环节
-      nodeDialogVisible: false,
-      currentLink: true,
       // 表单数据
       formobj: {
         sid: '',
@@ -145,6 +148,20 @@ export default {
       },
       rules: {},
       submitdisabled: false,
+      options: [],
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      countersignLink: false,
       // 环节所需参数
       linkByParameter: {
         businessSid: '',
@@ -154,6 +171,14 @@ export default {
         orgSidPath: '',
         taskDefKey: '',
         userSid: ''
+      },
+      // 加签按钮所需参数
+      countersign: {
+        taskId: '',
+        assignee: '',
+        userSid: '',
+        instanceId: '',
+        views: ''
       }
     }
   },
@@ -168,10 +193,14 @@ export default {
     this.linkByParameter.instanceId = obj.instanceId
     this.linkByParameter.taskId = obj.taskId
     this.linkByParameter.taskDefKey = obj.taskDefKey
-    this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
     this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
     this.current.taskDefKey = obj.taskDefKey
     this.current.taskName = obj.taskName
+    // 加签参数
+    this.countersign.taskId = obj.taskId
+    this.countersign.userSid = window.sessionStorage.getItem('userSid')
+    this.countersign.instanceId = obj.instanceId
     // 加载表单数据
     this.showInfo(obj.businessSid)
   },
@@ -199,6 +228,11 @@ export default {
       }).catch((e) => {
         this.formobj = {}
       })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
+        }
+      })
     },
     handleLook(row) {
       this.viewState = 2
@@ -261,10 +295,26 @@ export default {
       })
       return sums
     },
+    // 加签
+    openCountersign(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
     // 同意
     openAgree(val) {
       this.operation = val
       this.currentLink = true
+      this.countersignLink = false
       this.dialogList.comment = '同意'
       req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
         if (resp.success) {
@@ -279,6 +329,7 @@ export default {
     openReject(val) {
       this.operation = val
       this.currentLink = true
+      this.countersignLink = false
       this.dialogList.comment = ''
       req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
         if (resp.success) {
@@ -293,6 +344,7 @@ export default {
     openStop(val) {
       this.operation = val
       this.currentLink = false
+      this.countersignLink = false
       this.dialogList.comment = ''
       this.nodeDialogVisible = true
     },
@@ -311,7 +363,40 @@ export default {
         } else {
           this.handleStop()
         }
+      } else if (this.operation === '加签') {
+        this.handleCountersign()
+      }
+    },
+    /** 加签 */
+    handleCountersign() {
+      if (this.countersign.assignee === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
+        return
+      }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
       }
+      this.countersign.views = this.dialogList.comment
+      req.delegate(this.countersign).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
     },
     /** 同意任务 */
     handleAgree() {