车辆列表
@@ -311,6 +343,8 @@
+
+
@@ -322,6 +356,7 @@ import trailerCar from './relation/trailerCar'
import top from './relation/top'
import paymentInformationAdd from './relation/paymentInformationAdd'
import paymentInformationInfo from './relation/paymentInformationInfo'
+import closingPayment from './relation/closingPayment'
import tops from '@/components/publicPage/tops'
export default {
@@ -332,7 +367,8 @@ export default {
top,
paymentInformationAdd,
paymentInformationInfo,
- tops
+ tops,
+ closingPayment
},
data() {
return {
@@ -344,6 +380,7 @@ export default {
paymentKey: 2,
trailerKey: 3,
topKey: 4,
+ eveKey: 5,
index: 0,
carBrand_list: [],
costRange_list: [],
@@ -379,6 +416,7 @@ export default {
carBrandSid: '', // 品牌sid
carBrandName: '', // 品牌名称
orgSidPath: '',
+ eveList: [], // 融资平仓付款明细列表
detailsList: [], // 付款信息列表
vehicleList: [], // 主车车辆列表
trailerList: [], // 挂车列表
@@ -537,6 +575,42 @@ export default {
this.formobj.payCompanySid = ''
}
},
+ handleSelect() {
+ this.viewState = 8
+ this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid)
+ },
+ deleteEve(index) {
+ this.formobj.eveList.splice(index, 1)
+ },
+ backClosingPayment(value) {
+ this.viewState = 1
+ value = JSON.parse(JSON.stringify(value))
+ console.log(value, 77)
+ value.forEach((e) => {
+ this.formobj.eveList.push({
+ sid: '', // sid
+ applySid: '', // 付款申请sid
+ costTitleValue: e.costTitleValue, // 平仓款名称
+ openDate: e.openDate, // 融资付款开通日期
+ period: e.period, // 期数
+ payWayKey: '', // 付款方式Key
+ payWayValue: '', // 付款方式Value
+ receiveCompany: e.receiveCompany, // 收款单位名称
+ receivingAccount: e.receivingAccount, // 收款银行账号
+ bank: e.bank, // 开户行
+ exePayPrice: e.exePayPrice, // 平仓付款金额
+ remarks: e.remarks
+ })
+ })
+ },
+ changePayWay(value, row) {
+ const choose = this.payment_list.filter((item) => item.dictValue === value)
+ if (choose.length > 0 && choose !== null) {
+ row.payWayKey = choose[0].dictKey
+ } else {
+ row.payWayKey = ''
+ }
+ },
handleAdd() {
if (this.formobj.carBrandName === '') {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
@@ -924,6 +998,7 @@ export default {
carBrandSid: '', // 品牌sid
carBrandName: '', // 品牌名称
orgSidPath: '',
+ eveList: [], // 融资平仓付款明细列表
detailsList: [], // 付款信息列表
vehicleList: [], // 主车车辆列表
trailerList: [], // 挂车列表
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
index 832a84512d..7def996843 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
@@ -58,24 +58,43 @@
车辆列表
@@ -222,6 +241,7 @@ export default {
paymentKey: 2,
trailerKey: 3,
topKey: 4,
+ eveKey: 5,
index: 0,
formobj: {
billNo: '', // 申请编号
@@ -250,6 +270,7 @@ export default {
carBrandSid: '', // 品牌sid
carBrandName: '', // 品牌名称
orgSidPath: '',
+ eveList: [], // 融资平仓付款明细列表
detailsList: [], // 付款信息列表
vehicleList: [], // 主车车辆列表
trailerList: [], // 挂车列表
@@ -390,6 +411,7 @@ export default {
carBrandSid: '', // 品牌sid
carBrandName: '', // 品牌名称
orgSidPath: '',
+ eveList: [], // 融资平仓付款明细列表
detailsList: [], // 付款信息列表
vehicleList: [], // 主车车辆列表
trailerList: [], // 挂车列表
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
new file mode 100644
index 0000000000..04d1f72e17
--- /dev/null
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/closingPayment.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
index 0fc373a07e..0fd3f9b0e8 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
@@ -60,24 +60,43 @@
-
付款明细
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
付款明细
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
车辆列表
@@ -246,6 +265,7 @@ export default {
paymentKey: 2,
trailerKey: 3,
topKey: 4,
+ eveKey: 5,
index: 0,
formobj: {
billNo: '', // 申请编号
@@ -274,6 +294,7 @@ export default {
carBrandSid: '', // 品牌sid
carBrandName: '', // 品牌名称
orgSidPath: '',
+ eveList: [], // 融资平仓付款明细列表
detailsList: [], // 付款信息列表
vehicleList: [], // 主车车辆列表
trailerList: [], // 挂车列表
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
index e7bc30cd7b..26e910b3ab 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
@@ -87,59 +87,90 @@
-
-
付款明细
-
添加
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+ 新增关联付款
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
-
-
-
-
- 删除
- 新增关联付款
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
车辆列表
@@ -310,6 +341,8 @@
+
+
@@ -321,6 +354,7 @@ import trailerCar from './relation/trailerCar'
import top from './relation/top'
import paymentInformationAdd from './relation/paymentInformationAdd'
import paymentInformationInfo from './relation/paymentInformationInfo'
+import closingPayment from './relation/closingPayment'
import tops from '@/views/workFlow/publicPage/tops'
export default {
@@ -331,7 +365,8 @@ export default {
top,
paymentInformationAdd,
paymentInformationInfo,
- tops
+ tops,
+ closingPayment
},
data() {
return {
@@ -343,6 +378,7 @@ export default {
paymentKey: 2,
trailerKey: 3,
topKey: 4,
+ eveKey: 5,
index: 0,
carBrand_list: [],
costRange_list: [],
@@ -378,6 +414,7 @@ export default {
carBrandSid: '', // 品牌sid
carBrandName: '', // 品牌名称
orgSidPath: '',
+ eveList: [], // 融资平仓付款明细列表
detailsList: [], // 付款信息列表
vehicleList: [], // 主车车辆列表
trailerList: [], // 挂车列表
@@ -528,6 +565,42 @@ export default {
this.formobj.payCompanySid = ''
}
},
+ handleSelect() {
+ this.viewState = 8
+ this.$refs['divClosingPayment'].showData(this.formobj.eveList, this.formobj.useOrgSid)
+ },
+ deleteEve(index) {
+ this.formobj.eveList.splice(index, 1)
+ },
+ backClosingPayment(value) {
+ this.viewState = 1
+ value = JSON.parse(JSON.stringify(value))
+ console.log(value, 77)
+ value.forEach((e) => {
+ this.formobj.eveList.push({
+ sid: '', // sid
+ applySid: '', // 付款申请sid
+ costTitleValue: e.costTitleValue, // 平仓款名称
+ openDate: e.openDate, // 融资付款开通日期
+ period: e.period, // 期数
+ payWayKey: '', // 付款方式Key
+ payWayValue: '', // 付款方式Value
+ receiveCompany: e.receiveCompany, // 收款单位名称
+ receivingAccount: e.receivingAccount, // 收款银行账号
+ bank: e.bank, // 开户行
+ exePayPrice: e.exePayPrice, // 平仓付款金额
+ remarks: e.remarks
+ })
+ })
+ },
+ changePayWay(value, row) {
+ const choose = this.payment_list.filter((item) => item.dictValue === value)
+ if (choose.length > 0 && choose !== null) {
+ row.payWayKey = choose[0].dictKey
+ } else {
+ row.payWayKey = ''
+ }
+ },
handleAdd() {
if (this.formobj.carBrandName === '') {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
index b47b0fb266..07c43943d8 100644
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
@@ -58,24 +58,43 @@
-
付款明细
-
-
-
-
-
-
-
-
-
-
-
-
- 查看
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
付款明细
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+
车辆列表
@@ -221,6 +240,7 @@ export default {
paymentKey: 2,
trailerKey: 3,
topKey: 4,
+ eveKey: 5,
index: 0,
formobj: {
billNo: '', // 申请编号
@@ -249,6 +269,7 @@ export default {
carBrandSid: '', // 品牌sid
carBrandName: '', // 品牌名称
orgSidPath: '',
+ eveList: [], // 融资平仓付款明细列表
detailsList: [], // 付款信息列表
vehicleList: [], // 主车车辆列表
trailerList: [], // 挂车列表
diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue
new file mode 100644
index 0000000000..e44f12749d
--- /dev/null
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/closingPayment.vue
@@ -0,0 +1,181 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue
index 5d0db76d11..08f3143fec 100644
--- a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue
+++ b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagement.vue
@@ -459,9 +459,9 @@ export default {
},
toEdit() {
if (this.multipleSelection.length === 1) {
- if (!this.multipleSelection[0].updateBtn) {
+ if (this.multipleSelection[0].updateBtn) {
this.viewState = 3
- this.$refs['divAdd'].showEdit(this.multipleSelection)
+ this.$refs['divAdd'].showEdit({ sid: this.sids[0] })
} else {
this.$message({ showClose: true, type: 'error', message: '该记录已报备且仍在有效期内,无法再次编辑' })
}
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
index 44d7e7ba8b..bf5a4f57a0 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/HrHireApplyRest.java
@@ -51,13 +51,13 @@ public class HrHireApplyRest {
}
@ApiOperation(value = "驳回任务")
- @PostMapping(value = "/reject")
+ @PutMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody TaskDto dto) {
return hrHireApplyService.reject(dto);
}
@ApiOperation(value = "办理(同意)")
- @PostMapping("/complete")
+ @PutMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
return hrHireApplyService.complete(dto);
}
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java
index b3e4160969..36ba330ccb 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/OaFormRest.java
@@ -56,7 +56,7 @@ public class OaFormRest {
}
@ApiOperation(value = "办理(同意)")
- @PostMapping("/complete")
+ @PutMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
BusinessVariablesDto businessVariables = new BusinessVariablesDto();
BeanUtil.copyProperties(dto, businessVariables);
@@ -76,25 +76,25 @@ public class OaFormRest {
}
@ApiOperation(value = "驳回任务")
- @PostMapping(value = "/reject")
+ @PutMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody TaskDto dto) {
return oaFormService.reject(dto);
}
@ApiOperation(value = "撤回流程")
- @PostMapping(value = "/revokeProcess")
+ @PutMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody TaskDto dto) {
return oaFormService.revokeProcess(dto);
}
@ApiOperation(value = "终止任务")
- @PostMapping(value = "/breakProcess")
+ @PutMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody TaskDto dto) {
return oaFormService.breakProcess(dto);
}
@ApiOperation(value = "加签")
- @PostMapping(value = "/delegate")
+ @PutMapping(value = "/delegate")
public ResultBean delegate(@RequestBody DelegateDto dto) {
return oaFormService.delegate(dto);
}
diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
index 10fcc97e1a..55b5fa55d8 100644
--- a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
+++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaFormService.java
@@ -381,6 +381,7 @@ public class OaFormService extends MybatisBaseService
{
if (businessTaskId.equals(dto.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(dto, flowTaskVo);
+ flowTaskVo.setInstanceId(dto.getProcInsId());
ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@@ -417,6 +418,7 @@ public class OaFormService extends MybatisBaseService {
if (dto.getUserSid().equals(oaForm.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(dto, flowTaskVo);
+ flowTaskVo.setInstanceId(dto.getProcInsId());
ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());