Skip to content

J
jinfa-platform
Commit 23d51ca9 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
Browse files
Options

Merge branch 'dev' into test

parents 8456b6db fe4a565c
Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 138 deletions
package.json
View file @ 23d51ca9
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
"god": "0.2.4", "god": "0.2.4",
"immutability-helper": "^3.1.1", "immutability-helper": "^3.1.1",
"lingxi-design": "^1.0.8", "lingxi-design": "^1.0.8",
"lingxi-design-ui": "^1.1.15", "lingxi-design-ui": "^1.1.16",
"lingxi-editor-core": "^1.0.6", "lingxi-editor-core": "^1.0.6",
"lingxi-web": "^1.0.6", "lingxi-web": "^1.0.6",
"lint-staged": "^10.0.7", "lint-staged": "^10.0.7",
......
src/components/PolymericTable/NormalTable.tsx
View file @ 23d51ca9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-08-20 16:15:59 * @Date: 2020-08-20 16:15:59
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2020-08-21 17:07:35 * @LastEditTime: 2020-12-21 13:57:12
* @Description: 简单封装了分页事件的 Table * @Description: 简单封装了分页事件的 Table
*/ */
import React from 'react'; import React from 'react';
...@@ -54,7 +54,6 @@ export default class NormalTable extends React.PureComponent<StandardTableProps> ...@@ -54,7 +54,6 @@ export default class NormalTable extends React.PureComponent<StandardTableProps>
showSizeChanger: true, showSizeChanger: true,
showQuickJumper: true, showQuickJumper: true,
onChange: this.handlePaginationChange, onChange: this.handlePaginationChange,
onShowSizeChange: this.handlePaginationChange,
size: 'small', size: 'small',
showTotal: () => `共 ${pagination.total || 0} 条`, showTotal: () => `共 ${pagination.total || 0} 条`,
...pagination, ...pagination,
......
src/pages/afterService/components/GoodsDrawer/index.tsx
View file @ 23d51ca9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-11-04 15:09:09 * @Date: 2020-11-04 15:09:09
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-17 15:25:03 * @LastEditTime: 2020-12-21 11:44:17
* @Description: 维修商品抽屉组件 * @Description: 维修商品抽屉组件
*/ */
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
...@@ -22,7 +22,7 @@ import { PublicApi } from '@/services/api'; ...@@ -22,7 +22,7 @@ import { PublicApi } from '@/services/api';
const formActions = createFormActions(); const formActions = createFormActions();
const PAGE_SIZE = 5; const PAGE_SIZE = 10;
interface GoodsDrawerProps { interface GoodsDrawerProps {
// 选中值（子表格的值） // 选中值（子表格的值）
...@@ -525,7 +525,7 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> { ...@@ -525,7 +525,7 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
const first = data.length ? data[0] : null; const first = data.length ? data[0] : null;
if (!first) { if (!first) {
return; return [];
} }
const filtered = data.filter(item => item.processEnum === first.processEnum); const filtered = data.filter(item => item.processEnum === first.processEnum);
if (filtered.length !== data.length) { if (filtered.length !== data.length) {
......
src/pages/afterService/components/ReturnInfoDrawer/index.tsx
View file @ 23d51ca9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2020-11-05 17:36:45 * @Date: 2020-11-05 17:36:45
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-09 16:38:48 * @LastEditTime: 2020-12-21 11:13:21
* @Description: 查看退货数量与退款金额 抽屉 * @Description: 查看退货数量与退款金额 抽屉
*/ */
import React from 'react'; import React from 'react';
...@@ -164,6 +164,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({ ...@@ -164,6 +164,7 @@ const ReturnInfoDrawer: React.FC<ReturnInfoDrawerProps> = ({
</Button> </Button>
</div> </div>
} }
destroyOnClose
> >
<NiceForm <NiceForm
initialValues={orderInfo} initialValues={orderInfo}
......
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/schema/index.ts
View file @ 23d51ca9
...@@ -226,7 +226,7 @@ export const addBillSchema: ISchema = { ...@@ -226,7 +226,7 @@ export const addBillSchema: ISchema = {
'x-rules': [ 'x-rules': [
{ {
required: true, required: true,
message: '请选择维修商品', message: '请选择退货商品',
}, },
], ],
items: { items: {
...@@ -286,11 +286,23 @@ export const addBillSchema: ISchema = { ...@@ -286,11 +286,23 @@ export const addBillSchema: ISchema = {
type: 'string', type: 'string',
title: '退货数量', title: '退货数量',
'x-component': 'Text', 'x-component': 'Text',
'x-rules': [
{
required: true,
message: '请输入退货数量',
},
],
}, },
refundAmount: { refundAmount: {
type: 'string', type: 'string',
title: '退款金额', title: '退款金额',
'x-component': 'Text', 'x-component': 'Text',
'x-rules': [
{
required: true,
message: '请输入退款金额',
},
],
}, },
// 其他数据，不用于展示，只用于收集值 // 其他数据，不用于展示，只用于收集值
extraData: { extraData: {
......
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @ 23d51ca9
...@@ -329,9 +329,29 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => { ...@@ -329,9 +329,29 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
_tempObj['规格ID'] = productInfoByEdit.unitPriceAndPicList[i]?.id _tempObj['规格ID'] = productInfoByEdit.unitPriceAndPicList[i]?.id
} }
if(updateFlag.current){ // 初次渲染tab 再次进入tab采用缓存数据 if(updateFlag.current){ // 初次渲染tab 再次进入tab采用缓存数据
_tempObj['单价'] = productInfoByEdit.unitPriceAndPicList[i]?.unitPrice || {} // _tempObj['单价'] = productInfoByEdit.unitPriceAndPicList[i]?.unitPrice || {}
if(productInfoByEdit.unitPriceAndPicList[i]?.unitPrice) {
let tempUnit = {}
let unitPric = productInfoByEdit.unitPriceAndPicList[i]?.unitPrice
Object.keys(unitPric).sort().forEach(function(key) {
tempUnit[key] = unitPric[key];
})
_tempObj['单价'] = tempUnit
} else {
_tempObj['单价'] = {}
}
}else{ }else{
_tempObj['单价'] = _tableDataSource[i] && tableDataSource[i] && tableDataSource[i]['单价'] || {} // _tempObj['单价'] = _tableDataSource[i] && tableDataSource[i] && tableDataSource[i]['单价'] || {}
if(_tableDataSource[i] && tableDataSource[i] && tableDataSource[i]['单价']) {
let tempUnit = {}
let unitPric = _tableDataSource[i] && tableDataSource[i] && tableDataSource[i]['单价']
Object.keys(unitPric).sort().forEach(function(key) {
tempUnit[key] = unitPric[key]
})
_tempObj['单价'] = tempUnit
} else {
_tempObj['单价'] = {}
}
} }
}else{ }else{
_tempObj['对应货品'] = selectedGoods.length > 0 ? selectedGoods[0].id : 0 _tempObj['对应货品'] = selectedGoods.length > 0 ? selectedGoods[0].id : 0
......
src/pages/lxMall/pay/index.tsx
View file @ 23d51ca9
...@@ -120,6 +120,21 @@ const PayPage: React.FC<PayPagePropsType> = (props) => { ...@@ -120,6 +120,21 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
window.location.href = '/' window.location.href = '/'
} }
const renderError = () => {
return (
<div>
<CommonHeader
logoUrl={(layoutType === LAYOUT_TYPE.channel || layoutType === LAYOUT_TYPE.ichannel) ? shopInfo?.logo : mallInfo.logoUrl}
title="支付错误"
/>
<div className={styles.errmsg}>
<p>{errMsg}</p>
<Button type="primary" className={styles.backbtn} onClick={() => backHome()}>返回首页</Button>
</div>
</div>
)
}
return payInfo ? !payState ? ( return payInfo ? !payState ? (
<div className={styles.pay}> <div className={styles.pay}>
<CommonHeader <CommonHeader
...@@ -132,19 +147,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => { ...@@ -132,19 +147,7 @@ const PayPage: React.FC<PayPagePropsType> = (props) => {
} }
</div> </div>
</div> </div>
) : loading ? null : ( ) : loading ? null : renderError(): renderError()
<div>
<CommonHeader
logoUrl={(layoutType === LAYOUT_TYPE.channel || layoutType === LAYOUT_TYPE.ichannel) ? shopInfo?.logo : mallInfo.logoUrl}
title="支付错误"
/>
<div className={styles.errmsg}>
<p>{errMsg}</p>
<Button type="primary" className={styles.backbtn} onClick={() => backHome()}>返回首页</Button>
</div>
</div>
): null
} }
export default PayPage export default PayPage
src/pages/member/components/EquityInfo/index.tsx
View file @ 23d51ca9
...@@ -79,13 +79,13 @@ const EquityInfo: React.FC<EquityInfoProps> = ({ ...@@ -79,13 +79,13 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
const [receivedPage, setReceivedPage] = useState(1); const [receivedPage, setReceivedPage] = useState(1);
const [receivedSize, setReceivedSize] = useState(PAGE_SIZE); const [receivedSize, setReceivedSize] = useState(PAGE_SIZE);
const [receivedTotal, setReceivedTotal] = useState(0); const [receivedTotal, setReceivedTotal] = useState(0);
const [receivedList, setReceivedList] = useState([]); const [receivedList, setReceivedList] = useState<ReceivedData[]>([]);
const [receivedListLoading, setReceivedListLoading] = useState(false); const [receivedListLoading, setReceivedListLoading] = useState(false);
const [usagePage, setUsagePage] = useState(1); const [usagePage, setUsagePage] = useState(1);
const [usageSize, setUsageSize] = useState(PAGE_SIZE); const [usageSize, setUsageSize] = useState(PAGE_SIZE);
const [usageTotal, setUsageTotal] = useState(0); const [usageTotal, setUsageTotal] = useState(0);
const [usageList, setUsageList] = useState([]); const [usageList, setUsageList] = useState<UsageData[]>([]);
const [usageListLoading, setUsageListLoading] = useState(false); const [usageListLoading, setUsageListLoading] = useState(false);
const receivedColumns: EditableColumns[] = [ const receivedColumns: EditableColumns[] = [
...@@ -151,15 +151,13 @@ const EquityInfo: React.FC<EquityInfoProps> = ({ ...@@ -151,15 +151,13 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
}, },
]; ];
const getReceivedList = () => { const getReceivedList = (params?) => {
if (fetchReceivedList) { if (fetchReceivedList) {
if (receivedListLoading) {
return;
}
setReceivedListLoading(true); setReceivedListLoading(true);
fetchReceivedList({ fetchReceivedList({
current: receivedPage, current: receivedPage,
pageSize: receivedSize, pageSize: receivedSize,
...params,
}).then(res => { }).then(res => {
const { data = [], totalCount = 0 } = (res || {}); const { data = [], totalCount = 0 } = (res || {});
setReceivedList(data); setReceivedList(data);
...@@ -170,15 +168,13 @@ const EquityInfo: React.FC<EquityInfoProps> = ({ ...@@ -170,15 +168,13 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
} }
}; };
const getUsageList = () => { const getUsageList = (params?) => {
if (fetchUsageList) { if (fetchUsageList) {
if (usageListLoading) {
return;
}
setUsageListLoading(true); setUsageListLoading(true);
fetchUsageList({ fetchUsageList({
current: usagePage, current: usagePage,
pageSize: usageSize, pageSize: usageSize,
...params,
}).then(res => { }).then(res => {
const { data = [], totalCount = 0 } = (res || {}); const { data = [], totalCount = 0 } = (res || {});
setUsageList(data); setUsageList(data);
...@@ -211,13 +207,19 @@ const EquityInfo: React.FC<EquityInfoProps> = ({ ...@@ -211,13 +207,19 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
const handleReceivedPaginationChange = (page: number, size: number) => { const handleReceivedPaginationChange = (page: number, size: number) => {
setReceivedPage(page); setReceivedPage(page);
setReceivedSize(size); setReceivedSize(size);
getReceivedList(); getReceivedList({
current: page,
pageSize: size,
});
}; };
const handleUsagePaginationChange = (page: number, size: number) => { const handleUsagePaginationChange = (page: number, size: number) => {
setUsagePage(page); setUsagePage(page);
setUsageSize(size); setUsageSize(size);
getReceivedList(); getUsageList({
current: page,
pageSize: size,
});
}; };
return ( return (
......
src/pages/payandSettle/capitalAccounts/accountLists/accountDetail.tsx
View file @ 23d51ca9
...@@ -124,7 +124,7 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -124,7 +124,7 @@ const AccountDetail: React.FC<{}> = () => {
title: '交易时间', title: '交易时间',
dataIndex: 'tradeTime', dataIndex: 'tradeTime',
key: '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: '交易金额(元)', title: '交易金额(元)',
...@@ -156,7 +156,7 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -156,7 +156,7 @@ const AccountDetail: React.FC<{}> = () => {
title: '序号', title: '序号',
dataIndex: 'id', dataIndex: 'id',
key: 'id', key: 'id',
render: (t, c, i) => i + 1 render: (t, c, i) => i + 1
}, },
{ {
title: '操作角色', title: '操作角色',
...@@ -174,14 +174,14 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -174,14 +174,14 @@ const AccountDetail: React.FC<{}> = () => {
dataIndex: 'operation', dataIndex: 'operation',
key: 'operation', key: 'operation',
render: (t, r)=> { render: (t, r)=> {
return t === 1 ? '冻结资金账户' : '解冻资金账户' return t === 1 ? '解冻资金账户' : '冻结资金账户'
} }
}, },
{ {
title: '操作时间', title: '操作时间',
dataIndex: 'createTime', dataIndex: 'createTime',
key: 'createTime', key: 'createTime',
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: '意见', title: '意见',
...@@ -195,7 +195,7 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -195,7 +195,7 @@ const AccountDetail: React.FC<{}> = () => {
} }
const handleCannel = () => { const handleCannel = () => {
} }
const handleSubmit = (value) => { const handleSubmit = (value) => {
...@@ -240,8 +240,8 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -240,8 +240,8 @@ const AccountDetail: React.FC<{}> = () => {
<Space direction="vertical" style={{width:'100%'}}> <Space direction="vertical" style={{width:'100%'}}>
<Card headStyle={{borderBottom:'none'}} title="账户信息"> <Card headStyle={{borderBottom:'none'}} title="账户信息">
<Row gutter={100}> <Row gutter={100}>
<Col <Col
// span={8} // span={8}
xxl={8} xxl={8}
xl={9} xl={9}
lg={9} lg={9}
...@@ -262,24 +262,24 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -262,24 +262,24 @@ const AccountDetail: React.FC<{}> = () => {
</div> </div>
</div> </div>
</Col> </Col>
<Col <Col
// span={10} // span={10}
xxl={10} xxl={10}
xl={8} xl={8}
lg={8} lg={8}
> >
<div className={styles.infoRight}> <div className={styles.infoRight}>
<Row> <Row>
<Col <Col
// span={4} // span={4}
xxl={4} xxl={4}
xl={10} xl={10}
lg={10} lg={10}
> >
<p className={styles.rightTitle}>账户归属：</p> <p className={styles.rightTitle}>账户归属：</p>
</Col> </Col>
<Col <Col
// span={20} // span={20}
xxl={20} xxl={20}
xl={14} xl={14}
lg={14} lg={14}
...@@ -288,15 +288,15 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -288,15 +288,15 @@ const AccountDetail: React.FC<{}> = () => {
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col <Col
xxl={4} xxl={4}
xl={10} xl={10}
lg={10} lg={10}
> >
<p className={styles.rightTitle}>账户余额(元)：</p> <p className={styles.rightTitle}>账户余额(元)：</p>
</Col> </Col>
<Col <Col
// span={20} // span={20}
xxl={20} xxl={20}
xl={14} xl={14}
lg={14} lg={14}
...@@ -305,15 +305,15 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -305,15 +305,15 @@ const AccountDetail: React.FC<{}> = () => {
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col <Col
xxl={4} xxl={4}
xl={10} xl={10}
lg={10} lg={10}
> >
<p className={styles.rightTitle}>锁定金额(元)：</p> <p className={styles.rightTitle}>锁定金额(元)：</p>
</Col> </Col>
<Col <Col
// span={20} // span={20}
xxl={20} xxl={20}
xl={14} xl={14}
lg={14} lg={14}
...@@ -322,15 +322,15 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -322,15 +322,15 @@ const AccountDetail: React.FC<{}> = () => {
</Col> </Col>
</Row> </Row>
<Row> <Row>
<Col <Col
xxl={4} xxl={4}
xl={10} xl={10}
lg={10} lg={10}
> >
<p className={styles.rightTitle}>账户状态：</p> <p className={styles.rightTitle}>账户状态：</p>
</Col> </Col>
<Col <Col
// span={20} // span={20}
xxl={20} xxl={20}
xl={14} xl={14}
lg={14} lg={14}
...@@ -345,8 +345,8 @@ const AccountDetail: React.FC<{}> = () => { ...@@ -345,8 +345,8 @@ const AccountDetail: React.FC<{}> = () => {
</Row> </Row>
</div> </div>
</Col> </Col>
<Col <Col
// span={20} // span={20}
xxl={6} xxl={6}
xl={7} xl={7}
lg={7} lg={7}
......
src/pages/repositories/addRepository.tsx
View file @ 23d51ca9
import React, {useState, useRef, useEffect} from 'react' import React, {useState, useRef, useEffect} from 'react'
import { history } from 'umi' import { history } from 'umi'
import { Button, Form, Card, Modal, Select, Table, Checkbox, Row, Col, Tooltip, Slider, InputNumber, Avatar, message } from 'antd' import { Button, Form, Card, Modal, Select, Table, Checkbox, Row, Col, Tooltip, Slider, InputNumber, Avatar, message } from 'antd'
import { PageHeaderWrapper } from '@ant-design/pro-layout' import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { import {
PlusOutlined, PlusOutlined,
SaveOutlined, SaveOutlined,
LinkOutlined, LinkOutlined,
LoadingOutlined, LoadingOutlined,
} from '@ant-design/icons' } from '@ant-design/icons'
import { ColumnType } from 'antd/lib/table/interface'; import { ColumnType } from 'antd/lib/table/interface';
import { StandardTable } from 'god' import { StandardTable } from 'god'
import ReutrnEle from '@/components/ReturnEle'; import ReutrnEle from '@/components/ReturnEle';
import './index.less' import './index.less'
import NiceForm from '@/components/NiceForm' import NiceForm from '@/components/NiceForm'
import { repositDetailSchema } from './schema' import { repositDetailSchema } from './schema'
import { createFormActions, ISchema, FormEffectHooks } from '@formily/antd' import { createFormActions, ISchema, FormEffectHooks } from '@formily/antd'
import EyePreview from '@/components/EyePreview' import EyePreview from '@/components/EyePreview'
import { findItemAndDelete, omit } from '@/utils' import { findItemAndDelete, omit } from '@/utils'
import { PublicApi } from '@/services/api' import { PublicApi } from '@/services/api'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable' import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect' import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect'
import { usePageStatus, PageStatus } from '@/hooks/usePageStatus' import { usePageStatus, PageStatus } from '@/hooks/usePageStatus'
import PositionSetting from './components/PositionSetting' import PositionSetting from './components/PositionSetting'
const addSchemaAction = createFormActions() const addSchemaAction = createFormActions()
const AddRepository:React.FC<{}> = (props) => { const AddRepository:React.FC<{}> = (props) => {
const { const {
id, id,
preview, preview,
pageStatus pageStatus
} = usePageStatus() } = usePageStatus()
// 整体表单提交 // 整体表单提交
const formSubmit = async (values) => { const formSubmit = async (values) => {
const params = omit(values, ['NO_SUBMIT3']) const params = omit(values, ['NO_SUBMIT3'])
if (params['applyMember']) { if (params['applyMember']) {
params['applyMember'] = params['applyMember'] params['applyMember'] = params['applyMember']
} }
if(!params['isAllMemberShare'] && !params['applyMember']?.length) { if(!params['isAllMemberShare'] && !params['applyMember']?.length) {
message.error('请选择指定会员') message.error('请选择指定会员')
} else { } else {
await PublicApi.postWarehouseFreightSpaceAdd(params) addSchemaAction.getFieldState('warehouseId', prevState => {
setTimeout(() => { params['warehouseName'] = prevState.props.enum.filter((item: any) => item.value === prevState.value)[0]['label']
history.goBack(-1) })
}, 1000) await PublicApi.postWarehouseFreightSpaceAdd(params)
} setTimeout(() => {
} history.goBack(-1)
}, 1000)
return ( }
<PageHeaderWrapper }
onBack={() => history.goBack()}
backIcon={<ReutrnEle description="返回"/>} return (
className='addRepository' <PageHeaderWrapper
title={pageStatus === PageStatus.PREVIEW ? '查看仓位' : '新增仓位'} onBack={() => history.goBack()}
extra={( backIcon={<ReutrnEle description="返回"/>}
pageStatus !== PageStatus.PREVIEW className='addRepository'
? ( title={pageStatus === PageStatus.PREVIEW ? '查看仓位' : '新增仓位'}
<Button key="1" onClick={() => addSchemaAction.submit()} type="primary" icon={<SaveOutlined />}> extra={(
保存 pageStatus !== PageStatus.PREVIEW
</Button> ? (
) <Button key="1" onClick={() => addSchemaAction.submit()} type="primary" icon={<SaveOutlined />}>
: null 保存
)} </Button>
> )
<Card className=''> : null
<PositionSetting addSchemaAction={addSchemaAction} schema={repositDetailSchema} formSubmit={formSubmit}/> )}
</Card> >
</PageHeaderWrapper> <Card className=''>
) <PositionSetting addSchemaAction={addSchemaAction} schema={repositDetailSchema} formSubmit={formSubmit}/>
} </Card>
</PageHeaderWrapper>
export default AddRepository )
}
export default AddRepository
src/pages/transaction/_public/order/effects/useOrderDetail.tsx
View file @ 23d51ca9
...@@ -48,9 +48,9 @@ export const useOrderDetail = (options: OrderDetailHookProps) => { ...@@ -48,9 +48,9 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
const { code, data, message: msg } = res const { code, data, message: msg } = res
if (code === 1000) { if (code === 1000) {
setFormData(data) setFormData(data)
if(data.paymentInformationResponses.length > 0){ // if(data.paymentInformationResponses.length > 0){
setCurrentPayInfoId(data.paymentInformationResponses[0].id) // setCurrentPayInfoId(data.paymentInformationResponses[0].id)
} // }
reloadPayList(data.supplyMembersId, data.supplyMembersRoleId) reloadPayList(data.supplyMembersId, data.supplyMembersRoleId)
} else { } else {
message.error(msg) message.error(msg)
......
src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts
View file @ 23d51ca9
...@@ -497,8 +497,6 @@ export const useBusinessEffects = (context, actions) => { ...@@ -497,8 +497,6 @@ export const useBusinessEffects = (context, actions) => {
if (fieldState.name === 'invoicesTypeId') { if (fieldState.name === 'invoicesTypeId') {
const invoicesTypeIdState = getFieldState('invoicesTypeId'); const invoicesTypeIdState = getFieldState('invoicesTypeId');
console.log('invoicesTypeIdState2', invoicesTypeIdState)
if (invoicesTypeIdState.value) { if (invoicesTypeIdState.value) {
const current = invoicesTypeIdState.originAsyncData.find(item => item.id === invoicesTypeIdState.value); const current = invoicesTypeIdState.originAsyncData.find(item => item.id === invoicesTypeIdState.value);
......
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