Skip to content

J
jinfa-admin
Commit d538b437 authored by Bill's avatar Bill
Browse files
Options

Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev

parents a4d43580 ee26d912
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 132 deletions
src/constants/index.ts
View file @ d538b437
......@@ -36,10 +36,10 @@ export const ORDER_TYPE = ['',
'需求采购',
'现货采购',
'集采',
'积分兑换',
'渠道直采',
'渠道现货',
'渠道积分兑换',
'积分兑换',
'渠道积分兑换'
]
export enum TEMPLATE_TYPE {
......@@ -1278,4 +1278,4 @@ export const PAY_CHANNEL = {
[PAY_CHANNEL_OFFLINE]: '线下支付',
[PAY_CHANNEL_CREDIT]: '授信',
[PAY_CHANNEL_COD]: '货到付款',
};
\ No newline at end of file
};
src/pages/capitalAccount/accountLists/index.tsx
View file @ d538b437
......@@ -117,10 +117,10 @@ const AccountLists: React.FC<{}> = () => {
const res = await PublicApi.getMemberManagePageitems()
if (res.code === 1000) {
const { data = {} }: any = res
const {
memberTypes = [],
roles = [],
levels = [],
const {
memberTypes = [],
roles = [],
levels = [],
} = data
return {
......@@ -189,9 +189,9 @@ const AccountLists: React.FC<{}> = () => {
layout="vertical"
form={checkForm}
>
<Form.Item
name="remark"
label={currentRecord?.accountStatus === 1 ? '会员冻结原因' : '会员解冻原因'}
<Form.Item
name="remark"
label={currentRecord?.accountStatus === 1 ? '会员账户冻结原因' : '会员账户解冻原因'}
rules={[
{
required: true,
......
src/pages/capitalAccount/checkWithdraw/checkDetails.tsx
View file @ d538b437
......@@ -41,7 +41,7 @@ const CheckDetail: React.FC<{}> = () => {
const { code, data } = res
setDetails(data)
if(code === 1000) {
let bankRes = await PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.memberId + ''})
let bankRes: any = await PublicApi.getSettleAccountsPlatformConfigGetPlatformAccountConfig()
setBankDetail(bankRes.data)
}
}
......@@ -66,7 +66,7 @@ const CheckDetail: React.FC<{}> = () => {
title: '交易时间',
dataIndex: 'tradeTime',
key: 'tradeTime',
render: (text: any) => moment(text).format("YYYY-MM-DD HH:mm:ss")
render: (text: any) => moment(text).format("YYYY-MM-DD HH:mm:ss")
},
{
title: '交易金额(元)',
......@@ -116,7 +116,7 @@ const CheckDetail: React.FC<{}> = () => {
}
const handleCancel = () => {
checkForm.resetFields()
checkForm.resetFields()
setVisibleModal(false)
}
......@@ -126,7 +126,7 @@ const CheckDetail: React.FC<{}> = () => {
onBack={() => history.goBack()}
backIcon={<ReutrnEle />}
extra={ urlParams.preview ? [] : [
<Button
<Button
icon={<CheckSquareOutlined />}
key="1"
type="primary"
......@@ -288,8 +288,8 @@ const CheckDetail: React.FC<{}> = () => {
layout="vertical"
form={checkForm}
>
<Form.Item
name="status"
<Form.Item
name="status"
label=""
rules={[
{
......@@ -305,8 +305,8 @@ const CheckDetail: React.FC<{}> = () => {
</Radio.Group>
</Form.Item>
{
checkStatus===2 && <Form.Item
name="remark"
checkStatus===2 && <Form.Item
name="remark"
label={'审核不通过原因'}
rules={[
{
......
src/pages/capitalAccount/checkWithdraw/index.tsx
View file @ d538b437
......@@ -11,7 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { searchSchema } from './schema'
import { FORM_FILTER_PATH } from '@/formSchema/const'
import EyePreview from '@/components/EyePreview'
import { DatePicker } from '@formily/antd-components'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import StatusTag from '@/components/StatusTag'
import { statusMap } from '../constant'
import moment from 'moment'
......@@ -86,14 +86,14 @@ const CheckWithdraw: React.FC<{}> = () => {
}
const clickUp = (r: any) => {
let params = {
let params = {
tradeCode: r.tradeCode,
id: r.memberAssetAccount.id,
tradeId: r.id,
amount: r.tradeMoney,
preview: r.preview,
status: r.status,
}
}
history.push(`/capitalAccount/checkWithdraw/details?detailinfo=${btoa(JSON.stringify(params))}`)
}
......@@ -139,7 +139,7 @@ const CheckWithdraw: React.FC<{}> = () => {
controlRender={
<NiceForm
components={{
RangePicker: DatePicker.RangePicker
DateRangePickerUnix,
}}
actions={formActions}
onSubmit={values => ref.current.reload(values)}
......
src/pages/capitalAccount/checkWithdraw/schema/index.tsx
View file @ d538b437
......@@ -75,7 +75,7 @@ export const searchSchema: ISchema = {
},
"[startTime,endTime]": {
type: 'array',
"x-component": 'RangePicker',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
},
......@@ -94,4 +94,4 @@ export const searchSchema: ISchema = {
},
},
},
};
\ No newline at end of file
};
src/pages/capitalAccount/constant.ts
View file @ d538b437
......@@ -3,14 +3,16 @@
*/
// 交易记录状态
export const statusMap = {
export const statusMap = {
'1': { title: '申请提现', type: 'warning' },
'2': { title: '审核通过', type: 'success' },
'3': { title: '审核不通过', type: 'default' },
'4': { title: '提现成功', type: 'success' },
'5': { title: '提现失败', type: 'danger' },
'6': { title: '支付中', type: 'processing' },
'7': { title: '确认到账', type: 'success' },
'7': { title: '支付失败', type: 'danger' },
'8': { title: '确认到账', type: 'success' },
'9': { title: '支付成功', type: 'success' },
}
// 流转状态
......@@ -50,7 +52,7 @@ export const operationMap = {
// 会员类型
export const accountMemberType = {
'1': '企业会员',
'2': '企业个人会员',
'2': '个人会员',
'3': '渠道会员',
'4': '渠道个人会员',
}
\ No newline at end of file
}
src/pages/capitalAccount/paymentWithdraw/index.tsx
View file @ d538b437
......@@ -11,7 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { searchSchema } from './schema'
import { FORM_FILTER_PATH } from '@/formSchema/const'
import EyePreview from '@/components/EyePreview'
import { DatePicker } from '@formily/antd-components'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import StatusTag from '@/components/StatusTag'
import { statusMap } from '../constant'
import moment from 'moment'
......@@ -80,17 +80,17 @@ const PaymentWithdraw: React.FC<{}> = () => {
}
const clickUp = (r: any) => {
let params = {
let params = {
tradeCode: r.tradeCode,
id: r.memberAssetAccount.id,
payId: r.id,
amount: r.tradeMoney,
preview: r.preview,
status: r.status,
}
}
history.push(`/capitalAccount/paymentWithdraw/details?detailinfo=${btoa(JSON.stringify(params))}`)
}
return (
<PageHeaderWrapper>
<Card>
......@@ -102,7 +102,7 @@ const PaymentWithdraw: React.FC<{}> = () => {
controlRender={
<NiceForm
components={{
RangePicker: DatePicker.RangePicker
DateRangePickerUnix,
}}
actions={formActions}
onSubmit={values => ref.current.reload(values)}
......
src/pages/capitalAccount/paymentWithdraw/paymentDetails.tsx
View file @ d538b437
......@@ -48,7 +48,7 @@ const PaymentDetail: React.FC<{}> = () => {
const { code, data } = res
setDetails(data)
if(code === 1000) {
let bankRes = await PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.memberId + ''})
let bankRes: any = await PublicApi.getSettleAccountsPlatformConfigGetPlatformAccountConfig()
setBankDetail(bankRes.data)
}
}
......@@ -62,7 +62,7 @@ const PaymentDetail: React.FC<{}> = () => {
})
})
}
const columns: ColumnType<any>[] = [
{
title: '交易流水号',
......@@ -73,7 +73,7 @@ const PaymentDetail: React.FC<{}> = () => {
title: '交易时间',
dataIndex: 'tradeTime',
key: 'tradeTime',
render: (text: any) => moment(text).format("YYYY-MM-DD HH:mm:ss")
render: (text: any) => moment(text).format("YYYY-MM-DD HH:mm:ss")
},
{
title: '交易金额(元)',
......@@ -143,10 +143,10 @@ const PaymentDetail: React.FC<{}> = () => {
const cardChange = (value) => {
console.log(value)
setPayParam(() => {
setPayParam(() => {
return {
...payParam,
...value,
...value,
}
})
}
......@@ -222,7 +222,7 @@ const PaymentDetail: React.FC<{}> = () => {
onBack={() => history.goBack()}
backIcon={<ReutrnEle />}
extra={ urlParams.preview ? [] : [
<Button
<Button
icon={<CheckSquareOutlined />}
key="1"
type="primary"
......@@ -382,17 +382,17 @@ const PaymentDetail: React.FC<{}> = () => {
destroyOnClose={true}
>
{
currentStep
currentStep
?
renderResult()
:
<>
<CapitalCardCheckBox
<CapitalCardCheckBox
cardChange={(v)=>cardChange(v)}
name="payType"
dataSource={[
{
title: '支付方式',
title: '支付方式',
items: [
{id:1, name: '支付宝', logoUrl: alipay},
{id:2, name: '微信', logoUrl: wxpay},
......@@ -400,7 +400,7 @@ const PaymentDetail: React.FC<{}> = () => {
]
},
// {
// title: '支付渠道',
// title: '支付渠道',
// items: [
// {id: 4, name: '线下转账线上确认'},
// ]
......@@ -412,12 +412,12 @@ const PaymentDetail: React.FC<{}> = () => {
errorTips.tipMethod &&
<p className={styles.errorTips}>请选择支付方式</p>
}
<CapitalCardCheckBox
<CapitalCardCheckBox
cardChange={(v)=>cardChange(v)}
name="payChannel"
dataSource={[
{
title: '支付渠道',
title: '支付渠道',
items: [
{id: 1, name: '线下转账线上确认'},
]
......
src/pages/capitalAccount/paymentWithdraw/schema/index.tsx
View file @ d538b437
......@@ -61,7 +61,7 @@ export const searchSchema: ISchema = {
},
"[startTime,endTime]": {
type: 'array',
"x-component": 'RangePicker',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
},
......@@ -80,4 +80,4 @@ export const searchSchema: ISchema = {
},
},
},
};
\ No newline at end of file
};
src/pages/classAndProperty/categoryAttributes/index.tsx
View file @ d538b437
import React, { useState, useRef, ReactNode, useEffect } from 'react'
import { Row, Col, Tooltip, Popconfirm, Button, Modal, Card } from 'antd';
import {
PauseCircleOutlined,
PlayCircleOutlined,
PlusOutlined,
EyeOutlined
} from '@ant-design/icons';
......@@ -57,7 +55,8 @@ const CategoryAttributes: React.FC<{}> = () => {
// 获取选中项的关联属性列表
useEffect(() => {
if (selectKey)
ref.current.reload({ current: 1, pageSize: 10, name: '', categoryId: selectKey, isByCategory: true })
ref.current.reload()
// ref.current.reload({ current: 1, pageSize: 10, name: '', categoryId: selectKey, isByCategory: true })
}, [selectKey])
const fetchLinkAttributeData = (params: any) => {
......@@ -76,9 +75,6 @@ const CategoryAttributes: React.FC<{}> = () => {
PublicApi.getProductPlatformGetCategoryAttributeList({...params, categoryId: selectKey, name: params.name || '', isByCategory: false}).then(res=>{
resolve(res.data)
})
// PublicApi.getProductPlatformGetAttributeList({ ...params, name: params.name || '' }).then(res=>{
// resolve(res.data)
// })
})
}
......@@ -205,33 +201,12 @@ const CategoryAttributes: React.FC<{}> = () => {
}
]
const rowSelection: TableRowSelection<any> = {
type: 'checkbox',
selectedRowKeys: selectedTableRowKeys,
onChange: (selectedRowKeys: any, selectedRows: any) => {
setSelectTableRow(selectedRows);
setSelectedTableRowKeys(selectedRowKeys);
console.log(selectedRowKeys, 'selected: ', selectedRows);
}
};
const clickRelief = (paramsId: number) => {
PublicApi.postProductPlatformDeleteCategoryAttribute({ categoryId: currentCategoryRef.current, attributeIds: [paramsId] }).then(res=>{
ref.current.reload()
ref.current.reload()
})
}
const confirm = (record: any) => {
console.log(record, 'record')
PublicApi.postProductPlatformUpdateAttributeStatus({ id: record.id, isEnable: !record.isEnable }).then(res=>{
ref.current.reload()
})
}
const cancel = () => {
console.log('cancel')
}
const handleNewLink = () => {
setRoleVisible(true)
let linkArray: number[] = []
......@@ -246,7 +221,6 @@ const CategoryAttributes: React.FC<{}> = () => {
setSelectKey(key)
setSelectNode(node)
currentCategoryRef.current = key
console.log(key, node, 'handle')
}
return <PageHeaderWrapper>
......@@ -257,7 +231,7 @@ const CategoryAttributes: React.FC<{}> = () => {
<h3 className="mb-30">选择要编辑的项目</h3>
{
treeData && treeData.length > 0
? <TabTree
? <TabTree
fetchData = {params => fetchCategoryTreeData(params)}
treeData={treeData}
handleSelect={(key, node) => onHandleSelect(key, node)}
......@@ -288,7 +262,10 @@ const CategoryAttributes: React.FC<{}> = () => {
name: {
type: 'string',
'x-component-props': {
placeholder: '属性名称'
placeholder: '属性名称',
style: {
marginBottom: 24
}
},
'x-component': 'Search'
}
......@@ -302,9 +279,9 @@ const CategoryAttributes: React.FC<{}> = () => {
},
children: (
<>
<Button type="primary" icon={<PlusOutlined />} onClick={handleNewLink}>
<Button type="primary" icon={<PlusOutlined />} onClick={handleNewLink} style={{marginBottom: 24}}>
新建
</Button>
</Button>
</>
)
}}
......@@ -351,4 +328,4 @@ const CategoryAttributes: React.FC<{}> = () => {
</PageHeaderWrapper>
}
export default CategoryAttributes
\ No newline at end of file
export default CategoryAttributes
src/pages/classAndProperty/propertyValue/index.tsx
View file @ d538b437
import React, { useState, useRef, ReactNode, useEffect } from 'react'
import { Row, Col, message, Popconfirm, Button, Card } from 'antd';
import { Row, Col, Popconfirm, Button, Card } from 'antd';
import {
DeleteOutlined,
PauseCircleOutlined,
PlusCircleOutlined,
PlayCircleOutlined,
PlusOutlined,
EyeOutlined,
SearchOutlined
} from '@ant-design/icons';
import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { history } from 'umi';
......@@ -17,7 +14,6 @@ import { PublicApi } from '@/services/api';
import { createFormActions } from '@formily/antd';
import { useTreeTabs } from '@/hooks/useTreeTabs';
import TabTree, { createTreeActions } from '@/components/TabTree';
import { GetProductCustomerGetCustomerAttributeResponse } from '@/services';
const formActions = createFormActions()
const treeActions = createTreeActions()
......@@ -50,7 +46,8 @@ const PropertyValue: React.FC<{}> = () => {
useEffect(()=>{
if(selectKey)
ref.current.reload({current: 1, pageSize: 10, name: '', attributeId: selectKey})
ref.current.reload()
// ref.current.reload({current: 1, pageSize: 10, name: '', attributeId: selectKey})
}, [selectKey])
const onHandleSelect = (key, node) => {
......@@ -65,11 +62,10 @@ const PropertyValue: React.FC<{}> = () => {
}
const fetchData = (params: any) => {
console.log(params, 'params')
return new Promise((resolve, reject) => {
PublicApi.getProductPlatformGetAttributeValueList({
PublicApi.getProductPlatformGetAttributeValueList({
...params,
name: params.name || '',
name: params.name || '',
attributeId: selectKey
}).then(res=>{
const { data } = res
......@@ -155,7 +151,7 @@ const PropertyValue: React.FC<{}> = () => {
const confirm = (record: any) => {
PublicApi.postProductPlatformUpdateAttributeValueStatus({id: record.id, isEnable: !record.isEnable}).then(res=>{
ref.current.reload()
ref.current.reload()
})
}
......@@ -176,7 +172,7 @@ const PropertyValue: React.FC<{}> = () => {
<h3 className="mb-30">选择要编辑的项目</h3>
{
treeData && treeData.length > 0
? <TabTree
? <TabTree
fetchData = {params => fetchAttributeTreeData(params)}
treeData={treeData}
actions={treeActions}
......@@ -196,7 +192,7 @@ const PropertyValue: React.FC<{}> = () => {
currentRef={ref}
fetchTableData={(params: any) => fetchData(params)}
formilyLayouts={{
justify: 'space-between'
justify: 'space-between',
}}
formilyProps={{
layouts: {
......@@ -209,7 +205,10 @@ const PropertyValue: React.FC<{}> = () => {
name: {
type: 'string',
'x-component-props': {
placeholder: '属性值名称'
placeholder: '属性值名称',
style: {
marginBottom:24
}
},
'x-component': 'Search'
}
......@@ -226,9 +225,10 @@ const PropertyValue: React.FC<{}> = () => {
<Button
type="primary"
icon={<PlusOutlined />}
onClick={() => {
history.push(`/classAndProperty/propertyValue/addPropertyValue?attrId=${selectKey||history.location.query.attrId}&attrName=${selectNode._title||history.location.query.attrName}&type=${selectNode?.type||history.location.query.type}`)
onClick={() => {
history.push(`/classAndProperty/propertyValue/addPropertyValue?attrId=${selectKey||history.location.query.attrId}&attrName=${selectNode._title||history.location.query.attrName}&type=${selectNode?.type||history.location.query.type}`)
}}
style={{marginBottom: 24}}
>
新建
</Button>
......
src/pages/ruleSettingManage/paySetting/components/payWayTable.tsx
View file @ d538b437
......@@ -81,7 +81,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
<Table
columns={columns}
dataSource={payParametersListResponses}
rowKey={(record: any, index: number) => index}
rowKey={(record: any, index: any) => index}
pagination={false}
/>
<Button style={{ marginBottom: 16, marginTop: 24 }} block icon={<PlusOutlined />} onClick={() => { setmodalvisible(true); setType(id); setmodify(false) }} type='dashed'>新增参数配置</Button>
......@@ -93,7 +93,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
<Table
columns={columns}
dataSource={payParametersList}
rowKey={(record: any, index: number) => index}
rowKey={(record: any, index: any) => index}
pagination={false}
/>
<Button style={{ marginBottom: 16, marginTop: 24 }} block icon={<PlusOutlined />} onClick={() => { setmodalvisible(true); setType(3); setmodify(false) }} type='dashed'>新增参数配置</Button>
......@@ -108,7 +108,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
modalvisible={modalvisible}
edit={edit}
onOK={(value) => handleOk(value, type)}
onCancel={() => setmodalvisible(false)}
onCancel={() => { setmodalvisible(false); setedit({}) }}
/>
</>
)
......
src/pages/ruleSettingManage/paySetting/components/setUpModal.tsx
View file @ d538b437
......@@ -74,7 +74,7 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
title='新增参数配置'
visible={modalvisible}
onOk={handleOk}
onCancel={() => onCancel()}
onCancel={() => { onCancel();form.resetFields(); }}
>
<Form
form={form}
......@@ -90,10 +90,10 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
</Select>
</Form.Item>
<Form.Item name='value' label='参数值' rules={[{ required: true, message: '请输入参数值' }]}>
<Input />
<Input maxLength={200} />
</Form.Item>
<Form.Item name='describe' label='参数描述'>
<TextArea rows={4} />
<TextArea maxLength={200} rows={4} />
</Form.Item>
</Form>
</Modal>
......
src/pages/ruleSettingManage/paySetting/settingIndex.tsx
View file @ d538b437
......@@ -6,7 +6,7 @@
*/
import React, { useState, useEffect } from 'react';
import { history } from 'umi';
import { Button, Card, Tabs, Space, Input } from 'antd';
import { Button, Card, Tabs, Space, Input, InputNumber,message } from 'antd';
import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { PublicApi } from '@/services/api';
import PayWayRadio from './components/payWayRadio';
......@@ -59,7 +59,7 @@ const PayWaySetTemplate: React.FC<{}> = () => {
console.log(value, type)
const data = [...payItem];
if (type === 2) {
data[idx].payParametersList.push(value)
data[idx].payParametersList = [...data[idx].payParametersList, value]
} else {
data[idx].payParametersAddListRequests = [...data[idx].payParametersAddListRequests, value]
}
......@@ -96,32 +96,66 @@ const PayWaySetTemplate: React.FC<{}> = () => {
/**保存更新 */
const onHnadleSubmit = () => {
PublicApi.postPayCollectionParametersAdd({
platformPayWays: payItem
}).then(res => {
if (res.code === 1000) {
history.push('/ruleSettingManager/paySetting')
// location.reload();
let conditions = false;
let wayName = '';
payItem.forEach(item => {
if (item.id === 2 && item.isPitchOn === 1) {
if(item.payParametersAddListRequests.length > 0) {
conditions = true
} else {
conditions = false
wayName = item.way
return
}
} else if (item.id === 1 && item.isPitchOn === 1) {
if(item.payParametersAddListRequests.length > 0 && item.payParametersList.length > 0) {
conditions = true
} else {
conditions = false
wayName = item.way
return
}
} else {
conditions = true
}
})
if (conditions) {
PublicApi.postPayCollectionParametersAdd({
platformPayWays: payItem
}).then(res => {
if (res.code === 1000) {
history.push('/ruleSettingManager/paySetting')
}
})
} else {
message.error(`请新增${wayName}的支付参数配置`)
}
}
/** */
const handleBlur = (e, name, idx) => {
const data = [...payItem]
const payParametersAddListRequests = data[idx].payParametersAddListRequests;
if(payParametersAddListRequests.length === 0) {
payParametersAddListRequests.push({code: '', value: '', describe: ''})
if (payParametersAddListRequests.length === 0) {
payParametersAddListRequests.push({ code: '', value: '', describe: '' })
}
payParametersAddListRequests.map(item => {
for(let key in item) {
if(key === name) {
item[key] = e.target.value
}else {
item[name] = e.target.value
}
}
item.type = 6;
for (let key in item) {
if (key === name) {
if (name === 'value') {
item[key] = e
} else {
item[key] = e.target.value
}
} else {
if (name === 'value') {
item[name] = e
} else {
item[name] = e.target.value
}
}
}
item.type = 6;
})
data[idx].payParametersAddListRequests = [...payParametersAddListRequests]
console.log(payParametersAddListRequests, 10086)
......@@ -164,8 +198,8 @@ const PayWaySetTemplate: React.FC<{}> = () => {
<Space direction="horizontal" size={16}>
初始申请额度不超过
<Input onChange={(e) => handleBlur(e, 'code', idx)} value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].code : undefined} addonBefore="￥" />
允许满<Input onChange={(e) => handleBlur(e, 'value', idx)} value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].value : undefined} />
天后申请上调<Input onChange={(e) => handleBlur(e, 'describe', idx)} value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].describe : undefined} addonAfter="%" />
允许满<InputNumber min={1} onChange={(e) => handleBlur(e, 'value', idx)} value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].value : undefined} />
天后申请上调<Input onChange={(e) => handleBlur(e, 'describe', idx)} value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].describe : undefined} addonAfter="%" />
</Space>
</div>
}
......
src/pages/ruleSettingManage/payStrategy/detail.tsx
View file @ d538b437
......@@ -61,7 +61,7 @@ const PaySetting: React.FC<{}> = () => {
levelList: [],
roleList: []
})
const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'id' })
const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'memberId' })
const [optionType, setoptionType] = useState(0)
const { preview, pageStatus } = usePageStatus()
// const initValue = useInitValue(PublicApi.getPayPayMemberTacticsDetails)
......@@ -155,7 +155,7 @@ const PaySetting: React.FC<{}> = () => {
const tableAddButton = <Button style={{ marginBottom: 16 }} disabled={pageStatus === PageStatus.PREVIEW} block icon={<PlusOutlined />} onClick={() => handleAddMemberBtn()} type='dashed'>选择指定会员</Button>
const tableColumns = [
{ dataIndex: 'memberId', title: 'ID', align: 'center' },
{ dataIndex: 'name', title: '会员名称', key: 'name', align: 'left', render: (_, record) => <EyePreview url={`?id=${record.memberId}&preview=1`}>{_}</EyePreview> },
{ dataIndex: 'name', title: '会员名称', key: 'name', align: 'left' }, , // render: (_, record) => <EyePreview url={`?id=${record.memberId}&preview=1`}>{_}</EyePreview>
{ dataIndex: 'memberTypeName', key: 'memberTypeName', align: 'center', title: '会员类型' },
{ dataIndex: 'roleName', key: 'roleName', title: '会员角色', align: 'center' },
{ dataIndex: 'levelTag', key: 'levelTag', title: '会员等级', align: 'center' },
......@@ -495,7 +495,7 @@ const PaySetting: React.FC<{}> = () => {
}
}
tableProps={{
rowKey: 'id'
rowKey: 'memberId'
}}
/>
</PageHeaderWrapper>
......
src/pages/ruleSettingManage/payStrategy/index.tsx
View file @ d538b437
......@@ -134,6 +134,7 @@ const List: React.FC<{}> = () => {
},
children:
<Button
style={{ marginBottom: '24px' }}
type="primary"
onClick={handleToAdd}
icon={<PlusOutlined />}
......
src/pages/systemManage/sensitiveWords/index.tsx
View file @ d538b437
......@@ -14,6 +14,7 @@ const SensitiveWords: React.FC<{}> = () => {
const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
// 删除
const confirmCancel = (ids: number[], type: boolean) => {
console.log(ids)
if (ids.length > 0) {
PublicApi.postManageSensitiveWordDelete({ ids }).then(res => {
if (res.code === 1000) {
......@@ -22,7 +23,8 @@ const SensitiveWords: React.FC<{}> = () => {
} else {
message.success('删除成功')
}
ref.current.Reload()
ref.current.reload()
setSelectedRowKeys([])
}
})
} else {
......@@ -128,7 +130,7 @@ const SensitiveWords: React.FC<{}> = () => {
name: {
type: 'string',
'x-component-props': {
placeholder: '属性名称',
placeholder: '敏感词名称',
},
'x-component': 'Search'
}
......
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