Commit c014528d authored by LeeJiancong's avatar LeeJiancong

'支付配置策略传id设置'

parent 4b5a5d37
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: LeeJiancong * @Author: LeeJiancong
* @Date: 2020-08-04 15:05:52 * @Date: 2020-08-04 15:05:52
* @LastEditors: LeeJiancong * @LastEditors: LeeJiancong
* @LastEditTime: 2020-09-25 14:01:53 * @LastEditTime: 2020-09-29 15:42:51
*/ */
import utils from '@/utils' import utils from '@/utils'
import menu from '../en-US/menu' import menu from '../en-US/menu'
...@@ -85,6 +85,7 @@ export default { ...@@ -85,6 +85,7 @@ export default {
'menu.requisitionManager.enquirySearch':'需求单查询', 'menu.requisitionManager.enquirySearch':'需求单查询',
'menu.requisitionManager.enquiryDetail':'需求单详情', 'menu.requisitionManager.enquiryDetail':'需求单详情',
'menu.requisitionManager.aduitList':'需求单审核', 'menu.requisitionManager.aduitList':'需求单审核',
'menu.requisitionManager.aduitDetail':'需求单审核详情',
//物流管理 //物流管理
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2020-08-06 19:07:53 * @Date: 2020-08-06 19:07:53
* @LastEditors: LeeJiancong * @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com * @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-08-20 20:16:22 * @LastEditTime: 2020-09-29 15:40:02
*/ */
import React, { useEffect , useState,useRef } from 'react' import React, { useEffect , useState,useRef } from 'react'
import {Card,Button,Modal} from 'antd' import {Card,Button,Modal} from 'antd'
...@@ -155,6 +155,7 @@ const PaySetting: React.FC<{}> = () => { ...@@ -155,6 +155,7 @@ const PaySetting: React.FC<{}> = () => {
console.log('结果',res.data) console.log('结果',res.data)
payActions.setFieldValue('paymentPolicyName',data.paymentPolicyName) payActions.setFieldValue('paymentPolicyName',data.paymentPolicyName)
data.paymentPolicyPayWayRequests.forEach((item,index) => { data.paymentPolicyPayWayRequests.forEach((item,index) => {
payActions.setFieldValue(`id-${index}`,item.id)
payActions.setFieldValue(`ruleConfigurationId-${index}`,item.ruleConfigurationId) payActions.setFieldValue(`ruleConfigurationId-${index}`,item.ruleConfigurationId)
payActions.setFieldValue(`payWayIds-${index}`,item.payWayIds) payActions.setFieldValue(`payWayIds-${index}`,item.payWayIds)
}) })
...@@ -190,15 +191,17 @@ const PaySetting: React.FC<{}> = () => { ...@@ -190,15 +191,17 @@ const PaySetting: React.FC<{}> = () => {
// 整体表单提交 // 整体表单提交
const handleSubmit = (values:any) => { const handleSubmit = (values:any) => {
let baseList: any = GlobalConfig.payConfig.payInitializeConfig let baseList: any = GlobalConfig.payConfig.payInitializeConfig
console.log('values',values) console.log('values:',values,'baseList:',baseList)
let list:any = [] let list:any = []
baseList.forEach((item:any,index:number) => { baseList.forEach((item:any,index:number) => {
let payWayIds = `payWayIds-${index}`, ruleConfigurationId = `ruleConfigurationId-${index}` let payWayIds = `payWayIds-${index}`, ruleConfigurationId = `ruleConfigurationId-${index}`,_id = `id-${index}`
list.push({ list.push({
id: values[_id],
payType: item.payType, payType: item.payType,
['payWayIds']: values[payWayIds], ['payWayIds']: values[payWayIds],
['ruleConfigurationId']:values[ruleConfigurationId] ['ruleConfigurationId']:values[ruleConfigurationId]
}) })
}); });
let params:any = { let params:any = {
paymentPolicyName: values.paymentPolicyName, paymentPolicyName: values.paymentPolicyName,
...@@ -215,6 +218,7 @@ const PaySetting: React.FC<{}> = () => { ...@@ -215,6 +218,7 @@ const PaySetting: React.FC<{}> = () => {
})) }))
params.memberIdRoleIds = memberIdRoleIds params.memberIdRoleIds = memberIdRoleIds
} }
console.log(params)
//新增 //新增
if(!usePageStatus().id){ if(!usePageStatus().id){
console.log('params',params) console.log('params',params)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: LeeJiancong * @Author: LeeJiancong
* @Date: 2020-08-06 11:12:18 * @Date: 2020-08-06 11:12:18
* @LastEditors: LeeJiancong * @LastEditors: LeeJiancong
* @LastEditTime: 2020-08-21 15:08:14 * @LastEditTime: 2020-09-29 15:36:47
*/ */
import React, { useState, useEffect } from 'react' import React, { useState, useEffect } from 'react'
import { ISchema } from '@formily/antd' import { ISchema } from '@formily/antd'
...@@ -36,6 +36,12 @@ export const strategyDetailTab = (props: any, usePageStatus: any) => { ...@@ -36,6 +36,12 @@ export const strategyDetailTab = (props: any, usePageStatus: any) => {
required: true, required: true,
}, },
properties: { properties: {
[`id-${index}`]: {
type: 'string',
display: false,
'x-component-props': {
},
},
[`ruleConfigurationId-${index}`]: { [`ruleConfigurationId-${index}`]: {
type: 'string', type: 'string',
enum: item.ruleConfigurations || [], enum: item.ruleConfigurations || [],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment