Skip to content

J
jinfa-platform
Commit a3a66399 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

Merge branch 'dev' into test

parents 3d5b83d4 29dabba3
Hide whitespace changes
Inline Side-by-side
Showing with 995 additions and 962 deletions
src/components/ModalTable/index.tsx
View file @ a3a66399
...@@ -3,7 +3,7 @@ import {StandardTable} from 'god'; ...@@ -3,7 +3,7 @@ import {StandardTable} from 'god';
import NestTable from '@/components/NestTable'; import NestTable from '@/components/NestTable';
import { IStandardTableProps } from 'god/dist/src/standard-table'; import { IStandardTableProps } from 'god/dist/src/standard-table';
import { Row, Col, Modal } from 'antd'; import { Row, Col, Modal } from 'antd';
import { productModalSchema, productModalByMemberSchema, memberModalSchema, inquirySchema, demandSchema, enquirySchema, mergeOrderSchema, goodsModalSchema, demandNumberSchema, logisticsDeliverySearchSchema, addOrderModalSchema , logisticsSelectGoodsSearchSchema} from './schema'; import { productModalSchema, productModalByMemberSchema, memberModalSchema, inquirySchema, demandSchema, enquirySchema, mergeOrderSchema, goodsModalSchema, demandNumberSchema, logisticsDeliverySearchSchema, addOrderModalSchema , logisticsSelectGoodsSearchSchema, SelectRfqOrderSearchSchema} from './schema';
import Search from '../NiceForm/components/Search'; import Search from '../NiceForm/components/Search';
import SearchSelect from '../NiceForm/components/SearchSelect'; import SearchSelect from '../NiceForm/components/SearchSelect';
import Submit from '../NiceForm/components/Submit'; import Submit from '../NiceForm/components/Submit';
...@@ -18,7 +18,7 @@ export interface ModalTableProps extends IStandardTableProps<any> { ...@@ -18,7 +18,7 @@ export interface ModalTableProps extends IStandardTableProps<any> {
cancel?(), cancel?(),
visible?: boolean, visible?: boolean,
resetModal?: object, resetModal?: object,
modalType?: 'productByDefault' | 'productByMember' | 'memberByDefault' | 'inquiryByDefault' | 'demandByDefault' | 'enquiryModel' | 'MergeOrderByDefault' | 'goodsModalSchema' | 'demandNumberSchema' | 'logisticsDelivery' | 'addOrderModalSchema' | 'selectGoodsSchema' | 'none' , modalType?: 'productByDefault' | 'productByMember' | 'memberByDefault' | 'inquiryByDefault' | 'demandByDefault' | 'enquiryModel' | 'MergeOrderByDefault' | 'goodsModalSchema' | 'demandNumberSchema' | 'logisticsDelivery' | 'addOrderModalSchema' | 'selectGoodsSchema' | 'selectRfqOrder' | 'none' ,
useNestTable?: boolean, // 是否使用嵌套表格 useNestTable?: boolean, // 是否使用嵌套表格
nestColumns?: any[], nestColumns?: any[],
nestTableProps?: any, nestTableProps?: any,
...@@ -85,6 +85,9 @@ const ModalTable:React.FC<ModalTableProps> = (props) => { ...@@ -85,6 +85,9 @@ const ModalTable:React.FC<ModalTableProps> = (props) => {
case 'selectGoodsSchema': { case 'selectGoodsSchema': {
return logisticsSelectGoodsSearchSchema return logisticsSelectGoodsSearchSchema
} }
case 'selectRfqOrder': {
return SelectRfqOrderSearchSchema
}
case 'none': { case 'none': {
return {} return {}
} }
......
src/components/ModalTable/schema/index.ts
View file @ a3a66399
...@@ -28,13 +28,13 @@ export const productModalByMemberSchema: ISchema = { ...@@ -28,13 +28,13 @@ export const productModalByMemberSchema: ISchema = {
}, },
}, },
properties: { properties: {
customerCategoryId: { categoryId: {
type: 'string', type: 'string',
"x-component": 'SearchSelect', "x-component": 'SearchSelect',
"x-component-props": { "x-component-props": {
placeholder: '请选择品类', placeholder: '请选择品类',
className: 'fixed-ant-selected-down', // 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ?? className: 'fixed-ant-selected-down', // 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
fetchSearch: PublicApi.getProductSelectGetMemberCategory, fetchSearch: PublicApi.getProductSelectGetSelectCustomerCategory,
style: { style: {
width: 160 width: 160
} }
...@@ -45,7 +45,7 @@ export const productModalByMemberSchema: ISchema = { ...@@ -45,7 +45,7 @@ export const productModalByMemberSchema: ISchema = {
"x-component": 'SearchSelect', "x-component": 'SearchSelect',
"x-component-props": { "x-component-props": {
placeholder: '请选择品牌', placeholder: '请选择品牌',
fetchSearch: PublicApi.getProductSelectGetMemberBrand, fetchSearch: PublicApi.getProductSelectGetSelectBrand,
style: { style: {
width: 160 width: 160
} }
...@@ -715,7 +715,6 @@ export const logisticsSelectGoodsSearchSchema: ISchema = { ...@@ -715,7 +715,6 @@ export const logisticsSelectGoodsSearchSchema: ISchema = {
"x-component": 'SearchSelect', "x-component": 'SearchSelect',
'x-component-props': { 'x-component-props': {
placeholder: '商品品类', placeholder: '商品品类',
fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
style: { style: {
width: 160 width: 160
} }
...@@ -734,3 +733,69 @@ export const logisticsSelectGoodsSearchSchema: ISchema = { ...@@ -734,3 +733,69 @@ export const logisticsSelectGoodsSearchSchema: ISchema = {
} }
} }
} }
/** 选择询价单 */
export const SelectRfqOrderSearchSchema: ISchema = {
type: 'object',
properties: {
orderNo: {
type: 'string',
'x-component': 'ModalSearch',
'x-component-props': {
placeholder: '询价单号',
align: 'flex-left',
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
rowStyle: {
flexWrap: 'nowrap',
style: {
marginRight: 0
}
},
colStyle: {
marginTop: 20,
},
},
properties: {
memberName: {
type: 'string',
"x-component-props": {
placeholder: '询价会员',
style: {
width: 160
}
}
},
details: {
type: 'string',
'x-component-props': {
placeholder: '询价单摘要',
style: {
width: 160
}
},
},
"[startDocumentTime,endDocumentTime]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间（全部）',
}
},
submit: {
"x-component": 'Submit',
"x-mega-props": {
span: 1
},
"x-component-props": {
children: '查询'
}
}
}
}
}
}
src/pages/logistics/addLogistics/components/columns.ts
View file @ a3a66399
import { ColumnType } from 'antd/lib/table/interface'; import { ColumnType } from 'antd/lib/table/interface';
import moment from 'moment'
export const SelectGoodsColumns: ColumnType<any>[] = [ export const SelectGoodsColumns: ColumnType<any>[] = [
{ {
...@@ -32,27 +33,45 @@ export const ExternalListColumns: ColumnType<any>[] = [ ...@@ -32,27 +33,45 @@ export const ExternalListColumns: ColumnType<any>[] = [
}, },
{ {
title: '操作角色', title: '操作角色',
key: 'roleName', key: 'operatorRoleName',
dataIndex: 'roleName', dataIndex: 'operatorRoleName',
}, },
{ {
title: '状态', title: '状态',
key: 'status', key: 'status',
dataIndex: 'status', dataIndex: 'status',
render:(text:any, record:any, index:number) => {
return (
text === 1 ? '待提交':
text === 2 ? '待确认':
text === 3 ? '不接收物流单':
'接收物流单'
)
}
}, },
{ {
title: '操作', title: '操作',
key: 'operationalProcess', key: 'type',
dataIndex: 'operationalProcess', dataIndex: 'type',
render:(text:any, record:any, index:number) => {
return (
text === 1 ? '提交物流单':'确认物流单'
)
}
}, },
{ {
title: '操作时间', title: '操作时间',
key: 'brand', key: 'operateTime',
dataIndex: 'brand', dataIndex: 'operateTime',
render:(text:any, record:any) => {
return(
moment(text).format('YYYY-MM-DD HH:mm:ss')
)
}
}, },
{ {
title: '审核意见', title: '审核意见',
key: 'brand', key: 'remark',
dataIndex: 'brand', dataIndex: 'remark',
} }
] ]
src/pages/logistics/addLogistics/index.tsx
View file @ a3a66399
...@@ -296,9 +296,12 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -296,9 +296,12 @@ const AddLogistics: React.FC<{}> = () => {
externalState: res.data.status, externalState: res.data.status,
shipperAddressId: res.data.shipperAddressId, shipperAddressId: res.data.shipperAddressId,
shipperFullAddress: res.data.shipperFullAddress, shipperFullAddress: res.data.shipperFullAddress,
externalList: res.data.externalList logisticsOrderLogList: res.data.logisticsOrderLogList
} }
form.setFieldsValue(obj) form.setFieldsValue(obj)
const list = [...res.data.detailList];
goodsRowCtl.setSelectRow(list)
goodsRowCtl.setSelectedRowKeys(list.map(v => v.productId));
setQuery(obj) setQuery(obj)
setId(query.id) setId(query.id)
setCreateType(res.data.createType) setCreateType(res.data.createType)
...@@ -332,7 +335,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -332,7 +335,7 @@ const AddLogistics: React.FC<{}> = () => {
case 1: case 1:
case 2: case 2:
case 3: case 3:
PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: query.shipmentOrderId }).then((res: any) => { PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: query.relevanceOrderId ? query.relevanceOrderId : query.shipmentOrderId }).then((res: any) => {
if (res.code === 1000) { if (res.code === 1000) {
res.data.data.forEach(item => { res.data.data.forEach(item => {
item.category = item.categoryName item.category = item.categoryName
...@@ -351,7 +354,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -351,7 +354,7 @@ const AddLogistics: React.FC<{}> = () => {
}) })
break; break;
case 5: case 5:
PublicApi.getAsReplaceGoodsPageReplaceCommodityByLogistics({ ...params, dataId: query.relevanceOrderId}).then(res => { PublicApi.getAsReplaceGoodsPageReplaceCommodityByLogistics({ ...params, dataId: query.relevanceOrderId }).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
resolve(res.data) resolve(res.data)
} }
...@@ -373,14 +376,15 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -373,14 +376,15 @@ const AddLogistics: React.FC<{}> = () => {
/**确定选择商品 */ /**确定选择商品 */
const handleConfirm = () => { const handleConfirm = () => {
const selectRow = goodsRowCtl.selectRow; const selectRow = goodsRowCtl.selectRow;
console.log(selectRow)
const arr: any[] = [] const arr: any[] = []
selectRow.forEach((item: any) => { selectRow.forEach((item: any) => {
arr.push({ arr.push({
productId: item.id, productId: item.id,
productName: item.productName, productName: item.productName,
categoryName: item.category, categoryName: item.category ? item.category : item.categoryName,
brandName: item.brand, brandName: item.brand ? item.brand : item.brandName,
unitName: item.unit, unitName: item.unit ? item.unit : item.unitName,
amount: item.amount, amount: item.amount,
carton: item.carton, carton: item.carton,
weight: item.weight, weight: item.weight,
...@@ -538,9 +542,6 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -538,9 +542,6 @@ const AddLogistics: React.FC<{}> = () => {
const handleVisible = () => { const handleVisible = () => {
console.log(query) console.log(query)
if (query.shipmentOrderCode || query.relevanceOrderCode) { if (query.shipmentOrderCode || query.relevanceOrderCode) {
const list = [...detailList];
goodsRowCtl.setSelectRow(list)
goodsRowCtl.setSelectedRowKeys(list.map(v => v.productId));
setvisible(true) setvisible(true)
} else { } else {
message.error('请先选择要操作的对应发货单号或对应订单号/售后单') message.error('请先选择要操作的对应发货单号或对应订单号/售后单')
...@@ -695,8 +696,14 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -695,8 +696,14 @@ const AddLogistics: React.FC<{}> = () => {
} }
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item label="单据时间" name='voucherTime'><span>{moment(query.voucherTime).format('YYYY-MM-DD HH:mm:ss')} </span></Form.Item> <Form.Item label="单据时间" name='voucherTime'><span>{query.voucherTime && moment(query.voucherTime).format('YYYY-MM-DD HH:mm:ss')} </span></Form.Item>
<Form.Item label="外部状态" name='externalState'><span>{query.externalState}</span></Form.Item> <Form.Item label="外部状态" name='externalState'>
{ query.externalState === 1 ? <Badge status="warning" text='待提交' /> :
query.externalState === 2 ? <Badge status="processing" text='待确认' /> :
query.externalState === 3 ? <Badge status="error" text='不接收物流单' /> :
query.externalState === 4 ? <Badge status="success" text='接收物流单' /> : ''
}
</Form.Item>
</Form> </Form>
</TabPane> </TabPane>
{/** 物流单明细 */} {/** 物流单明细 */}
...@@ -726,7 +733,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -726,7 +733,7 @@ const AddLogistics: React.FC<{}> = () => {
<TabPane key='tab-4' tab='流转记录' forceRender> <TabPane key='tab-4' tab='流转记录' forceRender>
<Table <Table
columns={ExternalListColumns} columns={ExternalListColumns}
dataSource={query.externalList} dataSource={query.logisticsOrderLogList}
/> />
</TabPane> </TabPane>
</Tabs> </Tabs>
......
src/pages/logistics/components/schema.ts
View file @ a3a66399
import { ISchema } from '@formily/antd'; import { ISchema } from '@formily/antd';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import { FORM_FILTER_PATH } from '@/formSchema/const'; import { FORM_FILTER_PATH } from '@/formSchema/const';
// 选择发货单 // 选择发货单
export const deliveryNumberSchema: ISchema = { export const deliveryNumberSchema: ISchema = {
type: 'object', type: 'object',
properties: { properties: {
invoicesNo: { invoicesNo: {
type: 'string', type: 'string',
'x-component': 'ModalSearch', 'x-component': 'ModalSearch',
'x-component-props': { 'x-component-props': {
placeholder: '发货单号', placeholder: '发货单号',
align: 'flex-left', align: 'flex-left',
}, },
}, },
[FORM_FILTER_PATH]: { [FORM_FILTER_PATH]: {
type: 'object', type: 'object',
'x-component': 'flex-layout', 'x-component': 'flex-layout',
'x-component-props': { 'x-component-props': {
rowStyle: { rowStyle: {
flexWrap: 'nowrap', flexWrap: 'nowrap',
style: { style: {
marginRight: 0 marginRight: 0
} }
}, },
colStyle: { colStyle: {
marginTop: 20, marginTop: 20,
}, },
}, },
properties: { properties: {
orderNo: { orderNo: {
type: 'string', type: 'string',
"x-component-props": { "x-component-props": {
placeholder: '对应订单号', placeholder: '对应订单号',
} }
}, },
invoicesAbstract: { invoicesAbstract: {
type: 'string', type: 'string',
"x-component-props": { "x-component-props": {
placeholder: '单据摘要', placeholder: '单据摘要',
} }
}, },
invoicesType: { invoicesType: {
type: 'string', type: 'string',
"x-component": 'SearchSelect', "x-component": 'SearchSelect',
"x-component-props": { "x-component-props": {
placeholder: '请选择单据类型', placeholder: '请选择单据类型',
className: 'fixed-ant-selected-down', className: 'fixed-ant-selected-down',
fetchSearch: PublicApi.getWarehouseInvoicesTypeAll, fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
style: { style: {
width: 160 width: 160
} }
} }
}, },
"[startTransactionTime,endTransactionTime]": { "[startTransactionTime,endTransactionTime]": {
type: 'string', type: 'string',
"x-component": "dateSelect", "x-component": "dateSelect",
"x-component-props": { "x-component-props": {
placeholder: '单据时间', placeholder: '单据时间',
} }
}, },
submit: { submit: {
"x-component": 'Submit', "x-component": 'Submit',
"x-mega-props": { "x-mega-props": {
span: 1 span: 1
}, },
"x-component-props": { "x-component-props": {
children: '查询' children: '查询'
} }
} }
} }
} }
} }
} }
// 选择订货单 // 选择订货单
export const orderNumberSchema: ISchema = { export const orderNumberSchema: ISchema = {
type: 'object', type: 'object',
properties: { properties: {
orderNo: { orderNo: {
type: 'string', type: 'string',
'x-component': 'ModalSearch', 'x-component': 'ModalSearch',
'x-component-props': { 'x-component-props': {
placeholder: '单据号', placeholder: '单据号',
align: 'flex-left', align: 'flex-left',
}, },
}, },
[FORM_FILTER_PATH]: { [FORM_FILTER_PATH]: {
type: 'object', type: 'object',
'x-component': 'flex-layout', 'x-component': 'flex-layout',
'x-component-props': { 'x-component-props': {
rowStyle: { rowStyle: {
flexWrap: 'nowrap', flexWrap: 'nowrap',
style: { style: {
marginRight: 0 marginRight: 0
} }
}, },
colStyle: { colStyle: {
marginTop: 20, marginTop: 20,
}, },
}, },
properties: { properties: {
supplyMembersName: { supplyMembersName: {
type: 'string', type: 'string',
"x-component-props": { "x-component-props": {
placeholder: '会员名称', placeholder: '会员名称',
} }
}, },
orderThe: { orderThe: {
type: 'string', type: 'string',
"x-component-props": { "x-component-props": {
placeholder: '单据摘要', placeholder: '单据摘要',
} }
}, },
voucherTime: { voucherTime: {
type: 'string', type: 'string',
"x-component-props": { "x-component-props": {
placeholder: '单据选择' placeholder: '单据选择'
}, },
enum: [ enum: [
{ label: '询价采购', value: 1 }, { label: '询价采购', value: 1 },
{ label: '需求采购', value: 2 }, { label: '需求采购', value: 2 },
{ label: '现货采购', value: 3 }, { label: '现货采购', value: 3 },
{ label: '集采', value: 4 }, { label: '集采', value: 4 },
{ label: '积分兑换', value: 5 }, { label: '积分兑换', value: 5 },
{ label: '渠道直采', value: 6 }, { label: '渠道直采', value: 6 },
{ label: '渠道现货', value: 7 }, { label: '渠道现货', value: 7 },
{ label: '渠道积分兑换', value: 8 }, { label: '渠道积分兑换', value: 8 },
] ]
}, },
"[startCreateTime,endCreateTime]": { "[startCreateTime,endCreateTime]": {
type: 'string', type: 'string',
"x-component": "dateSelect", "x-component": "dateSelect",
"x-component-props": { "x-component-props": {
placeholder: '单据时间', placeholder: '单据时间',
} }
}, },
submit: { submit: {
"x-component": 'Submit', "x-component": 'Submit',
"x-mega-props": { "x-mega-props": {
span: 1 span: 1
}, },
"x-component-props": { "x-component-props": {
children: '查询' children: '查询'
} }
} }
} }
} }
} }
} }
// 物流单处理 - 待确认物流单 // 物流单处理 - 待确认物流单
export const confirmLogisticsOrderSchema: ISchema = { export const confirmLogisticsOrderSchema: ISchema = {
type: 'object', type: 'object',
properties: { properties: {
megalayout: { megalayout: {
type: 'object', type: 'object',
"x-component": 'mega-layout', "x-component": 'mega-layout',
properties: { properties: {
logisticsOrderNo: { logisticsOrderNo: {
type: 'string', type: 'string',
"x-component": "Search", "x-component": "Search",
"x-mega-props": {}, "x-mega-props": {},
"x-component-props": { "x-component-props": {
placeholder: '物流单号', placeholder: '物流单号',
align: 'flex-left', align: 'flex-left',
} }
} }
} }
}, },
[FORM_FILTER_PATH]: { [FORM_FILTER_PATH]: {
type: 'object', type: 'object',
"x-component": "flex-layout", "x-component": "flex-layout",
"x-component-props": { "x-component-props": {
rowStyle: { rowStyle: {
justifyContent: 'flex-start', justifyContent: 'flex-start',
flexWrap: 'nowrap' flexWrap: 'nowrap'
}, },
colStyle: {//改变间隔 colStyle: {//改变间隔
marginRight: 20 marginRight: 20
} }
}, },
properties: { properties: {
PRO_LAYOUT: { PRO_LAYOUT: {
type: 'object', type: 'object',
"x-component": 'mega-layout', "x-component": 'mega-layout',
"x-mega-props": { "x-mega-props": {
span: 5 span: 5
}, },
"x-component-props": { "x-component-props": {
inline: true inline: true
}, },
properties: { properties: {
shipperId: { shipperMemberName: {
type: 'string', type: 'string',
"x-component": 'SearchSelect', "x-component-props": {
"x-component-props": { placeholder: '发货方',
placeholder: '发货方', },
className: 'fixed-ant-selected-down', },
fetchSearch: PublicApi.getLogisticsSelectListShipperSelect, "[invoicesTimeStart,invoicesTimeEnd]": {
style: { type: 'string',
width: 160 "x-component": "dateSelect",
} "x-component-props": {
}, placeholder: '单据时间',
}, }
// status: { },
// type: 'string', }
// "x-component-props": { },
// placeholder: '外部状态' sumbit: {
// }, "x-component": 'Submit',
// enum: [ "x-mega-props": {
// { label: '待提交', value: 1 }, span: 1
// { label: '待确认', value: 2 }, },
// { label: '不接受物流单', value: 3 }, "x-component-props": {
// { label: '接受物流单', value: 4 }, children: '查询'
// ] }
// }, }
"[invoicesTimeStart,invoicesTimeEnd]": { }
type: 'string', }
"x-component": "dateSelect", }
"x-component-props": { }
placeholder: '单据时间', // 物流单处理 - 物流单查询
} export const LogisticsOrderSearchSchema: ISchema = {
}, type: 'object',
} properties: {
}, megalayout: {
sumbit: { type: 'object',
"x-component": 'Submit', "x-component": 'mega-layout',
"x-mega-props": { properties: {
span: 1 logisticsOrderNo: {
}, type: 'string',
"x-component-props": { "x-component": "Search",
children: '查询' "x-mega-props": {},
} "x-component-props": {
} placeholder: '物流单号',
} align: 'flex-left',
} }
} }
} }
// 物流单处理 - 物流单查询 },
export const LogisticsOrderSearchSchema: ISchema = { [FORM_FILTER_PATH]: {
type: 'object', type: 'object',
properties: { "x-component": "flex-layout",
megalayout: { "x-component-props": {
type: 'object', rowStyle: {
"x-component": 'mega-layout', justifyContent: 'flex-start',
properties: { flexWrap: 'nowrap'
logisticsOrderNo: { },
type: 'string', colStyle: {//改变间隔
"x-component": "Search", marginRight: 20
"x-mega-props": {}, }
"x-component-props": { },
placeholder: '物流单号', properties: {
align: 'flex-left', PRO_LAYOUT: {
} type: 'object',
} "x-component": 'mega-layout',
} "x-mega-props": {
}, span: 5
[FORM_FILTER_PATH]: { },
type: 'object', "x-component-props": {
"x-component": "flex-layout", inline: true
"x-component-props": { },
rowStyle: { properties: {
justifyContent: 'flex-start', shipperMemberName: {
flexWrap: 'nowrap' type: 'string',
}, "x-component-props": {
colStyle: {//改变间隔 placeholder: '发货方',
marginRight: 20 },
} },
}, status: {
properties: { type: 'string',
PRO_LAYOUT: { "x-component-props": {
type: 'object', placeholder: '外部状态',
"x-component": 'mega-layout', style: {
"x-mega-props": { width: 160
span: 5 }
}, },
"x-component-props": { enum: [
inline: true { label: '待提交', value: 1 },
}, { label: '待确认', value: 2 },
properties: { { label: '不接受物流单', value: 3 },
shipperId: { { label: '接受物流单', value: 4 },
type: 'string', ]
"x-component": 'SearchSelect', },
"x-component-props": { "[invoicesTimeStart,invoicesTimeEnd]": {
placeholder: '发货方', type: 'string',
className: 'fixed-ant-selected-down', "x-component": "dateSelect",
fetchSearch: PublicApi.getLogisticsSelectListShipperSelect, "x-component-props": {
style: { placeholder: '单据时间',
width: 160 }
} },
}, }
}, },
status: { sumbit: {
type: 'string', "x-component": 'Submit',
"x-component-props": { "x-mega-props": {
placeholder: '外部状态', span: 1
style: { },
width: 160 "x-component-props": {
} children: '查询'
}, }
enum: [ }
{ label: '待提交', value: 1 }, }
{ label: '待确认', value: 2 }, }
{ label: '不接受物流单', value: 3 }, }
{ label: '接受物流单', value: 4 }, }
] // 物流单提交 - 物流单查询
}, export const confirmLogisticsOrderSearchSchema: ISchema = {
"[invoicesTimeStart,invoicesTimeEnd]": { type: 'object',
type: 'string', properties: {
"x-component": "dateSelect", megalayout: {
"x-component-props": { type: 'object',
placeholder: '单据时间', "x-component": 'mega-layout',
} properties: {
}, logisticsOrderNo: {
} type: 'string',
}, "x-component": "Search",
sumbit: { "x-mega-props": {},
"x-component": 'Submit', "x-component-props": {
"x-mega-props": { placeholder: '物流单号',
span: 1 align: 'flex-left',
}, }
"x-component-props": { }
children: '查询' }
} },
} [FORM_FILTER_PATH]: {
} type: 'object',
} "x-component": "flex-layout",
} "x-component-props": {
} rowStyle: {
// 物流单提交 - 物流单查询 justifyContent: 'flex-start',
export const confirmLogisticsOrderSearchSchema: ISchema = { flexWrap: 'nowrap'
type: 'object', },
properties: { colStyle: {//改变间隔
megalayout: { marginRight: 20
type: 'object', }
"x-component": 'mega-layout', },
properties: { properties: {
logisticsOrderNo: { PRO_LAYOUT: {
type: 'string', type: 'object',
"x-component": "Search", "x-component": 'mega-layout',
"x-mega-props": {}, "x-mega-props": {
"x-component-props": { span: 5
placeholder: '物流单号', },
align: 'flex-left', "x-component-props": {
} inline: true
} },
} properties: {
}, relevanceOrderCode: {
[FORM_FILTER_PATH]: { type: 'string',
type: 'object', "x-component-props": {
"x-component": "flex-layout", placeholder: '对应订单号',
"x-component-props": { },
rowStyle: { },
justifyContent: 'flex-start', companyId: {
flexWrap: 'nowrap' type: 'string',
}, "x-component": 'SearchSelect',
colStyle: {//改变间隔 "x-component-props": {
marginRight: 20 placeholder: '物流服务商',
} className: 'fixed-ant-selected-down',
}, fetchSearch: PublicApi.getLogisticsSelectListMemberCompanyQuery,
properties: { style: {
PRO_LAYOUT: { width: 160
type: 'object', }
"x-component": 'mega-layout', },
"x-mega-props": { },
span: 5 "[invoicesTimeStart,invoicesTimeEnd]": {
}, type: 'string',
"x-component-props": { "x-component": "dateSelect",
inline: true "x-component-props": {
}, placeholder: '单据时间',
properties: { }
invoicesNo: { },
type: 'string', }
"x-component-props": { },
placeholder: '对应订单号', sumbit: {
}, "x-component": 'Submit',
}, "x-mega-props": {
companyId: { span: 1
type: 'string', },
"x-component": 'SearchSelect', "x-component-props": {
"x-component-props": { children: '查询'
placeholder: '物流服务商', }
className: 'fixed-ant-selected-down', }
fetchSearch: PublicApi.getLogisticsSelectListCompany, }
style: { }
width: 160 }
} }
}, // 物流单提交 - 待提交物流单
}, export const submitLogisticsOrderSchema: ISchema = {
"[invoicesTimeStart,invoicesTimeEnd]": { type: 'object',
type: 'string', properties: {
"x-component": "dateSelect", megalayout: {
"x-component-props": { type: 'object',
placeholder: '单据时间', "x-component": 'mega-layout',
} "x-component-props": {
}, grid: true
} },
}, properties: {
sumbit: { ctl: {
"x-component": 'Submit', type: 'object',
"x-mega-props": { "x-component": "Children",
span: 1 "x-component-props": {
}, children: "{{controllerBtns}}"
"x-component-props": { }
children: '查询' },
} logisticsOrderNo: {//报价单号
} type: 'string',
} "x-component": "Search",
} "x-mega-props": {},
} "x-component-props": {
} placeholder: '物流单号'
// 物流单提交 - 待提交物流单 }
export const submitLogisticsOrderSchema: ISchema = { }
type: 'object', }
properties: { },
megalayout: { [FORM_FILTER_PATH]: {
type: 'object', type: 'object',
"x-component": 'mega-layout', "x-component": "flex-layout",
"x-component-props": { "x-component-props": {
grid: true rowStyle: {
}, flexWrap: 'nowrap'
properties: { },
ctl: { colStyle: {
type: 'object', marginLeft: 20
"x-component": "Children", }
"x-component-props": { },
children: "{{controllerBtns}}" properties: {
} PRO_LAYOUT: {
}, type: 'object',
logisticsOrderNo: {//报价单号 "x-component": 'mega-layout',
type: 'string', "x-mega-props": {
"x-component": "Search", span: 5
"x-mega-props": {}, },
"x-component-props": { "x-component-props": {
placeholder: '物流单号' inline: true
} },
} properties: {
} relevanceOrderCode: {
}, type: 'string',
[FORM_FILTER_PATH]: { "x-component-props": {
type: 'object', placeholder: '对应订单号'
"x-component": "flex-layout", }
"x-component-props": { },
rowStyle: { companyId: {
flexWrap: 'nowrap' type: 'string',
}, "x-component": 'SearchSelect',
colStyle: { "x-component-props": {
marginLeft: 20 placeholder: '物流服务商',
} className: 'fixed-ant-selected-down',
}, fetchSearch: PublicApi.getLogisticsSelectListMemberCompanyQuery,
properties: { style: {
PRO_LAYOUT: { width: 160
type: 'object', }
"x-component": 'mega-layout', },
"x-mega-props": { },
span: 5 "[invoicesTimeStart,invoicesTimeEnd]": {
}, type: 'string',
"x-component-props": { "x-component": "dateSelect",
inline: true "x-component-props": {
}, placeholder: '单据时间',
properties: { }
invoicesNo: { },
type: 'string', status: {
"x-component-props": { type: 'string',
placeholder: '对应订单号' "x-component-props": {
} placeholder: '外部状态',
}, style: {
companyId: { width: 160
type: 'string', }
"x-component": 'SearchSelect', },
"x-component-props": { enum: [
placeholder: '物流服务商', { label: '待提交', value: 1 },
className: 'fixed-ant-selected-down', { label: '不接受物流单', value: 3 },
fetchSearch: PublicApi.getLogisticsSelectListCompany, ]
style: { },
width: 160 }
} },
}, sumbit: {
}, "x-component": 'Submit',
"[invoicesTimeStart,invoicesTimeEnd]": { "x-mega-props": {
type: 'string', span: 1
"x-component": "dateSelect", },
"x-component-props": { "x-component-props": {
placeholder: '单据时间', children: '查询'
} }
}, }
status: { }
type: 'string', }
"x-component-props": { }
placeholder: '外部状态', }
style: {
width: 160 /******************************************************* */
} /******************************************************* */
},
enum: [ /** 默认只有新建的按钮 */
{ label: '待提交', value: 1 }, export const None: ISchema = {
{ label: '不接受物流单', value: 3 }, type: 'object',
] properties: {
}, searchWrap: {
} type: 'object',
}, 'x-component': 'Mega-Layout',
sumbit: { 'x-component-props': {
"x-component": 'Submit', grid: true,
"x-mega-props": { },
span: 1 properties: {
}, actions: {
"x-component-props": { type: 'object',
children: '查询' 'x-component': 'Children',
} 'x-component-props': {
} children: '{{controllerBtns}}',
} },
} },
} },
} },
},
/******************************************************* */ }
/******************************************************* */
/** 物流单提交 - 物流单查询 */
/** 默认只有新建的按钮 */ export const LogisticsOrderSubmitSearchSchema: ISchema = {
export const None: ISchema = { type: 'object',
type: 'object', properties: {
properties: { megalayout: {
searchWrap: { type: 'object',
type: 'object', "x-component": 'mega-layout',
'x-component': 'Mega-Layout', properties: {
'x-component-props': { logisticsOrderNo: {
grid: true, type: 'string',
}, "x-component": "Search",
properties: { "x-mega-props": {},
actions: { "x-component-props": {
type: 'object', placeholder: '物流单号',
'x-component': 'Children', align: 'flex-left',
'x-component-props': { }
children: '{{controllerBtns}}', }
}, }
}, },
}, [FORM_FILTER_PATH]: {
}, type: 'object',
}, "x-component": "flex-layout",
} "x-component-props": {
rowStyle: {
/** 物流单提交 - 物流单查询 */ justifyContent: 'flex-start',
export const LogisticsOrderSubmitSearchSchema: ISchema = { flexWrap: 'nowrap'
type: 'object', },
properties: { colStyle: {//改变间隔
megalayout: { marginRight: 20
type: 'object', }
"x-component": 'mega-layout', },
properties: { properties: {
logisticsOrderNo: { PRO_LAYOUT: {
type: 'string', type: 'object',
"x-component": "Search", "x-component": 'mega-layout',
"x-mega-props": {}, "x-mega-props": {
"x-component-props": { span: 5
placeholder: '物流单号', },
align: 'flex-left', "x-component-props": {
} inline: true
} },
} properties: {
}, invoicesNo: {
[FORM_FILTER_PATH]: { type: 'string',
type: 'object', "x-component-props": {
"x-component": "flex-layout", placeholder: '对应订单号',
"x-component-props": { },
rowStyle: { },
justifyContent: 'flex-start', companyId: {
flexWrap: 'nowrap' type: 'string',
}, "x-component": 'SearchSelect',
colStyle: {//改变间隔 "x-component-props": {
marginRight: 20 placeholder: '物流服务商',
} className: 'fixed-ant-selected-down',
}, fetchSearch: PublicApi.getLogisticsSelectListCompany,
properties: { style: {
PRO_LAYOUT: { width: 160
type: 'object', }
"x-component": 'mega-layout', },
"x-mega-props": { },
span: 5 "[invoicesTimeStart,invoicesTimeEnd]": {
}, type: 'string',
"x-component-props": { "x-component": "dateSelect",
inline: true "x-component-props": {
}, placeholder: '单据时间',
properties: { }
invoicesNo: { },
type: 'string', }
"x-component-props": { },
placeholder: '对应订单号', sumbit: {
}, "x-component": 'Submit',
}, "x-mega-props": {
companyId: { span: 1
type: 'string', },
"x-component": 'SearchSelect', "x-component-props": {
"x-component-props": { children: '查询'
placeholder: '物流服务商', }
className: 'fixed-ant-selected-down', }
fetchSearch: PublicApi.getLogisticsSelectListCompany, }
style: { }
width: 160 }
} }
},
}, /** 物流单提交 - 待提交物流单 */
"[invoicesTimeStart,invoicesTimeEnd]": { export const LogisticsOrderToBeSubmitSearchSchema: ISchema = {
type: 'string', type: 'object',
"x-component": "dateSelect", properties: {
"x-component-props": { megalayout: {
placeholder: '单据时间', type: 'object',
} "x-component": 'mega-layout',
}, "x-component-props": {
} grid: true
}, },
sumbit: { properties: {
"x-component": 'Submit', ctl: {
"x-mega-props": { type: 'object',
span: 1 "x-component": "Children",
}, "x-component-props": {
"x-component-props": { children: "{{controllerBtns}}"
children: '查询' }
} },
} logisticsOrderNo: {//报价单号
} type: 'string',
} "x-component": "Search",
} "x-mega-props": {},
} "x-component-props": {
placeholder: '物流单号'
/** 物流单提交 - 待提交物流单 */ }
export const LogisticsOrderToBeSubmitSearchSchema: ISchema = { }
type: 'object', }
properties: { },
megalayout: { [FORM_FILTER_PATH]: {
type: 'object', type: 'object',
"x-component": 'mega-layout', "x-component": "flex-layout",
"x-component-props": { "x-component-props": {
grid: true rowStyle: {
}, flexWrap: 'nowrap'
properties: { },
ctl: { colStyle: {
type: 'object', marginLeft: 20
"x-component": "Children", }
"x-component-props": { },
children: "{{controllerBtns}}" properties: {
} PRO_LAYOUT: {
}, type: 'object',
logisticsOrderNo: {//报价单号 "x-component": 'mega-layout',
type: 'string', "x-mega-props": {
"x-component": "Search", span: 5
"x-mega-props": {}, },
"x-component-props": { "x-component-props": {
placeholder: '物流单号' inline: true
} },
} properties: {
} invoicesNo: {
}, type: 'string',
[FORM_FILTER_PATH]: { "x-component-props": {
type: 'object', placeholder: '对应订单号'
"x-component": "flex-layout", }
"x-component-props": { },
rowStyle: { companyId: {
flexWrap: 'nowrap' type: 'string',
}, "x-component": 'SearchSelect',
colStyle: { "x-component-props": {
marginLeft: 20 placeholder: '物流服务商',
} className: 'fixed-ant-selected-down',
}, fetchSearch: PublicApi.getLogisticsSelectListCompany,
properties: { style: {
PRO_LAYOUT: { width: 160
type: 'object', }
"x-component": 'mega-layout', },
"x-mega-props": { },
span: 5 "[invoicesTimeStart,invoicesTimeEnd]": {
}, type: 'string',
"x-component-props": { "x-component": "dateSelect",
inline: true "x-component-props": {
}, placeholder: '单据时间',
properties: { }
invoicesNo: { },
type: 'string', status: {
"x-component-props": { type: 'string',
placeholder: '对应订单号' "x-component-props": {
} placeholder: '外部状态',
}, style: {
companyId: { width: 160
type: 'string', }
"x-component": 'SearchSelect', },
"x-component-props": { enum: [
placeholder: '物流服务商', { label: '待提交', value: 1 },
className: 'fixed-ant-selected-down', { label: '不接受物流单', value: 3 },
fetchSearch: PublicApi.getLogisticsSelectListCompany, ]
style: { },
width: 160 }
} },
}, sumbit: {
}, "x-component": 'Submit',
"[invoicesTimeStart,invoicesTimeEnd]": { "x-mega-props": {
type: 'string', span: 1
"x-component": "dateSelect", },
"x-component-props": { "x-component-props": {
placeholder: '单据时间', children: '查询'
} }
}, }
status: { }
type: 'string', }
"x-component-props": { }
placeholder: '外部状态', }
style: {
width: 160 /** 物流单处理 - 物流单查询 */
} export const LogisticsOrderProcessingSearchSchema: ISchema = {
}, type: 'object',
enum: [ properties: {
{ label: '待提交', value: 1 }, megalayout: {
{ label: '不接受物流单', value: 3 }, type: 'object',
] "x-component": 'mega-layout',
}, properties: {
} logisticsOrderNo: {
}, type: 'string',
sumbit: { "x-component": "Search",
"x-component": 'Submit', "x-mega-props": {},
"x-mega-props": { "x-component-props": {
span: 1 placeholder: '物流单号',
}, align: 'flex-left',
"x-component-props": { }
children: '查询' }
} }
} },
} [FORM_FILTER_PATH]: {
} type: 'object',
} "x-component": "flex-layout",
} "x-component-props": {
rowStyle: {
/** 物流单处理 - 物流单查询 */ justifyContent: 'flex-start',
export const LogisticsOrderProcessingSearchSchema: ISchema = { flexWrap: 'nowrap'
type: 'object', },
properties: { colStyle: {//改变间隔
megalayout: { marginRight: 20
type: 'object', }
"x-component": 'mega-layout', },
properties: { properties: {
logisticsOrderNo: { PRO_LAYOUT: {
type: 'string', type: 'object',
"x-component": "Search", "x-component": 'mega-layout',
"x-mega-props": {}, "x-mega-props": {
"x-component-props": { span: 5
placeholder: '物流单号', },
align: 'flex-left', "x-component-props": {
} inline: true
} },
} properties: {
}, shipperId: {
[FORM_FILTER_PATH]: { type: 'string',
type: 'object', "x-component": 'SearchSelect',
"x-component": "flex-layout", "x-component-props": {
"x-component-props": { placeholder: '发货方',
rowStyle: { className: 'fixed-ant-selected-down',
justifyContent: 'flex-start', fetchSearch: PublicApi.getLogisticsSelectListShipperSelect,
flexWrap: 'nowrap' style: {
}, width: 160
colStyle: {//改变间隔 }
marginRight: 20 },
} },
}, status: {
properties: { type: 'string',
PRO_LAYOUT: { "x-component-props": {
type: 'object', placeholder: '外部状态',
"x-component": 'mega-layout', style: {
"x-mega-props": { width: 160
span: 5 }
}, },
"x-component-props": { enum: [
inline: true { label: '待提交', value: 1 },
}, { label: '待确认', value: 2 },
properties: { { label: '不接受物流单', value: 3 },
shipperId: { { label: '接受物流单', value: 4 },
type: 'string', ]
"x-component": 'SearchSelect', },
"x-component-props": { "[invoicesTimeStart,invoicesTimeEnd]": {
placeholder: '发货方', type: 'string',
className: 'fixed-ant-selected-down', "x-component": "dateSelect",
fetchSearch: PublicApi.getLogisticsSelectListShipperSelect, "x-component-props": {
style: { placeholder: '单据时间',
width: 160 }
} },
}, }
}, },
status: { sumbit: {
type: 'string', "x-component": 'Submit',
"x-component-props": { "x-mega-props": {
placeholder: '外部状态', span: 1
style: { },
width: 160 "x-component-props": {
} children: '查询'
}, }
enum: [ }
{ label: '待提交', value: 1 }, }
{ label: '待确认', value: 2 }, }
{ label: '不接受物流单', value: 3 }, }
{ label: '接受物流单', value: 4 }, }
]
}, /** 物流单处理 - 待确认物流单 */
"[invoicesTimeStart,invoicesTimeEnd]": { export const LogisticsOrderToBeConfirmedSearchSchema: ISchema = {
type: 'string', type: 'object',
"x-component": "dateSelect", properties: {
"x-component-props": { megalayout: {
placeholder: '单据时间', type: 'object',
} "x-component": 'mega-layout',
}, properties: {
} logisticsOrderNo: {
}, type: 'string',
sumbit: { "x-component": "Search",
"x-component": 'Submit', "x-mega-props": {},
"x-mega-props": { "x-component-props": {
span: 1 placeholder: '物流单号',
}, align: 'flex-left',
"x-component-props": { }
children: '查询' }
} }
} },
} [FORM_FILTER_PATH]: {
} type: 'object',
} "x-component": "flex-layout",
} "x-component-props": {
rowStyle: {
/** 物流单处理 - 待确认物流单 */ justifyContent: 'flex-start',
export const LogisticsOrderToBeConfirmedSearchSchema: ISchema = { flexWrap: 'nowrap'
type: 'object', },
properties: { colStyle: {//改变间隔
megalayout: { marginRight: 20
type: 'object', }
"x-component": 'mega-layout', },
properties: { properties: {
logisticsOrderNo: { PRO_LAYOUT: {
type: 'string', type: 'object',
"x-component": "Search", "x-component": 'mega-layout',
"x-mega-props": {}, "x-mega-props": {
"x-component-props": { span: 5
placeholder: '物流单号', },
align: 'flex-left', "x-component-props": {
} inline: true
} },
} properties: {
}, shipperId: {
[FORM_FILTER_PATH]: { type: 'string',
type: 'object', "x-component": 'SearchSelect',
"x-component": "flex-layout", "x-component-props": {
"x-component-props": { placeholder: '发货方',
rowStyle: { className: 'fixed-ant-selected-down',
justifyContent: 'flex-start', fetchSearch: PublicApi.getLogisticsSelectListShipperSelect,
flexWrap: 'nowrap' style: {
}, width: 160
colStyle: {//改变间隔 }
marginRight: 20 },
} },
}, "[invoicesTimeStart,invoicesTimeEnd]": {
properties: { type: 'string',
PRO_LAYOUT: { "x-component": "dateSelect",
type: 'object', "x-component-props": {
"x-component": 'mega-layout', placeholder: '单据时间',
"x-mega-props": { }
span: 5 },
}, }
"x-component-props": { },
inline: true sumbit: {
}, "x-component": 'Submit',
properties: { "x-mega-props": {
shipperId: { span: 1
type: 'string', },
"x-component": 'SearchSelect', "x-component-props": {
"x-component-props": { children: '查询'
placeholder: '发货方', }
className: 'fixed-ant-selected-down', }
fetchSearch: PublicApi.getLogisticsSelectListShipperSelect, }
style: { }
width: 160 }
} }
},
},
"[invoicesTimeStart,invoicesTimeEnd]": {
type: 'string',
"x-component": "dateSelect",
"x-component-props": {
placeholder: '单据时间',
}
},
}
},
sumbit: {
"x-component": 'Submit',
"x-mega-props": {
span: 1
},
"x-component-props": {
children: '查询'
}
}
}
}
}
}
src/pages/logistics/logisticsSubmit/toOrderSumitList.tsx
View file @ a3a66399
...@@ -244,13 +244,6 @@ const OrderList: React.FC<ListProps> = (props) => { ...@@ -244,13 +244,6 @@ const OrderList: React.FC<ListProps> = (props) => {
} }
}, []) }, [])
//生命周期
useEffect(() => {
ref.current.reload()
return () => {
}
}, [TimeRange])
const onDefaultChange = (id: any, checked: boolean) => { const onDefaultChange = (id: any, checked: boolean) => {
console.log(id, checked) console.log(id, checked)
columns.forEach((v, index) => { columns.forEach((v, index) => {
......
src/pages/transaction/goodsOffer/addEnquiryOrder/components/enquiryGoods.tsx
View file @ a3a66399
...@@ -33,7 +33,6 @@ const EnquiryGoods: React.FC<queryProps> = (props) => { ...@@ -33,7 +33,6 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
const [goodsList, setgoodsList] = useState<any>([]); const [goodsList, setgoodsList] = useState<any>([]);
const [inquiryGoods, setinquiryGoods] = useState<any>([]); const [inquiryGoods, setinquiryGoods] = useState<any>([]);
const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'id' }); const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'id' });
const [customerCategory, setcustomerCategory] = useState<any>([]);
const [brand, setbrand] = useState<any>([]); const [brand, setbrand] = useState<any>([]);
const [form] = Form.useForm() const [form] = Form.useForm()
const handleOkAddMember = () => { const handleOkAddMember = () => {
...@@ -185,21 +184,6 @@ const EnquiryGoods: React.FC<queryProps> = (props) => { ...@@ -185,21 +184,6 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
} }
}, [editData]) }, [editData])
useEffect(() => {
if (visibleChannelMember) {
PublicApi.getProductSelectGetSelectCustomerCategory({ name }).then(res => {
if (res.code === 1000) {
setcustomerCategory(res.data)
}
})
PublicApi.getProductSelectGetSelectBrand({ name }).then(res => {
if (res.code === 1000) {
setbrand(res.data)
}
})
}
}, [visibleChannelMember])
return ( return (
<div className={styles.revise_style}> <div className={styles.revise_style}>
<Button disabled={type === 3} block type='dashed' onClick={addGoods}><PlusOutlined />添加商品</Button> <Button disabled={type === 3} block type='dashed' onClick={addGoods}><PlusOutlined />添加商品</Button>
......
src/pages/transaction/inquiryQuote/addInquiryOrder/components/basicInfo.tsx
View file @ a3a66399
...@@ -61,18 +61,7 @@ const BasicInfo: React.FC<queryProps> = (props) => { ...@@ -61,18 +61,7 @@ const BasicInfo: React.FC<queryProps> = (props) => {
render: (text: any, record: any) => format(text) render: (text: any, record: any) => format(text)
} }
] ]
const formSearch: ISchema = {
type: 'object',
properties: {
name: {
type: 'string',
"x-component": 'Search',
"x-component-props": {
placeholder: '请输入会员名称'
}
}
}
}
// 模拟数据 // 模拟数据
const fetchMemberList = async (params) => { const fetchMemberList = async (params) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
...@@ -179,11 +168,8 @@ const BasicInfo: React.FC<queryProps> = (props) => { ...@@ -179,11 +168,8 @@ const BasicInfo: React.FC<queryProps> = (props) => {
columns={columnsSetMember} columns={columnsSetMember}
rowSelection={inquiryRowSelection} rowSelection={inquiryRowSelection}
fetchTableData={params => fetchMemberList(params)} fetchTableData={params => fetchMemberList(params)}
formilyProps={ modalType='selectRfqOrder'
{ searchName='orderNo'
ctx: { schema: formSearch }
}
}
tableProps={{ tableProps={{
rowKey: 'orderId', rowKey: 'orderId',
}} }}
......
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