Skip to content

J
jinfa-platform
Commit cd54cd87 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

parents ea7d5519 033cd60f
Hide whitespace changes
Inline Side-by-side
Showing with 305 additions and 662 deletions
src/pages/commodity/products/addProductsItem/logisticsForm.tsx
View file @ cd54cd87
......@@ -219,12 +219,12 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
deliveryType !== 3 && <Form.Item
name="sendAddress"
label="发货地址"
rules={[
{
required: true,
message: '请选择发货地址'
},
]}
// rules={[
// {
// required: true,
// message: '请选择发货地址'
// },
// ]}
>
<Select
placeholder="请选择发货地址"
......
src/pages/transaction/components/approvedOrderModal/index.tsx
View file @ cd54cd87
......@@ -131,7 +131,7 @@ const ApproveSchema = {
labelAlign: 'top',
},
properties: {
state: {
agree: {
type: 'radio',
enum: [
{ label: '审核通过', value: 1 },
......@@ -144,7 +144,7 @@ const ApproveSchema = {
"x-linkages": [
{
type: 'value:visible',
target: 'cause',
target: 'reason',
condition: "{{$value === 0}}"
},
{
......@@ -159,7 +159,7 @@ const ApproveSchema = {
}
]
},
cause: {
reason: {
type: 'textarea',
"x-component-props": {
rows: 4,
......
src/pages/transaction/components/createElectronModal/index.tsx
View file @ cd54cd87
import React, { useContext, useRef } from 'react'
import { Modal, Button, message } from 'antd'
import { Button, message } from 'antd'
import { createFormActions, ISchema } from '@formily/antd'
import ModalForm from '@/components/ModalForm'
import { history } from 'umi'
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect'
import { PublicApi } from '@/services/api'
import { useHttpRequest } from '@/hooks/useHttpRequest'
import { OrderDetailContext } from '../../_public/order/context'
import { fetchOptions } from '@/pages/balance/common'
export interface OrderElectronModalProps {
currentRef: any
......@@ -84,7 +82,7 @@ const schema: ISchema = {
type: 'string',
display: false,
},
state: {
agree: {
type: 'radio',
title: '是否审核通过',
enum: [
......@@ -95,12 +93,12 @@ const schema: ISchema = {
"x-linkages": [
{
type: 'value:visible',
target: 'cause',
target: 'reason',
condition: "{{$value === 0}}"
}
]
},
cause: {
reason: {
type: 'textarea',
"x-component-props": {
rows: 4,
......@@ -127,7 +125,7 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
const formRef = useRef<any>({})
const { data } = useContext(OrderDetailContext)
const { run, loading } = useHttpRequest(PublicApi.postContractContractSignSaleSignContractCreate, {ctlType: 'none'})
const { run: submitRun, loading: submitLoading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrder)
const { run: submitRun, loading: submitLoading } = useHttpRequest(PublicApi.postOrderVendorValidateSubmit)
const createElectron = async () => {
const contractTemplateId = schemaActions.getFieldValue('contractTemplateId')
if (data.isElectronicContract === 1 && !contractTemplateId) {
......@@ -156,10 +154,9 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
const electronBtn = <Button style={{marginLeft: 24}} onClick={createElectron} loading={loading}>生成电子合同</Button>
const handleSubmit = async (value) => {
const params = {
...value,
id: data.id,
orderId: data.orderId,
}
const { code } = await submitRun(params)
if (code === 1000) {
......@@ -189,9 +186,6 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
effects={($, actions) => {
$('onFormInit').subscribe(async () => {
if (data.isElectronicContract === 1) {
// useAsyncSelect('contractTemplateId', async () => (await PublicApi.getContractSelectListContractTemplate()).data, ['name', 'id']).then(()=>{
// actions.setFieldValue("contractTemplateId", data.contractTemplateId)
// })
const res = await PublicApi.getContractSelectListContractTemplate()
let options = res.data.map(item => ({
label: item.name,
......@@ -212,9 +206,6 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
})
actions.setFieldValue('usingElectronicContracts', data.usingElectronicContracts || 0)
}
$('onFieldValueChange', 'contractTemplateId').subscribe(state => {
// console.log(state.props)
})
// 采购合同下单 隐藏使用电子合同
if(data?.orderModel > 30) {
actions.setFieldState('usingElectronicContracts', state => {
......
src/pages/transaction/components/orderHandDeleved/constant/index.ts
View file @ cd54cd87
......@@ -124,12 +124,12 @@ export const productColumns: any = [
align: 'center',
key: 'unit'
},
{
title: '单价',
dataIndex: 'price',
align: 'center',
key: 'price',
},
// {
// title: '单价',
// dataIndex: 'price',
// align: 'center',
// key: 'price',
// },
{
title: '已发货',
dataIndex: 'delivered',
......
src/pages/transaction/components/orderPayModal/index.tsx
View file @ cd54cd87
......@@ -158,9 +158,10 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
} else if (checked.id === 4) { // 余额支付
console.log('选择了余额支付')
setIsSpin(true)
PublicApi.getPayAssetAccountGetUserBalance({
parentMemberId: data.vendorMemberId,
parentMemberRoleId: data.vendorRoleId,
PublicApi.getPayAssetAccountBalance({
fundMode: checked.fundMode,
vendorMemberId: data.vendorMemberId,
vendorRoleId: data.vendorRoleId,
}).then(res => {
if(res.code === 1000) {
setBalanceInfo(res.data)
......
src/pages/transaction/purchaseOrder/constant/index.tsx
View file @ cd54cd87
......@@ -34,6 +34,7 @@ export const baseOrderListColumns: any = () => {
dataIndex: 'vendorMemberName',
key: 'vendorMemberName',
ellipsis: true,
render: (t, r) => t ? t : r.memberName
},
{
title: '下单时间',
......
src/pages/transaction/purchaseOrder/firstApprovedOrder/detail/index.tsx
View file @ cd54cd87
......@@ -13,7 +13,7 @@ import OrderDetailSection from '../../../components/orderDetailSection';
const FirstApprovedOrderDetail: React.FC = () => {
const { formContext, id, detailList } = useOrderDetail({type: 'purchaseOrder'})
const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderReviewed)
const { run, loading } = useHttpRequest(PublicApi.postOrderBuyerValidateGradeOne)
const approvedRef = useRef<any>({})
const handleClick = useCallback(() => {
......@@ -24,7 +24,7 @@ const FirstApprovedOrderDetail: React.FC = () => {
const handleSubmit = useCallback(() => {
approvedRef.current.actions.submit().then(async ({values}) => {
const params = {
id: Number(id),
orderId: Number(id),
...values
}
const result = await run(params)
......
src/pages/transaction/purchaseOrder/firstApprovedOrder/index.tsx
View file @ cd54cd87
......@@ -9,7 +9,6 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import { PurchaseOrderInsideWorkState } from '@/constants/order'
import { useHttpRequest } from '@/hooks/useHttpRequest'
import '../index.less'
......@@ -18,12 +17,11 @@ import '../index.less'
export interface FirstApprovedOrderProps {}
const fetchTableData = async (params) => {
const { data } = await PublicApi.getOrderProcurementReviewedListOne(params)
const { data } = await PublicApi.getOrderBuyerValidateGradeOnePage(params)
return data
}
// TODO
const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = () => {
const {
columns,
ref,
......@@ -31,23 +29,18 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
rowSelectionCtl
} = useSelfTable()
const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderReviewedAll)
const { run, loading } = useHttpRequest(PublicApi.postOrderBuyerValidateGradeOneBatch)
const handleSubmitBatch = async () => {
if (rowSelectionCtl.selectRow.length === 0) {
message.error('请先勾选订单')
return ;
}
const canBitch = !rowSelectionCtl.selectRow.some(v => v.interiorState !== PurchaseOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER)
if (canBitch) {
const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
if (code === 1000) {
ref.current.reload()
rowSelectionCtl.setSelectRow([])
rowSelectionCtl.setSelectedRowKeys([])
}
} else {
message.error('只能批量提交内部状态为审核中的订单')
const { code } = await run(rowSelectionCtl.selectedRowKeys.map(item => ({ orderId: item })))
if (code === 1000) {
ref.current.reload()
rowSelectionCtl.setSelectRow([])
rowSelectionCtl.setSelectedRowKeys([])
}
}
return <PageHeaderWrapper>
......@@ -57,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
rowSelection={rowSelection}
columns={columns}
currentRef={ref}
rowKey={'id'}
rowKey={'orderId'}
formilyLayouts={{
justify: 'space-between'
}}
......
src/pages/transaction/purchaseOrder/firstApprovedOrder/model/useSelfTable.tsx
View file @ cd54cd87
......@@ -5,21 +5,12 @@ import { history } from 'umi'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { PurchaseOrderInsideWorkState } from '@/constants/order'
// 业务hooks, 待新增订单
export const useSelfTable = () => {
const ref = useRef<any>({})
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id', extendsSelection: {
getCheckboxProps: record => ({
// 不等于可提交审核的 都无法通过批量提交
disabled: record.interiorState !== PurchaseOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER,
interiorState: record.interiorState,
})
}})
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'orderId'})
const handleSubmit = async (record) => {
if (record.interiorState === PurchaseOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER) {
history.push(`/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder/detail?id=${record.id}`)
}
history.push(`/memberCenter/tranactionAbility/purchaseOrder/firstApprovedOrder/detail?id=${record.orderId}`)
// await PublicApi.postOrderQuotationBeReviewed({id})
// ref.current.reload()
}
......
src/pages/transaction/purchaseOrder/firstApprovedOrder/schema/index.ts
View file @ cd54cd87
import { FORM_FILTER_PATH } from '@/formSchema/const';
// import { getOrderType } from '@/pages/transaction/effect';
import { getPurchaseOrderSelectOption } from '@/pages/transaction/effect';
/**
* 除了订单必填字段, 默认
*/
export const tableListSchema: any = () => {
// const OrderType = getOrderType()
const res = getPurchaseOrderSelectOption()
if(res) {
const {
orderTypes: OrderType,
} = res
return {
type: 'object',
properties: {
orderNo: {
type: 'string',
"x-component": 'SearchFilter',
'x-component-props': {
placeholder: '请输入订单编号',
align: 'flex-end',
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
inline: true,
colStyle: {
marginLeft: 20
}
},
properties: {
orderThe: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
}
return {
type: 'object',
properties: {
orderNo: {
type: 'string',
"x-component": 'SearchFilter',
'x-component-props': {
placeholder: '请输入订单编号',
align: 'flex-end',
},
"supplyMembersName": {
type: 'string',
"x-component-props": {
placeholder: '请输入供应会员名称'
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
inline: true,
colStyle: {
marginLeft: 20
}
},
"type": {
type: 'string',
"x-component-props": {
placeholder: '请选择订单类型'
properties: {
digest: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
}
},
// enum: OrderType.map(item => ({
// label: item['name'],
// value: item['status'],
// }))
enum: []
},
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入供应会员名称'
}
},
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
"orderType": {
type: 'string',
"x-component-props": {
placeholder: '请选择订单类型'
},
enum: OrderType.map(item => ({
label: item['text'],
value: item['id'],
}))
},
"[startDate, endDate]": {
type: 'daterange',
// "x-component": 'DateRangePickerUnix',
'x-component-props': {
// showTime: true,
placeholder: ['开始时间','结束时间'],
},
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
},
},
},
},
},
}
}
}
}
src/pages/transaction/purchaseOrder/orderCollectB2b/constant/index.tsx
View file @ cd54cd87
......@@ -64,6 +64,7 @@ export const procurementRenderField = (data) => {
purchaseCount: item.quantity,
taxInclusive: item.tax,
money: item.amount,
imgUrl: item.logo,
// 冗余memberId memberRoleId查询自提地址使用
memberId: data.vendorMemberId,
memberRoleId: data.vendorRoleId,
......@@ -80,7 +81,6 @@ export const procurementProcessField = (value) => {
skuId: item.productId,
name: item.productName,
logo: item.imgUrl,
deliveryType: item.deliveryType.deliveryType,
quantity: item.purchaseCount,
}
})
......
src/pages/transaction/purchaseOrder/orderCollectB2b/effects/index.ts
View file @ cd54cd87
......@@ -18,26 +18,28 @@ const asyncPadDataForProduct = async (ctx: ISchemaFormActions | ISchemaFormAsync
ctx.setFieldState(productValue.path, state => {
state.loading = true
})
// 折扣请求
const asyncPriceRequests: any[] = await Promise.all(productData.filter(v => v.memberPrice === undefined).map(async v => {
const {code, data} = await PublicApi.getMemberManageUpperCreditParamGet({
parentMemberId: v.memberId,
parentMemberRoleId: v.memberRoleId
}, {ttl: 60 * 1000, useCache: true})
return code === 1000 ? { value: data.parameter, id: v.id } : { value: '', id: 0 }
}
))
// 存在需要异步请求的， 则进行赋值
if (asyncPriceRequests.length > 0) {
// // 折扣请求
// const asyncPriceRequests: any[] = await Promise.all(productData.filter(v => v.memberPrice === undefined).map(async v => {
// const {code, data} = await PublicApi.getMemberManageUpperCreditParamGet({
// parentMemberId: v.memberId,
// parentMemberRoleId: v.memberRoleId
// }, {ttl: 60 * 1000, useCache: true})
// return code === 1000 ? { value: data.parameter, id: v.id } : { value: '', id: 0 }
// }
// ))
// // 存在需要异步请求的， 则进行赋值
// if (asyncPriceRequests.length > 0) {
const newData = productData.map((v, i) => {
if (!v.memberPrice) {
v.memberPrice = asyncPriceRequests.find(j => j.id === v.id)?.value || ''
}
// if (!v.memberPrice) {
// v.memberPrice = asyncPriceRequests.find(j => j.id === v.id)?.value || ''
// }
// // @ b2b订单不考虑会员折扣 字段固定100
v.discount = 100
return v
})
ctx.setFieldValue('products', newData)
}
// }
ctx.setFieldState(productValue.path, state => {
state.loading = false
})
......
src/pages/transaction/purchaseOrder/orderCollectB2b/index.tsx
View file @ cd54cd87
......@@ -220,9 +220,6 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
const address = deliveryAddress[0]
return {
...item,
spec: item.type,
quotedSpec: item.relevanceProductType,
deliveryType: item.logistics,
addressId: address.id,
address: address.fullAddress,
receiver: address.shipperName,
......
src/pages/transaction/purchaseOrder/readySubmitOrder/detail/index.tsx
View file @ cd54cd87
import React, { useState, useCallback, useRef } from 'react';
import React, { useCallback } from 'react';
import { OrderDetailContext } from '../../../_public/order/context';
import { PublicApi } from '@/services/api';
import { Button } from 'antd';
......@@ -12,12 +12,11 @@ import OrderDetailSection from '../../../components/orderDetailSection';
const ReadySubmitOrderDetail: React.FC = () => {
const { formContext, id, detailList } = useOrderDetail({type: 'purchaseOrder'})
const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderSubmit)
const { run, loading } = useHttpRequest(PublicApi.postOrderBuyerValidateSubmit)
const handleClick = useCallback(async () => {
const params = {
id: Number(id),
state: -1
orderId: Number(id),
}
const result = await run(params)
......
src/pages/transaction/purchaseOrder/readySubmitOrder/index.tsx
View file @ cd54cd87
import React from 'react'
import { Card, Button, Space, message } from 'antd'
import { Card, Button, Space } from 'antd'
import { StandardTable } from 'god'
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { PublicApi } from '@/services/api'
......@@ -9,40 +9,33 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
import { PurchaseOrderOutWorkState, PurchaseOrderInsideWorkState } from '@/constants/order'
import { useHttpRequest } from '@/hooks/useHttpRequest'
import '../index.less'
// 待提交订单
export interface FirstApprovedOrderProps {}
export interface ReadySubmitOrderProps {}
const fetchTableData = async (params) => {
const { data } = await PublicApi.getOrderProcurementSubmitList(params)
const { data } = await PublicApi.getOrderBuyerValidateSubmitPage(params)
return data
}
// TODO
const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
const ReadySubmitOrder:React.FC<ReadySubmitOrderProps> = (props) => {
const {
columns,
ref,
rowSelection,
rowSelectionCtl
} = useSelfTable()
const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderSubmitAll)
const { run, loading } = useHttpRequest(PublicApi.postOrderBuyerValidateSubmitBatch)
const handleBitchPush = async () => {
const canBitch = !rowSelectionCtl.selectRow.some(v => v.externalState !== PurchaseOrderOutWorkState.SUBMIT_ORDER || v.interiorState !== PurchaseOrderInsideWorkState.SUBMIT_ORDER)
if (canBitch) {
const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
if (code === 1000) {
ref.current.reload()
rowSelectionCtl.setSelectRow([])
rowSelectionCtl.setSelectedRowKeys([])
}
} else {
message.error('只能提交内部状态为审核通过并且外部状态为待提交的订单')
const { code } = await run(rowSelectionCtl.selectedRowKeys.map(item => ({ orderId: item })))
if (code === 1000) {
ref.current.reload()
rowSelectionCtl.setSelectRow([])
rowSelectionCtl.setSelectedRowKeys([])
}
}
......@@ -53,7 +46,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
fetchTableData={params => fetchTableData(params)}
columns={columns}
currentRef={ref}
rowKey={'id'}
rowKey={'orderId'}
formilyLayouts={{
justify: 'space-between'
}}
......@@ -92,6 +85,6 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
</PageHeaderWrapper>
}
FirstApprovedOrder.defaultProps = {}
ReadySubmitOrder.defaultProps = {}
export default FirstApprovedOrder
export default ReadySubmitOrder
src/pages/transaction/purchaseOrder/readySubmitOrder/model/useSelfTable.tsx
View file @ cd54cd87
import React, { useRef } from 'react'
import { Button, Popconfirm } from 'antd'
import { Button } from 'antd'
import { baseOrderListColumns } from '../../constant'
import { history } from 'umi'
import { PublicApi } from '@/services/api'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
import { PurchaseOrderInsideWorkState, PurchaseOrderOutWorkState } from '@/constants/order'
// 业务hooks, 待新增订单
export const useSelfTable = () => {
const ref = useRef<any>({})
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'orderId'})
const handleSubmit = async (id) => {
history.push(`/memberCenter/tranactionAbility/purchaseOrder/readySubmitOrder/detail?id=${id}&preview=0`)
}
// 取消订单
const handleCancel = async (id) => {
await PublicApi.postOrderPurchaseOrderCancel({id})
ref.current.reload()
}
const secondColumns: any[] = baseOrderListColumns().concat([
{
title: '操作',
align: 'center',
dataIndex: 'ctl',
key: 'ctl',
render: (text, record) => <Button type='link' onClick={() => handleSubmit(record.id)}>提交订单</Button>
render: (text, record) => <Button type='link' onClick={() => handleSubmit(record.orderId)}>提交订单</Button>
}
])
......
src/pages/transaction/purchaseOrder/readySubmitOrder/schema/index.ts
View file @ cd54cd87
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { getPurchaseOrderSelectOption } from '@/pages/transaction/effect';
/**
* 除了订单必填字段, 默认
*/
export const tableListSchema: any = () => {
// const OrderType = getOrderType()
const res = getPurchaseOrderSelectOption()
if(res) {
const {
orderTypes: OrderType,
} = res
return {
type: 'object',
properties: {
orderNo: {
type: 'string',
"x-component": 'SearchFilter',
'x-component-props': {
placeholder: '请输入订单编号',
align: 'flex-end',
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
inline: true,
colStyle: {
marginLeft: 20
}
},
properties: {
orderThe: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
}
return {
type: 'object',
properties: {
orderNo: {
type: 'string',
"x-component": 'SearchFilter',
'x-component-props': {
placeholder: '请输入订单编号',
align: 'flex-end',
},
"supplyMembersName": {
type: 'string',
"x-component-props": {
placeholder: '请输入供应会员名称'
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
inline: true,
colStyle: {
marginLeft: 20
}
},
"type": {
type: 'string',
"x-component-props": {
placeholder: '请选择订单类型'
properties: {
digest: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
}
},
// enum: OrderType.map(item => ({
// label: item['name'],
// value: item['status'],
// }))
enum: []
},
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入供应会员名称'
}
},
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
"orderType": {
type: 'string',
"x-component-props": {
placeholder: '请选择订单类型'
},
enum: OrderType.map(item => ({
label: item['text'],
value: item['id'],
}))
},
"[startDate, endDate]": {
type: 'daterange',
// "x-component": 'DateRangePickerUnix',
'x-component-props': {
// showTime: true,
placeholder: ['开始时间','结束时间'],
},
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
},
},
},
},
},
}
}
}
}
src/pages/transaction/purchaseOrder/secondApprovedOrder/detail/index.tsx
View file @ cd54cd87
......@@ -13,7 +13,7 @@ import OrderDetailSection from '../../../components/orderDetailSection';
const SecondApprovedOrderDetail: React.FC = () => {
const { formContext, id, detailList } = useOrderDetail({type: 'purchaseOrder'})
const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderReviewedTwo)
const { run, loading } = useHttpRequest(PublicApi.postOrderBuyerValidateGradeTwo)
const approvedRef = useRef<any>({})
const handleClick = useCallback(() => {
......@@ -24,7 +24,7 @@ const SecondApprovedOrderDetail: React.FC = () => {
const handleSubmit = useCallback(() => {
approvedRef.current.actions.submit().then(async ({values}) => {
const params = {
id: Number(id),
orderId: Number(id),
...values
}
const result = await run(params)
......
src/pages/transaction/purchaseOrder/secondApprovedOrder/index.tsx
View file @ cd54cd87
......@@ -14,26 +14,23 @@ import { useHttpRequest } from '@/hooks/useHttpRequest'
// 二级待审核订单
export interface FirstApprovedOrderProps {}
export interface SecondApprovedOrderProps {}
const fetchTableData = async (params) => {
const { data } = await PublicApi.getOrderProcurementReviewedListTwo(params)
const { data } = await PublicApi.getOrderBuyerValidateGradeTwoPage(params)
return data
}
// TODO
const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
const SecondApprovedOrder:React.FC<SecondApprovedOrderProps> = (props) => {
const {
columns,
ref
} = useSelfTable()
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
const { run, loading } = useHttpRequest(PublicApi.postOrderProcurementOrderReviewedAllTwo)
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'orderId'})
const { run, loading } = useHttpRequest(PublicApi.postOrderBuyerValidateGradeTwoBatch)
const handleSubmitBatch = async () => {
const { code } = await run({
ids: rowSelectionCtl.selectedRowKeys
})
const { code } = await run(rowSelectionCtl.selectedRowKeys.map(item => ({ orderId: item })))
if (code === 1000) {
// 清空选中的值
......@@ -49,7 +46,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
rowSelection={rowSelection}
columns={columns}
currentRef={ref}
rowKey={'id'}
rowKey={'orderId'}
formilyLayouts={{
justify: 'space-between'
}}
......@@ -88,6 +85,6 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
</PageHeaderWrapper>
}
FirstApprovedOrder.defaultProps = {}
SecondApprovedOrder.defaultProps = {}
export default FirstApprovedOrder
export default SecondApprovedOrder
src/pages/transaction/purchaseOrder/secondApprovedOrder/model/useSelfTable.tsx
View file @ cd54cd87
......@@ -2,15 +2,11 @@ import React, { useRef } from 'react'
import { Button } from 'antd'
import { baseOrderListColumns } from '../../constant'
import { history } from 'umi'
import { PurchaseOrderInsideWorkState } from '@/constants/order'
// 业务hooks, 待新增订单
export const useSelfTable = () => {
const ref = useRef<any>({})
const handleSubmit = async (record) => {
if (record.interiorState === PurchaseOrderInsideWorkState.TWO_LEVEL_AUDIT_ORDER) {
history.push(`/memberCenter/tranactionAbility/purchaseOrder/secondApprovedOrder/detail?id=${record.id}`)
}
history.push(`/memberCenter/tranactionAbility/purchaseOrder/secondApprovedOrder/detail?id=${record.orderId}`)
}
const secondColumns: any[] = baseOrderListColumns().concat([
{
......
src/pages/transaction/purchaseOrder/secondApprovedOrder/schema/index.ts
View file @ cd54cd87
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { getPurchaseOrderSelectOption } from '@/pages/transaction/effect';
export const tableListSchema: any = () => {
// const OrderType = getOrderType()
const res = getPurchaseOrderSelectOption()
if(res) {
const {
orderTypes: OrderType,
} = res
return {
type: 'object',
properties: {
orderNo: {
type: 'string',
"x-component": 'SearchFilter',
'x-component-props': {
placeholder: '请输入订单编号',
align: 'flex-end',
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
inline: true,
colStyle: {
marginLeft: 20
}
},
properties: {
orderThe: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
}
return {
type: 'object',
properties: {
orderNo: {
type: 'string',
"x-component": 'SearchFilter',
'x-component-props': {
placeholder: '请输入订单编号',
align: 'flex-end',
},
"supplyMembersName": {
type: 'string',
"x-component-props": {
placeholder: '请输入供应会员名称'
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
inline: true,
colStyle: {
marginLeft: 20
}
},
"type": {
type: 'string',
"x-component-props": {
placeholder: '请选择订单类型'
properties: {
digest: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
}
},
// enum: OrderType.map(item => ({
// label: item['name'],
// value: item['status'],
// }))
enum: []
},
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入供应会员名称'
}
},
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
"orderType": {
type: 'string',
"x-component-props": {
placeholder: '请选择订单类型'
},
enum: OrderType.map(item => ({
label: item['text'],
value: item['id'],
}))
},
"[startDate, endDate]": {
type: 'daterange',
// "x-component": 'DateRangePickerUnix',
'x-component-props': {
// showTime: true,
placeholder: ['开始时间','结束时间'],
},
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
},
},
},
},
},
}
}
}
}
src/pages/transaction/saleOrder/constant/index.tsx
View file @ cd54cd87
......@@ -3,18 +3,9 @@ import { formatTimeString } from '@/utils'
import StatusColors from '@/pages/transaction/components/statusColors'
import EyePreview from '@/components/EyePreview'
import { history } from 'umi'
import { getSaleOrderSelectOption } from '../../effect'
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { getSaleOrderAuditPageSelectOption } from '@/pages/transaction/effect';
interface LayoutState {
/** flex布局的对齐方式 */
align?: string,
/** 列的样式 */
colStyle?: Object
}
/** 订单审核各个页面 只有订单类型查询的Schema */
export const tableListSchema: any = (align?: String, colStyle?: Object) => {
......@@ -43,7 +34,7 @@ export const tableListSchema: any = (align?: String, colStyle?: Object) => {
colStyle: colStyle || {marginRight: 20}
},
properties: {
orderThe: {
digest: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
......@@ -89,14 +80,6 @@ export const tableListSchema: any = (align?: String, colStyle?: Object) => {
export const baseOrderListColumns: any = () => {
// const res = getSaleOrderSelectOption()
// if(res) {
// const {
// orderTypes: OrderType,
// innerStatus: SaleOrderInsideWorkStateTexts,
// outerStatus: SaleOrderOutWorkStateTexts
// } = res
return [
{
title: '订单号',
......@@ -104,7 +87,6 @@ export const baseOrderListColumns: any = () => {
dataIndex: 'orderNo',
key: 'orderNo',
render: (text, record) => {
// 查看订单, 需根据状态显示不同schema
return (
<EyePreview url={`${history.location.pathname}/preview?id=${record.orderId}`}>
{text}
......@@ -121,8 +103,8 @@ export const baseOrderListColumns: any = () => {
{
title: '采购会员',
align: 'center',
dataIndex: 'buyerMemberName',
key: 'buyerMemberName',
dataIndex: 'memberName',
key: 'memberName',
},
{
title: '下单时间',
......@@ -142,8 +124,6 @@ export const baseOrderListColumns: any = () => {
align: 'center',
dataIndex: 'orderTypeName',
key: 'orderTypeName',
// filters: OrderType.map((e, i) => ({ text: e['text'], value: Number(e['id']) })),
// onFilter: (value, record) => value === record.orderType,
},
{
title: '外部状态',
......@@ -151,8 +131,6 @@ export const baseOrderListColumns: any = () => {
dataIndex: 'outerStatusName',
key: 'outerStatusName',
render: (text, record) => <StatusColors status={text} type='out' text={record['outerStatusName']} />,
// filters: SaleOrderOutWorkStateTexts.map((e, i) => ({ text: e['text'], value: Number(e['id']) })),
// onFilter: (value, record) => value === record.outerStatus,
},
{
title: '内部状态',
......@@ -160,9 +138,6 @@ export const baseOrderListColumns: any = () => {
dataIndex: 'innerStatusName',
key: 'innerStatusName',
render: (text, record) => <StatusColors status={text} type='saleInside' text={record['innerStatusName']} />,
// filters: SaleOrderInsideWorkStateTexts.map((e, i) => ({ text: e['text'], value: Number(e['id']) })),
// onFilter: (value, record) => value === record.innerStatus,
},
]
// }
}
src/pages/transaction/saleOrder/firstApprovedOrder/detail/index.tsx
View file @ cd54cd87
import React, { useState, useCallback, useRef } from 'react';
import React, { useCallback, useRef } from 'react';
import { OrderDetailContext } from '../../../_public/order/context';
import { PublicApi } from '@/services/api';
import { Button } from 'antd';
......@@ -13,7 +13,7 @@ import OrderDetailSection from '../../../components/orderDetailSection';
const FirstApprovedOrderDetail: React.FC = () => {
const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderOne)
const { run, loading } = useHttpRequest(PublicApi.postOrderVendorValidateGradeOne)
const approvedRef = useRef<any>({})
const handleClick = useCallback(() => {
......@@ -24,9 +24,8 @@ const FirstApprovedOrderDetail: React.FC = () => {
const handleSubmit = useCallback(() => {
approvedRef.current.actions.submit().then(async (v) => {
const params = {
id: Number(id),
state: v.values.state,
cause: v.values.cause,
orderId: Number(id),
...v,
}
const result = await run(params)
......
src/pages/transaction/saleOrder/firstApprovedOrder/index.tsx
View file @ cd54cd87
......@@ -17,11 +17,11 @@ import '../index.less'
export interface FirstApprovedOrderProps {}
const fetchTableData = async (params) => {
const { data } = await PublicApi.getOrderSubmittedReviewOrderOneList(params)
const { data } = await PublicApi.getOrderVendorValidateGradeOnePage(params)
return data
}
const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = () => {
const {
columns,
ref,
......@@ -29,11 +29,11 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
rowSelectionCtl
} = useSelfTable()
const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderOneAll)
const { run, loading } = useHttpRequest(PublicApi.postOrderVendorValidateGradeOneBatch)
const handleBitchPush = async () => {
if (rowSelectionCtl.selectedRowKeys.length > 0) {
const { code } = await run({ids: rowSelectionCtl.selectedRowKeys})
const { code } = await run(rowSelectionCtl.selectedRowKeys.map(item => ({ orderId: item })))
if (code === 1000) {
rowSelectionCtl.setSelectRow([])
rowSelectionCtl.setSelectedRowKeys([])
......@@ -50,7 +50,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
rowSelection={rowSelection}
columns={columns}
currentRef={ref}
rowKey={'id'}
rowKey={'orderId'}
formilyLayouts={{
justify: 'space-between'
}}
......
src/pages/transaction/saleOrder/firstApprovedOrder/model/useSelfTable.tsx
View file @ cd54cd87
......@@ -4,13 +4,12 @@ import { baseOrderListColumns } from '../../constant'
import { history } from 'umi'
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
// 业务hooks, 待新增订单
export const useSelfTable = () => {
const ref = useRef<any>({})
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'orderId'})
const handleSubmit = async (record) => {
history.push(`/memberCenter/tranactionAbility/saleOrder/firstApprovedOrder/detail?id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/saleOrder/firstApprovedOrder/detail?id=${record.orderId}`)
}
const secondColumns = () => {
......
src/pages/transaction/saleOrder/firstApprovedOrder/schema/index.ts deleted 100644 → 0
View file @ ea7d5519
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { getOrderType } from '@/pages/transaction/effect';
export const tableListSchema: any = () => {
const OrderType = getOrderType()
return {
type: 'object',
properties: {
orderNo: {
type: 'string',
"x-component": 'SearchFilter',
'x-component-props': {
placeholder: '请输入订单编号',
align: 'flex-end',
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
inline: true,
colStyle: {
marginLeft: 20
}
},
properties: {
orderThe: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
}
},
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入采购会员名称'
}
},
"type": {
type: 'string',
"x-component-props": {
placeholder: '请选择订单类型'
},
enum: OrderType.map(item => ({
label: item['name'],
value: item['status'],
}))
},
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
},
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
},
},
},
},
}
}
}
src/pages/transaction/saleOrder/readyApprovedOrder/index.tsx
View file @ cd54cd87
......@@ -16,11 +16,11 @@ import { tableListSchema } from '../constant'
export interface ReadyApprovedOrderProps {}
const fetchTableData = async (params) => {
const { data } = await PublicApi.getOrderSubmittedReviewOrderList(params)
const { data } = await PublicApi.getOrderVendorValidateSubmitPage(params)
return data
}
const ReadyApprovedOrder:React.FC<ReadyApprovedOrderProps> = (props) => {
const ReadyApprovedOrder:React.FC<ReadyApprovedOrderProps> = () => {
const { columns, ref } = useSelfTable()
......
src/pages/transaction/saleOrder/readyApprovedOrder/model/useSelfTable.tsx
View file @ cd54cd87
......@@ -3,7 +3,6 @@ import { Button } from 'antd'
import { baseOrderListColumns } from '../../constant'
import { history } from 'umi'
// 业务hooks, 待审核订单
export const useSelfTable = () => {
const ref = useRef<any>({})
......@@ -22,7 +21,7 @@ export const useSelfTable = () => {
key: 'ctl',
render: (text, record) => {
return <>
<Button type='link' onClick={() => handleSubmit(record.id)}>提交审核</Button>
<Button type='link' onClick={() => handleSubmit(record.orderId)}>提交审核</Button>
</>
}
}
......
src/pages/transaction/saleOrder/readyApprovedOrder/schema/index.ts deleted 100644 → 0
View file @ ea7d5519
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { getSaleOrderAuditPageSelectOption } from '@/pages/transaction/effect';
export const tableListSchema: any = () => {
const res = getSaleOrderAuditPageSelectOption()
if(res) {
const {
orderTypes: OrderType,
} = res
return {
type: 'object',
properties: {
orderNo: {
type: 'string',
"x-component": 'SearchFilter',
'x-component-props': {
placeholder: '请输入订单编号',
align: 'flex-start',
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
inline: true,
colStyle: {
marginRight: 20
}
},
properties: {
orderThe: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
}
},
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入采购会员名称'
}
},
"type": {
type: 'string',
"x-component-props": {
placeholder: '请选择订单类型'
},
enum: OrderType.map(item => ({
label: item['text'],
value: item['id'],
}))
},
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
},
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
},
},
},
},
}
}
}
}
src/pages/transaction/saleOrder/readyConfirmOrder/detail/index.tsx
View file @ cd54cd87
import React, { useState, useCallback, useRef } from 'react';
import React, { useCallback, useRef } from 'react';
import { OrderDetailContext } from '../../../_public/order/context';
import { PublicApi } from '@/services/api';
import { Button } from 'antd';
......@@ -14,7 +14,7 @@ import OrderElectronModal from '@/pages/transaction/components/orderElectronModa
const ReadyConfirmOrderDetail: React.FC = () => {
const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
const { run, loading } = useHttpRequest(PublicApi.postOrderConfirmedOrder)
const { run, loading } = useHttpRequest(PublicApi.postOrderVendorValidateConfirm)
const approvedRef = useRef<any>({})
const handleClick = useCallback(() => {
......@@ -36,9 +36,8 @@ const ReadyConfirmOrderDetail: React.FC = () => {
const handleSubmit = () => {
approvedRef.current.actions.submit().then(async (v) => {
const params = {
id: Number(id),
state: v.values.state,
cause: v.values.cause,
orderId: Number(id),
...v.values,
}
if(formContext.data.usingElectronicContracts && v.values.state) { // 使用合同 并且通过
approvedRef.current.setVisible(false)
......
src/pages/transaction/saleOrder/readyConfirmOrder/index.tsx
View file @ cd54cd87
......@@ -13,14 +13,14 @@ import '../index.less'
// 待确认订单
export interface FirstApprovedOrderProps {}
export interface ReadyConfirmOrderProps {}
const fetchTableData = async (params) => {
const { data } = await PublicApi.getOrderConfirmedOrderList(params)
const { data } = await PublicApi.getOrderVendorValidateConfirmPage(params)
return data
}
const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
const ReadyConfirmOrder:React.FC<ReadyConfirmOrderProps> = () => {
const {
columns
} = useSelfTable()
......@@ -57,6 +57,6 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
</PageHeaderWrapper>
}
FirstApprovedOrder.defaultProps = {}
ReadyConfirmOrder.defaultProps = {}
export default FirstApprovedOrder
export default ReadyConfirmOrder
src/pages/transaction/saleOrder/readyConfirmOrder/model/useSelfTable.tsx
View file @ cd54cd87
......@@ -3,10 +3,9 @@ import { history } from 'umi'
import { Button } from 'antd'
import { baseOrderListColumns } from '../../constant'
// 业务hooks, 待新增订单
export const useSelfTable = () => {
const handleConfirm = async (record) => {
history.push(`/memberCenter/tranactionAbility/saleOrder/readyConfirmOrder/detail?id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/saleOrder/readyConfirmOrder/detail?id=${record.orderId}`)
}
const secondColumns = () => {
......
src/pages/transaction/saleOrder/readyConfirmOrder/schema/index.ts deleted 100644 → 0
View file @ ea7d5519
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { getOrderType } from '@/pages/transaction/effect';
/**
* 除了订单必填字段, 默认
*/
export const tableListSchema: any = () => {
const OrderType = getOrderType()
return {
type: 'object',
properties: {
orderNo: {
type: 'string',
"x-component": 'SearchFilter',
'x-component-props': {
placeholder: '请输入订单编号',
align: 'flex-start',
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
inline: true,
colStyle: {
marginRight: 20
}
},
properties: {
orderThe: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
}
},
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入采购会员名称'
}
},
"type": {
type: 'string',
"x-component-props": {
placeholder: '请选择订单类型'
},
enum: OrderType.map(item => ({
label: item['name'],
value: item['status'],
}))
},
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
},
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
},
},
},
},
}
}
}
src/pages/transaction/saleOrder/secondApprovedOrder/detail/index.tsx
View file @ cd54cd87
import React, { useState, useCallback, useRef } from 'react';
import React, { useCallback, useRef } from 'react';
import { OrderDetailContext } from '../../../_public/order/context';
import { PublicApi } from '@/services/api';
import { Button } from 'antd';
......@@ -13,7 +13,7 @@ import OrderDetailSection from '../../../components/orderDetailSection';
const SecondApprovedOrderDetail: React.FC = () => {
const { formContext, id, detailList } = useOrderDetail({type: 'saleOrder'})
const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderTwo)
const { run, loading } = useHttpRequest(PublicApi.postOrderVendorValidateGradeTwo)
const approvedRef = useRef<any>({})
const handleClick = useCallback(() => {
......@@ -24,9 +24,8 @@ const SecondApprovedOrderDetail: React.FC = () => {
const handleSubmit = useCallback(() => {
approvedRef.current.actions.submit().then(async (v) => {
const params = {
id: Number(id),
state: v.values.state,
cause: v.values.cause,
orderId: Number(id),
...v.values
}
const result = await run(params)
......
src/pages/transaction/saleOrder/secondApprovedOrder/index.tsx
View file @ cd54cd87
......@@ -15,25 +15,23 @@ import '../index.less'
// 二级待审核订单
export interface FirstApprovedOrderProps {}
export interface SecondApprovedOrderProps {}
const fetchTableData = async (params) => {
const { data } = await PublicApi.getOrderSubmittedReviewOrderTwoList(params)
const { data } = await PublicApi.getOrderVendorValidateGradeTwoPage(params)
return data
}
const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
const SecondApprovedOrder:React.FC<SecondApprovedOrderProps> = (props) => {
const {
columns,
ref
} = useSelfTable()
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
const { run, loading } = useHttpRequest(PublicApi.postOrderSubmittedReviewOrderTwoAll)
const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'orderId'})
const { run, loading } = useHttpRequest(PublicApi.postOrderVendorValidateGradeTwoBatch)
const handleSubmitBatch = async () => {
const { code } = await run({
ids: rowSelectionCtl.selectedRowKeys
})
const { code } = await run(rowSelectionCtl.selectedRowKeys.map(item => ({ orderId: item })))
if (code === 1000) {
rowSelectionCtl.setSelectRow([])
rowSelectionCtl.setSelectedRowKeys([])
......@@ -48,7 +46,7 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
rowSelection={rowSelection}
columns={columns}
currentRef={ref}
rowKey={'id'}
rowKey={'orderId'}
formilyLayouts={{
justify: 'space-between'
}}
......@@ -56,7 +54,6 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
ctx: {
inline: false,
schema: tableListSchema('flex-end', { marginLeft: 20 }),
// schema: tableListSchema(),
effects: ($, actions) => {
useStateFilterSearchLinkageEffect(
$,
......@@ -88,6 +85,6 @@ const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
</PageHeaderWrapper>
}
FirstApprovedOrder.defaultProps = {}
SecondApprovedOrder.defaultProps = {}
export default FirstApprovedOrder
export default SecondApprovedOrder
src/pages/transaction/saleOrder/secondApprovedOrder/model/useSelfTable.tsx
View file @ cd54cd87
......@@ -2,13 +2,12 @@ import React, { useRef } from 'react'
import { Button } from 'antd'
import { baseOrderListColumns } from '../../constant'
import { history } from 'umi'
import { SaleOrderInsideWorkState } from '@/constants/order'
// 业务hooks, 待新增订单
export const useSelfTable = () => {
const ref = useRef<any>({})
const handleSubmit = async (record) => {
history.push(`/memberCenter/tranactionAbility/saleOrder/secondApprovedOrder/detail?id=${record.id}`)
history.push(`/memberCenter/tranactionAbility/saleOrder/secondApprovedOrder/detail?id=${record.orderId}`)
}
const secondColumns = () => {
......
src/pages/transaction/saleOrder/secondApprovedOrder/schema/index.ts deleted 100644 → 0
View file @ ea7d5519
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { getOrderType } from '@/pages/transaction/effect';
/**
* 除了订单必填字段, 默认
*/
export const tableListSchema: any = () => {
const OrderType = getOrderType()
return {
type: 'object',
properties: {
orderNo: {
type: 'string',
"x-component": 'SearchFilter',
'x-component-props': {
placeholder: '请输入订单编号',
align: 'flex-end',
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
inline: true,
colStyle: {
marginLeft: 20
}
},
properties: {
orderThe: {
type: 'string',
'x-component-props': {
placeholder: '请输入订单摘要',
}
},
"memberName": {
type: 'string',
"x-component-props": {
placeholder: '请输入采购会员名称'
}
},"type": {
type: 'string',
"x-component-props": {
placeholder: '请选择订单类型'
},
enum: OrderType.map(item => ({
label: item['name'],
value: item['status'],
}))
},
"[startCreateTime,endCreateTime]": {
type: 'array',
"x-component": 'DateRangePickerUnix',
'x-component-props': {
placeholder: ['开始时间','结束时间'],
},
},
submit: {
'x-component': 'Submit',
'x-component-props': {
children: '查询',
},
},
},
},
}
}
}
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