Skip to content

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

新增需求发布新需求完成接口接入

parent c76f2f18
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 54 deletions
config/routes/tranactionRoute/demandPosts.ts
View file @ 68a7b01c
......@@ -43,6 +43,13 @@ export default [
},
// 待新增需求单-编辑
{
path: '/memberCenter/tranactionAbility/enquirySubmit/addDemandOrder/edit',
name: 'editEnquiry',
component: '@/pages/transaction/enquirySubmit/addDemandOrder',
hideInMenu: true,
},
// 待新增需求单-编辑
{
path: '/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/edit',
name: 'editEnquiry',
component: '@/pages/transaction/enquirySubmit/toAddSubmit/detail',
......
src/pages/transaction/enquirySubmit/addDemandOrder/components/addGoods.tsx
View file @ 68a7b01c
......@@ -4,6 +4,7 @@ import { ColumnType } from 'antd/lib/table/interface';
import ModalAnchor from './Modal/modalAnchor';
import ModalGoods from './Modal/modalGoods';
import { PlusOutlined } from '@ant-design/icons';
import { PublicApi } from '@/services/api';
const layout: any = {
......@@ -134,12 +135,27 @@ const AddGoods: React.FC<faceSetData> = (props) => {
}
}, [tabledata])
useEffect(() => {
/**编辑回显数据 */
if(Object.keys(set).length > 0) {
form.setFieldsValue({
type: set.type
})
PublicApi.getOrderRequisitionFormProductDetails({id: set.id}).then(res => {
if(res.code === 1000) {
setType(set.type)
settabledata([res])
}
})
}
}, [set])
return (
<Form
{...layout}
form={form}
>
<Form.Item label='添加方式' rules={[{ required: true, message: '请选择添加方式' }]}>
<Form.Item label='添加方式' name='type' rules={[{ required: true, message: '请选择添加方式' }]}>
<Radio.Group onChange={changeRadio}>
<Radio value={1}>通过平台属性添加</Radio>
<Radio value={2}>选择货品添加</Radio>
......
src/pages/transaction/enquirySubmit/addDemandOrder/components/basicInfo.tsx
View file @ 68a7b01c
......@@ -41,7 +41,7 @@ const BasicInfo: React.FC<faceSetData> = (props) => {
})
}
// 选择下拉得内容
const handProvince = (val: any, idx: number, num: number) => {
const handProvince = async (val: any, idx: number, num: number) => {
const result = [...requisitionFormAddress];
const cityCode: Array<any> = []
result.forEach((item: any) => {
......@@ -51,7 +51,7 @@ const BasicInfo: React.FC<faceSetData> = (props) => {
})
setcode([...cityCode]);
if (num === 1) {
province.forEach(item => {
await province.forEach(item => {
if (item.code === val) {
PublicApi.getManageAreaByPcodeAll({ pcode: val }).then((res: any) => {
if (res.code === 1000) {
......@@ -63,7 +63,7 @@ const BasicInfo: React.FC<faceSetData> = (props) => {
})
}
})
} else {
city.forEach(item => {
item.citydata.forEach(items => {
......@@ -139,6 +139,30 @@ const BasicInfo: React.FC<faceSetData> = (props) => {
}, [])
useEffect(() => {
/**编辑回显数据 */
if (Object.keys(set).length > 0) {
setrequisitionFormAddress([...set.requisitionFormAddress])
set.requisitionFormAddress.forEach((item: any, index: number) => {
PublicApi.getManageAreaByPcodeAll({ pcode: item.provinceCode }).then((res: any) => {
if (res.code === 1000) {
city[index] = { citydata: res.data }
Promise.resolve().then(() => {
setTimeout(() => {
setcity([...city])
form.setFieldsValue({
details: set.details,
['province_' + index]: item.provinceCode,
['city_' + index]: item.cityCode,
});
}, 350);
});
}
})
})
}
}, [set])
useEffect(() => {
currentRef.current = {
get: () => new Promise((resolve: any) => {
form.validateFields().then(res => {
......@@ -231,27 +255,27 @@ const BasicInfo: React.FC<faceSetData> = (props) => {
<Form.Item
label='需求单号'
>
<span>SPTY12</span>
<span>{set.requisitionFormNo && set.requisitionFormNo}</span>
</Form.Item>
<Form.Item
label='会员名称'
>
<span>温州龙昌手袋有限公司</span>
<span>{set.memberName && set.memberName}</span>
</Form.Item>
<Form.Item
label='单据时间'
>
<span>2020-08-20 12:56:25</span>
<span>{set.voucherTime && set.voucherTime}</span>
</Form.Item>
<Form.Item
label='外部状态'
>
<span>待提交需求单</span>
<span>{set.externalState && set.externalState}</span>
</Form.Item>
<Form.Item
label='外部状态'
label='内部状态'
>
<span>待提交审核</span>
<span>{set.interiorState && set.interiorState}</span>
</Form.Item>
</Form>
)
......
src/pages/transaction/enquirySubmit/addDemandOrder/components/demandDbutted.tsx
View file @ 68a7b01c
......@@ -148,9 +148,11 @@ const DemandDbutted: React.FC<faceSetData> = (props) => {
shopId === 3 &&
// 指定会员
<Form.Item noStyle>
<Button type='dashed' block style={{ marginBottom: '24px' }}><PlusOutlined />选择会员</Button>
<Table
{/* <Button type='dashed' block style={{ marginBottom: '24px' }}><PlusOutlined />选择会员</Button> */}
<StandardTable
rowSelection={rowSelection}
columns={memberColumns}
// fetchTableData={(params) => fetchSystemMateData(params)}
/>
</Form.Item>
}
......
src/pages/transaction/enquirySubmit/addDemandOrder/components/flowRecord.tsx
View file @ 68a7b01c
import React, { useState } from 'react';
import React, { useState, useEffect } from 'react';
import styles from './index.less';
import { Radio } from 'antd';
import PolymericTable from '@/components/PolymericTable';
......@@ -18,6 +18,7 @@ const FlowRecord: React.FC<faceSetData> = (props) => {
const outerColumns: EditableColumns[] = [{
title: '序号',
dataIndex: 'inquiryListId',
render: (texr: any, record: any, index: number) => <span>{index + 1}</span>
}, {
title: '操作角色',
dataIndex: 'roleName',
......@@ -26,7 +27,7 @@ const FlowRecord: React.FC<faceSetData> = (props) => {
dataIndex: 'state',
}, {
title: '操作',
dataIndex: 'operation',
dataIndex: 'operationalProcess',
}, {
title: '操作时间',
dataIndex: 'operationTime',
......@@ -38,6 +39,7 @@ const FlowRecord: React.FC<faceSetData> = (props) => {
const insideColumns: EditableColumns[] = [{
title: '序号',
dataIndex: 'inquiryListId',
render: (texr: any, record: any, index: number) => <span>{index + 1}</span>
}, {
title: '操作人',
dataIndex: 'roleName',
......@@ -52,7 +54,7 @@ const FlowRecord: React.FC<faceSetData> = (props) => {
dataIndex: 'state',
}, {
title: '操作',
dataIndex: 'operation',
dataIndex: 'operationalProcess',
}, {
title: '操作时间',
dataIndex: 'operationTime',
......@@ -64,6 +66,7 @@ const FlowRecord: React.FC<faceSetData> = (props) => {
const onChange = (e: any) => {
setRadio(e.target.value)
}
return (
<div>
<Radio.Group defaultValue="outer" buttonStyle="solid" onChange={onChange}>
......@@ -75,12 +78,14 @@ const FlowRecord: React.FC<faceSetData> = (props) => {
columns={outerColumns}
loading={false}
pagination={null}
dataSource={Object.keys(set).length > 0 && set.externalRequisitionFormStateResponses}
/>
:
<PolymericTable
columns={insideColumns}
loading={false}
pagination={null}
dataSource={Object.keys(set).length > 0 && set.interiorRequisitionFormStateResponses}
/>
}
</div>
......
src/pages/transaction/enquirySubmit/addDemandOrder/components/tradingConditions.tsx
View file @ 68a7b01c
......@@ -64,6 +64,23 @@ const TradingConditions: React.FC<faceSetData> = (props) => {
setselectAddress(option)
}
useEffect(() => {
if(Object.keys(set).length > 0) {
TradingConditionsForm.setFieldsValue({
deliveryTime: moment(set.deliveryTime),
addresId: set.addresId,
quotationAsTime: moment(set.quotationAsTime),
offer: set.offer,
paymentType: set.paymentType,
taxes: set.taxes,
logistics: set.logistics,
packRequire: set.packRequire,
otherRequire: set.otherRequire
})
setselectAddress({children: set.addres});
}
}, [set])
return (
<Form
{...layout}
......@@ -85,9 +102,6 @@ const TradingConditions: React.FC<faceSetData> = (props) => {
))}
</Select>
</Form.Item>
<Form.Item hidden label='交付地址' name='addres'>
<Input value={selectAddress.children} />
</Form.Item>
<Form.Item label='报价截止时间' name='quotationAsTime' rules={[{ required: true, message: '请选择报价截止时间' }]}>
<DatePicker
style={{ width: '100%' }}
......
src/pages/transaction/enquirySubmit/addDemandOrder/index.tsx
View file @ 68a7b01c
import React, { useState, useRef } from 'react';
import React, { useState, useRef, useEffect } from 'react';
import { history } from 'umi';
import ReutrnEle from '@/components/ReturnEle'
import { PageHeaderWrapper } from '@ant-design/pro-layout';
......@@ -8,11 +8,12 @@ import TradingConditions from './components/tradingConditions'
import FlowRecord from './components/flowRecord';
import AddGoods from './components/addGoods';
import DemandDbutted from './components/demandDbutted';
import { setUpdata } from './data'; /**set数据给子组件 */
import { PublicApi } from '@/services/api';
const { TabPane } = Tabs;
const AddDemandOrder: React.FC<{}> = () => {
const [fetchdata, setfetchdata] = useState<any>(setUpdata);
const { id } = history.location.query;
const [fetchdata, setfetchdata] = useState<any>({});
const basic = useRef<any>();
const goods = useRef<any>();
const trading = useRef<any>();
......@@ -27,17 +28,58 @@ const AddDemandOrder: React.FC<{}> = () => {
const data = {
...basicRef.data,
...tradingRef.data,
...goodsRef.data
...goodsRef.data,
type: 1,
shopIds: [1]
}
console.log(data)
} else {
if (basicRef.data.requisitionFormAddress.length > 0) {
data.defaultAddres = 0
} else {
data.defaultAddres = 1
}
if(id) {
data.id = fetchdata.id;
PublicApi.postOrderRequisitionFormUpdate(data).then(res => {
if (res.code === 1000) {
history.goBack()
}
})
} else {
PublicApi.postOrderRequisitionFormAdd(data).then(res => {
if (res.code === 1000) {
history.goBack()
}
})
}
}
}
useEffect(() => {
if (id) {
new Promise(resolve => {
PublicApi.getOrderRequisitionFormDetails({ id, current: '1', pageSize: '10' }).then(res => {
if (res.code === 1000) {
resolve(res.data)
}
})
}).then((res:any) => {
// let obj: any = {}
// for (let key in fetchdata) {
// for (let keys in res) {
// if (key === keys) {
// obj = {
// ...obj, ...{
// [keys]: res[keys]
// }
// }
// }
// }
// }
setfetchdata(res)
})
}
}
/**获取商品的属性 */
const getAttribute = (data:any) => {
console.log(data, 10086)
}
}, [id])
return (
<PageHeaderWrapper
onBack={() => history.goBack()}
......@@ -57,7 +99,6 @@ const AddDemandOrder: React.FC<{}> = () => {
<TabPane forceRender tab='添加商品' key='2'>
<AddGoods
set={fetchdata}
get={getAttribute}
currentRef={goods}
/>
</TabPane>
......
src/pages/transaction/enquirySubmit/toAddSubmit/index.tsx
View file @ 68a7b01c
......@@ -158,7 +158,7 @@ const List: React.FC<{}> = () => {
}, [])
const toEdit = (id: number | string) => {
history.push(`/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/edit?id=${id}`)
history.push(`/memberCenter/tranactionAbility/enquirySubmit/addDemandOrder/edit?id=${id}`)
}
/**
* @description: 删除
......@@ -223,7 +223,7 @@ const List: React.FC<{}> = () => {
const controllerBtns = <Row>
<Col span={24}>
<Space direction="horizontal" size={16}>
<Button type="primary" onClick={() => history.push('/memberCenter/tranactionAbility/enquirySubmit/toAddSubmitList/add')} icon={<PlusOutlined />}>新建</Button>
<Button type="primary" onClick={() => history.push('/memberCenter/tranactionAbility/enquirySubmit/addDemandOrder/add')} icon={<PlusOutlined />}>新建</Button>
<Button onClick={() => handleSubmitAll(selectedRowKeys)}>批量提交审核</Button>
<Dropdown.Button
overlay={menu}
......@@ -238,28 +238,28 @@ const List: React.FC<{}> = () => {
const [externalState, setExternalState] = useState<any>([]);
const [interiorState, setInteriorState] = useState<any>([]);
useEffect(() => {
const external = new Promise(resolve => {
//查询需求单外部状态枚举列表
PublicApi.getOrderRequisitionFormExternalStateEnum().then((res: any) => {
if (res.code === 1000) {
resolve(res.data)
}
})
})
const interior = new Promise(resolve => {
// 查询需求单内部状态枚举列表
PublicApi.getOrderRequisitionFormInteriorStateEnum().then((res: any) => {
if (res.code === 1000) {
resolve(res.data)
}
})
})
Promise.all([external, interior]).then(res => {
setExternalState(res[0])
setInteriorState(res[1])
})
}, [])
// useEffect(() => {
// const external = new Promise(resolve => {
// //查询需求单外部状态枚举列表
// PublicApi.getOrderRequisitionFormExternalStateEnum().then((res: any) => {
// if (res.code === 1000) {
// resolve(res.data)
// }
// })
// })
// const interior = new Promise(resolve => {
// // 查询需求单内部状态枚举列表
// PublicApi.getOrderRequisitionFormInteriorStateEnum().then((res: any) => {
// if (res.code === 1000) {
// resolve(res.data)
// }
// })
// })
// Promise.all([external, interior]).then(res => {
// setExternalState(res[0])
// setInteriorState(res[1])
// })
// }, [])
return (
<PageHeaderWrapper>
......
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