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