Commit a9f11ed9 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

Merge branch 'dev' into test

parents 62985240 069a80d8
......@@ -193,7 +193,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
dataIndex: 'logisticsNo',
align: 'center',
key: 'logisticsNo',
render: text => <a href="">{text}</a>
render: text => <a href={`/memberCenter/logisticsAbility/logisticsSubmit/orderSubmitSearchList/detail?code=${data.orderNo}`}>{text}</a>
},
{
title: '物流公司',
......@@ -206,7 +206,7 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
dataIndex: 'storageNo',
align: 'center',
key: 'storageNo',
render: text => <a href="">{text}</a>
render: text => <a href={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?storageNo=${text}`}>{text}</a>
},
{
title: '入库时间',
......
......@@ -98,22 +98,22 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
processEnum === 24 && data &&
<Col span={12}>
<MellowCard title="发货信息" fullHeight>
<Row className={style['card-list']}>
{data.name && <Row className={style['card-list']}>
<Col span={6}><p>发货地址: </p></Col>
<Col><p>{data.name}</p></Col>
</Row>
<Row className={style['card-list']}>
</Row>}
{data?.deliverTime && <Row className={style['card-list']}>
<Col span={6}><p>发货时间: </p></Col>
<Col><p>{moment(data.deliverTime).format('YYYY-MM-DD')}</p></Col>
</Row>
<Row className={style['card-list']}>
<Col><p>{data?.deliverTime && moment(data.deliverTime).format('YYYY-MM-DD')}</p></Col>
</Row>}
{data.deliverNo && <Row className={style['card-list']}>
<Col span={6}><p>物流单号: </p></Col>
<Col><p><a href={`https://www.kuaidi100.com/chaxun?nu=${data.deliverNo}`} target="_blank">{data.deliverNo}</a></p></Col>
</Row>
<Row className={style['card-list']}>
</Row>}
{data.logisticsCompany && <Row className={style['card-list']}>
<Col span={6}><p>物流公司: </p></Col>
<Col><p>{data.logisticsCompany}</p></Col>
</Row>
</Row>}
</MellowCard>
</Col>
}
......
......@@ -42,11 +42,13 @@ const SimpleElectronModal:React.FC<SimpleElectronModalProps> = (props) => {
const res = await PublicApi.postOrderSignatureOrderSettleSign(contracts, { ctlType: "none" })
if(res.code === 1000) {
timer = setInterval(() => {
console.log(signatureState.current, 'signatureState')
if (signatureState.current !== 4) {
PublicApi.getOrderSignatureOrderSettleSignDetail({signatureLogId: res.data.signatureLogId + ''}).then(_res => {
if(_res.code === 1000) {
signatureState.current = _res.data.state
if(_res.data.state === 4) {
schemaAction.setFieldValue("electronicContractUrl", _res.data.contractUrl)
}
} else {
clearInterval(timer)
timer = null
......
......@@ -256,7 +256,8 @@ export const useInvoiceList = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
// 查询工作流获取电子合同
export const useElectronicContract = (ctx: ISchemaFormActions | ISchemaFormAsyncActions) => {
let params: any = {};
params['productId'] = ctx.getFieldValue('orderProductRequests')[0]['id']
// 商品数据有commodityId为手动下单 不存在为询价等下单
params['productId'] = ctx.getFieldValue('orderProductRequests')[0]['commodityId'] ? ctx.getFieldValue('orderProductRequests')[0]['id'] : ctx.getFieldValue('orderProductRequests')[0]['productId']
params['orderModelId'] = ctx.getFieldValue('orderModel')
params['memberId'] = ctx.getFieldValue('supplyMembersId')
params['memberRoleId'] = ctx.getFieldValue('supplyMembersRoleId')
......@@ -276,6 +277,7 @@ export const useElectronicContract = (ctx: ISchemaFormActions | ISchemaFormAsync
ctx.setFieldState("usingElectronicContracts", state => {
state.props["x-component-props"].contract = { contractTemplateId: data['electronicContractId'], ..._data, }
})
ctx.setFieldValue("electronicContractName", _data.contractName)
})
}
})
......
.orderCollectCard {
:global {
.ant-form-item-explain-error {
position: absolute;
top: 92%;
}
}
}
\ No newline at end of file
......@@ -189,7 +189,6 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
let processEnum = addSchemaAction.getFieldValue('processEnum')
let usingElectronicContracts = addSchemaAction.getFieldValue('usingElectronicContracts')
let signatureLogId = addSchemaAction.getFieldValue("signatureLogId")
console.log(processEnum, usingElectronicContracts, signatureLogId)
if(processEnum === 24 && usingElectronicContracts && !signatureLogId) {
contractRef.current.setVisible(true)
return ;
......
......@@ -425,6 +425,16 @@ const ortherInfo: ISchema = {
title: '合同签署记录id',
visible: false
},
electronicContractUrl: {
type: "string",
title: '合同URL',
visible: false
},
electronicContractName: {
type: "string",
title: '合同Name',
visible: false
},
}
}
}
......
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