Commit 65007226 authored by Bill's avatar Bill

fix: 加工以及消息bug

parent 7f6b7e88
...@@ -13,7 +13,7 @@ export const columns: ColumnsType<any> = [ ...@@ -13,7 +13,7 @@ export const columns: ColumnsType<any> = [
render: (text, record) => { render: (text, record) => {
// orderId, orderDetailId // orderId, orderDetailId
return ( return (
<EyePreview url={`/memberCenter/tranactionAbility/saleOrder/orderList/preview?id=${record.orderId}`}> <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderList/preview?id=${record.orderId}`}>
{text} {text}
</EyePreview> </EyePreview>
) )
......
...@@ -28,6 +28,7 @@ import { ...@@ -28,6 +28,7 @@ import {
CONFIRM_PENDING_FIRST_DETAIL, CONFIRM_PENDING_FIRST_DETAIL,
CONFIRM_PENDING_SECOND_DETAIL, CONFIRM_PENDING_SECOND_DETAIL,
CONFIRM_PENDING_CONFIRM_DETAIL, CONFIRM_PENDING_CONFIRM_DETAIL,
PROCESSING_INVOICE_TO_BE_ADD_PATH,
PENDING_ADD_LOGISTICS_PATH, PENDING_ADD_LOGISTICS_PATH,
PENDING_DELIVERD_PATH, PENDING_DELIVERD_PATH,
PENDING_RECEIPT_PATH, PENDING_RECEIPT_PATH,
...@@ -49,6 +50,7 @@ const SERVICE_MAP = { ...@@ -49,6 +50,7 @@ const SERVICE_MAP = {
[`${PENDING_ADD_PROCESS_PATH}/detail`]: PublicApi.getEnhanceSupplierToBeAddStorageDetails, [`${PENDING_ADD_PROCESS_PATH}/detail`]: PublicApi.getEnhanceSupplierToBeAddStorageDetails,
[`${ASSIGN_PENDING_RECEIVE_DETAIL}`]: PublicApi.getEnhanceSupplierToBeReceiveDetails, [`${ASSIGN_PENDING_RECEIVE_DETAIL}`]: PublicApi.getEnhanceSupplierToBeReceiveDetails,
[`${CONFIRM_QUERY_DETAIL}`]: PublicApi.getEnhanceProcessAllDetails, [`${CONFIRM_QUERY_DETAIL}`]: PublicApi.getEnhanceProcessAllDetails,
[`${PROCESSING_INVOICE_TO_BE_ADD_PATH}/detail`]: PublicApi.getEnhanceProcessToBeAddDeliveryDetails,
[`${CONFIRM_PENDING_SUBMIT_DETAIL}`]: PublicApi.getEnhanceProcessToBeSubmitExamDetails, [`${CONFIRM_PENDING_SUBMIT_DETAIL}`]: PublicApi.getEnhanceProcessToBeSubmitExamDetails,
[`${CONFIRM_PENDING_FIRST_DETAIL}`]: PublicApi.getEnhanceProcessToBeFirstExamDetails, [`${CONFIRM_PENDING_FIRST_DETAIL}`]: PublicApi.getEnhanceProcessToBeFirstExamDetails,
[`${CONFIRM_PENDING_SECOND_DETAIL}`]: PublicApi.getEnhanceProcessToBeSecondExamDetails, [`${CONFIRM_PENDING_SECOND_DETAIL}`]: PublicApi.getEnhanceProcessToBeSecondExamDetails,
......
...@@ -251,7 +251,7 @@ const processStock: React.FC<{}> = () => { ...@@ -251,7 +251,7 @@ const processStock: React.FC<{}> = () => {
let searchData = { let searchData = {
...rest, ...rest,
startTime: st, startTime: st,
endTtime: et, endTime: et,
...others ...others
} }
console.log(searchData) console.log(searchData)
......
...@@ -105,7 +105,7 @@ export const schema = { ...@@ -105,7 +105,7 @@ export const schema = {
} }
} }
}, },
supplyMembersName: { membersName: {
type: 'string', type: 'string',
'x-component': 'Input', 'x-component': 'Input',
'x-component-props': { 'x-component-props': {
......
...@@ -138,7 +138,9 @@ const Query: React.FC<{}> = (props) => { ...@@ -138,7 +138,9 @@ const Query: React.FC<{}> = (props) => {
render: (text, record: any) => { render: (text, record: any) => {
const url = pathname + '/detail'; const url = pathname + '/detail';
const actionMap = { const actionMap = {
[ASSIGN_TO_BE_ADD_QUERY]:record.outerStatus === 1 && record.innerStatus === 1 ? (<Spin spinning={submitLoadingID === record.id}><a onClick={() => handleUpdateOrDelete('review', {id: record.id})}>{"提交审核"}</a></Spin>) : null, [ASSIGN_TO_BE_ADD_QUERY]: record.outerStatus === 1 && record.innerStatus === 1 ?
(<Spin spinning={submitLoadingID === record.id}><a onClick={() => handleUpdateOrDelete('review', {id: record.id})}>{"提交审核"}</a></Spin>)
: null,
[ASSIGN_PENDING_FIRST]: <Link to={`${url}?id=${record.id}`}>审核</Link>, [ASSIGN_PENDING_FIRST]: <Link to={`${url}?id=${record.id}`}>审核</Link>,
[ASSIGN_PENDING_SECOND]: <Link to={`${url}?id=${record.id}`}>审核</Link>, [ASSIGN_PENDING_SECOND]: <Link to={`${url}?id=${record.id}`}>审核</Link>,
[ASSIGN_PENDING_SUBMIT]: (<Spin spinning={submitLoadingID === record.id}><a onClick={() => handleUpdateOrDelete('review', {id: record.id})}>{"提交通知单"}</a></Spin>), [ASSIGN_PENDING_SUBMIT]: (<Spin spinning={submitLoadingID === record.id}><a onClick={() => handleUpdateOrDelete('review', {id: record.id})}>{"提交通知单"}</a></Spin>),
......
...@@ -18,7 +18,7 @@ export const querySchema: ISchema = { ...@@ -18,7 +18,7 @@ export const querySchema: ISchema = {
type: 'string', type: 'string',
'x-component': 'Search', 'x-component': 'Search',
'x-component-props': { 'x-component-props': {
placeholder: '搜索', placeholder: '搜索通知单号',
align: 'flex-left', align: 'flex-left',
tip: '输入通知单号进行搜索', tip: '输入通知单号进行搜索',
}, },
...@@ -112,7 +112,7 @@ export const tobeAddQuerySchema: ISchema = { ...@@ -112,7 +112,7 @@ export const tobeAddQuerySchema: ISchema = {
type: 'string', type: 'string',
'x-component': 'Search', 'x-component': 'Search',
'x-component-props': { 'x-component-props': {
placeholder: '搜索', placeholder: '搜索通知单号',
}, },
}, },
}, },
...@@ -206,7 +206,7 @@ export const pendingFirstQuerySchema: ISchema = { ...@@ -206,7 +206,7 @@ export const pendingFirstQuerySchema: ISchema = {
type: 'string', type: 'string',
'x-component': 'Search', 'x-component': 'Search',
'x-component-props': { 'x-component-props': {
placeholder: '搜索', placeholder: '搜索通知单号',
}, },
}, },
}, },
......
...@@ -13,11 +13,7 @@ const UploadFile = (props) => { ...@@ -13,11 +13,7 @@ const UploadFile = (props) => {
if (!isSizeLimit) { if (!isSizeLimit) {
message.error(`上传文件不超过${fileMaxSize}K!`); message.error(`上传文件不超过${fileMaxSize}K!`);
} }
const isPdf = file.type === 'application/pdf'; return isSizeLimit;
if (!isPdf) {
message.error('仅支持上传PDF文件!');
}
return isSizeLimit && isPdf;
} }
const uploadProps = { const uploadProps = {
......
...@@ -203,6 +203,7 @@ const Query: React.FC<{}> = (props) => { ...@@ -203,6 +203,7 @@ const Query: React.FC<{}> = (props) => {
*/ */
const handleSearch = useCallback((values: any) => { const handleSearch = useCallback((values: any) => {
const {docTime, ...rest} = values; const {docTime, ...rest} = values;
console.log(docTime);
const {st, et} = timeRange(docTime); const {st, et} = timeRange(docTime);
let searchData = { let searchData = {
...rest, ...rest,
......
...@@ -29,11 +29,11 @@ const AdvertisementContainer = () => { ...@@ -29,11 +29,11 @@ const AdvertisementContainer = () => {
}, []) }, [])
return ( return (
<Row gutter={[24, 0]}> <Row>
{ {
data.map((item, key) => { data.map((item, key) => {
return ( return (
<Col xxl={24} xl={8} lg={8} md={12} sm={24} xs={12} key={key}> <Col span={24} key={key}>
<AdvertisementSpace <AdvertisementSpace
urlLink={item.link} urlLink={item.link}
imageUrl={item.imageUrl} imageUrl={item.imageUrl}
...@@ -49,7 +49,7 @@ const AdvertisementContainer = () => { ...@@ -49,7 +49,7 @@ const AdvertisementContainer = () => {
const AdvertisementSpace: React.FC<Iprops> = (props) => { const AdvertisementSpace: React.FC<Iprops> = (props) => {
return ( return (
<div className={styles.advertisementSpace}> <div className={styles.advertisementSpace}>
<a href={props.urlLink}> <a href={props.urlLink} target="__blank">
<img src={props.imageUrl} className={styles.img} /> <img src={props.imageUrl} className={styles.img} />
</a> </a>
</div> </div>
......
...@@ -38,7 +38,7 @@ const Message: React.FC<{}> = () => { ...@@ -38,7 +38,7 @@ const Message: React.FC<{}> = () => {
} }
const handleRead = (id, url: string) => { const handleRead = (id, url: string) => {
PublicApi.postReportMessageMemberRead({id: id}) PublicApi.postReportMessageMemberRead({id: id}, {ctlType: 'none'})
.then((data) => { .then((data) => {
if(url) { if(url) {
if(/http/.test(url)) { if(/http/.test(url)) {
......
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