Merge remote-tracking branch 'origin/master'

1 year ago · a8623f2110
5 changed files with 69 additions and 67 deletions
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
@ -240,7 +240,7 @@ public interface BusDeliveredApplyFeign {
    public ResultBean delegate(@RequestBody DeliveredDelegateQuery deliveredDelegateQuery);

    @ApiOperation(value = "欠款出库转办")
-    @PutMapping(value = "/assignTask")
+    @PostMapping(value = "/assignTask")
    @ResponseBody
    public ResultBean assignTask(@RequestBody DeliveredDelegateQuery query);

--- a/anrui-buscenter/anrui-buscenter-ui/src/api/tesheshenpi/debtrelease.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/tesheshenpi/debtrelease.js
@ -104,6 +104,17 @@ export function revokeProcess(data) {
    }
  })
 }
+// 代办任务转办任务
+export function assignTask(data) {
+  return request({
+    url: '/buscenter/v1/busdeliveredapply/assignTask',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
 // 代办任务加签任务
 export function delegate(data) {
  return request({
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/qiankuanchukuFlow/debtreleaseDaiBan.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/qiankuanchukuFlow/debtreleaseDaiBan.vue
@ -4,6 +4,7 @@
      <div class="tab-header webtop">
        <div>欠款出库申请详情</div>
        <div>
+          <el-button type="primary" size="small" @click="openTurnDo('转办')">转 办</el-button>
          <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>
@ -215,7 +216,12 @@
      <el-form class="formadd" >
        <el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
          <el-col :span="4" class="tleftb">
-            <span><span class="icon">*</span>加签人员:</span>
+            <span v-show="operation == '加签'">
+              <span class="icon">*</span>加签人员:
+            </span>
+            <span v-show="operation == '转办'">
+              <span class="icon">*</span>转办人员:
+            </span>
          </el-col>
          <el-col :span="20">
            <el-form-item>
@ -252,7 +258,7 @@
 </template>

 <script>
-import { getRetrievalApplyInfoBySid, trailerList, complete, breakProcess, reject, delegate, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/tesheshenpi/debtrelease'
+import { getRetrievalApplyInfoBySid, trailerList, complete, breakProcess, reject, delegate, assignTask, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/tesheshenpi/debtrelease'
 import userInfoLook from '../chukuguanliFlow/chukuguanli/relation/userInfo'
 import guacheInfo from '../chukuguanliFlow/chukuguanli/relation/guacheInfo'
 import shangzhuangInfo from '../chukuguanliFlow/chukuguanli/relation/shangzhuangInfo'
@ -464,6 +470,21 @@ export default {
      }
    },
    // ------------ 功能实现 ------------
+    // 转办
+    openTurnDo(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      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
+      })
+    },
    // 加签
    openCountersign(val) {
      this.operation = val
@ -534,7 +555,40 @@ export default {
        }
      } else if (this.operation === '加签') {
        this.handleCountersign()
+      } else if (this.operation === '转办') {
+        this.handleAssignTask()
+      }
+    },
+    // 转办
+    handleAssignTask() {
+      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
+      assignTask(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
+            }
+          }, '*')
+        }
+      })
    },
    /** 加签 */
    handleCountersign() {
--- a/anrui-riskcenter-ui/src/api/delinquentcustomerfiling/delinquentcustomerfiling.js
+++ b/anrui-riskcenter-ui/src/api/delinquentcustomerfiling/delinquentcustomerfiling.js
@ -94,15 +94,6 @@ export default {
      headers: { 'Content-Type': 'application/json' }
    })
  },
-  // 流程审批（转办）
-  assignTask: function(params) {
-    return request({
-      url: '/buscenter/v1/busdeliveredapply/assignTask',
-      method: 'post',
-      data: params,
-      headers: { 'Content-Type': 'application/json' }
-    })
-  },
  // 审批流程（同意）获取下一环节
  getNextNodesForSubmit: function(data) {
    return request({
--- a/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingDaiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/qiankuanbeianFlow/delinquentcustomerfilingDaiBan.vue
@ -4,7 +4,6 @@
      <div class="tab-header webtop">
        <div>{{ viewTitle }}</div>
        <div>
-          <el-button type="primary" size="small" @click="openTurnDo('转办')">转 办</el-button>
          <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>
@ -191,12 +190,7 @@
      <el-form class="formadd" >
        <el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
          <el-col :span="4" class="tleftb">
-            <span v-show="operation == '加签'">
-              <span class="icon">*</span>加签人员:
-            </span>
-            <span v-show="operation == '转办'">
-              <span class="icon">*</span>转办人员:
-            </span>
+            <span class="icon">*</span>加签人员:
          </el-col>
          <el-col :span="20">
            <el-form-item>
@ -365,21 +359,6 @@ export default {
        }
      })
    },
-    // 转办
-    openTurnDo(val) {
-      this.operation = val
-      this.currentLink = true
-      this.countersignLink = true
-      this.dialogList.comment = ''
-      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
-      })
-    },
    // 加签
    openCountersign(val) {
      this.operation = val
@ -450,40 +429,7 @@ export default {
        }
      } else if (this.operation === '加签') {
        this.handleCountersign()
-      } else if (this.operation === '转办') {
-        this.handleAssignTask()
-      }
-    },
-    // 转办
-    handleAssignTask() {
-      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.assignTask(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
-            }
-          }, '*')
-        }
-      })
    },
    /** 加签 */
    handleCountersign() {