feat: 收益互换开平仓及收益结算接入OA移动审批
#EQD-6425 国联民生-衍生品系统移动审批(提交OA流程) - 审批节点支持配置“关联OA移动审批” - 创建OA流程并记录请求、requestId、状态及异常备注 - 支持OA轮询同步审批通过、退回和归档状态 - 本地通过、拒绝、撤回时同步强制归档未结束OA流程 - 增加审批列表OA备注展示及本地Mock联调接口 - 新增OA审批记录表和数据库升级脚本 - OA移动审批使用独立查询地址及isnextflow配置,不影响交易确认书OA
This commit is contained in:
@@ -308,6 +308,7 @@ var app = new Vue({
|
||||
approvalGroupId: 0,
|
||||
conditionConfig: '',
|
||||
triggerCondition: '',
|
||||
isOaApproval: false,
|
||||
_trigger: { tokens: [] }
|
||||
}
|
||||
var item2 = {
|
||||
@@ -321,6 +322,7 @@ var app = new Vue({
|
||||
approvalGroupId: 0,
|
||||
conditionConfig: '',
|
||||
triggerCondition: '',
|
||||
isOaApproval: false,
|
||||
_trigger: { tokens: [] }
|
||||
}
|
||||
if (selectType == "2") { //交易
|
||||
@@ -469,6 +471,7 @@ var app = new Vue({
|
||||
approvalGroupId: 0,
|
||||
conditionConfig: '',
|
||||
triggerCondition: '',
|
||||
isOaApproval: false,
|
||||
_trigger: { tokens: [] }
|
||||
}
|
||||
var childNodes = thisObj.openItems.filter(x => x.Index > index);
|
||||
@@ -494,6 +497,7 @@ var app = new Vue({
|
||||
approvalGroupId: 0,
|
||||
conditionConfig: '',
|
||||
triggerCondition: '',
|
||||
isOaApproval: false,
|
||||
_trigger: { tokens: [] }
|
||||
}
|
||||
thisObj.getRuleType();
|
||||
@@ -956,7 +960,8 @@ var app = new Vue({
|
||||
approvalGroupId: value.approvalGroupId,
|
||||
approvalCondition: value.approvalCondition,
|
||||
conditionConfig: value.conditionConfig,
|
||||
triggerCondition: value.triggerCondition
|
||||
triggerCondition: value.triggerCondition,
|
||||
isOaApproval: value.isOaApproval === true
|
||||
});
|
||||
});
|
||||
|
||||
@@ -972,7 +977,8 @@ var app = new Vue({
|
||||
approvalGroupId: value.approvalGroupId,
|
||||
approvalCondition: value.approvalCondition,
|
||||
conditionConfig: value.conditionConfig,
|
||||
triggerCondition: value.triggerCondition
|
||||
triggerCondition: value.triggerCondition,
|
||||
isOaApproval: value.isOaApproval === true
|
||||
});
|
||||
});
|
||||
// 需求②:了结/平仓/行权审批流程
|
||||
@@ -990,6 +996,7 @@ var app = new Vue({
|
||||
approvalCondition: value.approvalCondition,
|
||||
conditionConfig: value.conditionConfig,
|
||||
triggerCondition: value.triggerCondition
|
||||
,isOaApproval: value.isOaApproval === true
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -79,6 +79,13 @@ var colModelGrid = [
|
||||
width: 60,
|
||||
align: 'left'
|
||||
},
|
||||
{
|
||||
name: 'OaRemark',
|
||||
label: 'OA备注',
|
||||
index: 'OaRemark',
|
||||
width: 80,
|
||||
align: 'left'
|
||||
},
|
||||
{
|
||||
name: 'id',
|
||||
label: 'id',
|
||||
@@ -1038,4 +1045,4 @@ function ProcessOptDateFilter(cellValue, options, rowObject) {
|
||||
}
|
||||
|
||||
$("#DateFromTradeDate").parent().addClass("trade-wrap");
|
||||
$("#DateFromOptDate").parent().addClass("time-wrap");
|
||||
$("#DateFromOptDate").parent().addClass("time-wrap");
|
||||
|
||||
Reference in New Issue
Block a user