Commit a3a66399 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

Merge branch 'dev' into test

parents 3d5b83d4 29dabba3
...@@ -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 {}
} }
......
...@@ -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: '查询'
}
}
}
}
}
}
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',
} }
] ]
...@@ -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>
......
This diff is collapsed.
...@@ -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) => {
......
...@@ -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>
......
...@@ -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