Commit a90b5218 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

🐞fix: 修改支付策略bug

parent a0b913b6
......@@ -178,6 +178,7 @@ const AddLogistics: React.FC<{}> = () => {
}
})
}).then(res => {
console.log(res, 10078)
setListShipperAddress(res)
}).catch(error => console.log(error));
switch (Number(createType)) {
......@@ -363,6 +364,9 @@ const AddLogistics: React.FC<{}> = () => {
const obj = { ...query };
obj.shipperAddressId = option.value;
obj.shipperFullAddress = option.children;
obj.shipperName = option.shipperName
obj.shipperPhone = option.shipperPhone
setQuery(obj)
}
......@@ -509,12 +513,17 @@ const AddLogistics: React.FC<{}> = () => {
const selectRow = shippingRowCtl.selectRow[0]
data.shipmentOrderId = selectRow.id
data.shipmentOrderCode = selectRow.invoicesNo;//发货单号
data.receiverMemberName = selectRow.memberName;
data.receiverPhone = selectRow.phone;
data.receiverName = selectRow.receiverName;//收货方名称
data.receiverFullAddress = selectRow.fullAddress;
data.receiverMemberName = selectRow.memberName;
data.relevanceOrderId = selectRow.relevanceInvoicesId
data.relevanceOrderCode = selectRow.relevanceInvoicesNo
form.setFieldsValue({
shipmentOrderCode: selectRow.invoicesNo
shipmentOrderCode: selectRow.relevanceInvoicesId,
relevanceOrderCode: selectRow.relevanceInvoicesId
})
setQuery({ ...data })
setId(selectRow.id)
......@@ -535,6 +544,7 @@ const AddLogistics: React.FC<{}> = () => {
}
data.relevanceOrderId = selectRow.applyId
data.relevanceOrderCode = selectRow.applyNo
form.setFieldsValue({
relevanceOrderCode: selectRow.applyNo
})
......@@ -560,7 +570,12 @@ const AddLogistics: React.FC<{}> = () => {
}
data.relevanceOrderId = selectRow.id
data.relevanceOrderCode = selectRow.orderNo
data.shipmentOrderId = ''
data.shipmentOrderCode = '';//发货单号
form.setFieldsValue({
shipmentOrderCode: undefined,
relevanceOrderCode: selectRow.orderNo
})
setQuery({ ...data });
......@@ -755,10 +770,10 @@ const AddLogistics: React.FC<{}> = () => {
<div>{query.receiverFullAddress}</div>
</Form.Item>
<Form.Item label="发货地址" name="shipperAddressId" rules={[{ required: true, message: '请选择发货地址' }]}>
<Select allowClear onChange={(value, option) => handleSelectAddress(option)}>
<Select allowClear onChange={(value, option) => handleSelectAddress(option )}>
{
listShipperAddress.map((item: any, idx: number) => (
<Option key={item.id} value={item.id}>{item.fullAddress}</Option>
<Option key={item.id} value={item.id} shipperName={item.shipperName} shipperPhone={item.phone}>{item.fullAddress}</Option>
))
}
</Select>
......
......@@ -241,12 +241,13 @@ const detailInfo: React.FC<{}> = () => {
// 输入报价价格
const inputOnchange = (e: any) => {
console.log(e.target.value)
const value = e.target.value;
setfreightPrice(value);
}
const handleAudit = () => {
if(freightPrice) {
if (freightPrice) {
setvisible(true)
} else {
message.error('请输入运费')
......
......@@ -44,13 +44,14 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
key: 'options',
dataIndex: 'options',
render: (text: any, record: any, index: number) => <>
<Button type='link' onClick={() => { setedit(record); setmodalvisible(true); setModifyIndex(index); setmodify(true) }}>编辑</Button>
<Button type='link' onClick={() => { setedit(record); setmodalvisible(true); setModifyIndex(index); setmodify(true); setType(id) }}>编辑</Button>
<Button type='link' onClick={() => onDel(record.type, index)}>删除</Button>
</>
}
]
const handleOk = (value: any, idx: number) => {
console.log(value, type)
let idType = null;
switch (type) {
case 1:
......
......@@ -25,7 +25,6 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
const handleOk = () => {
form.validateFields().then(res => {
console.log(type)
let idType = null;
switch (type) {
case 1:
......@@ -59,7 +58,6 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
useEffect(() => {
if (Object.keys(edit).length > 0) {
console.log(edit, 10086)
form.setFieldsValue({
code: edit.payWayCodeTypeEnum,
value: edit.value,
......
......@@ -56,7 +56,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
}
const onGet = (value: any, type: number, idx: number) => {
console.log(value, type)
const data = [...payItem];
if (type === 2) {
data[idx].payParametersList = [...data[idx].payParametersList, value]
......@@ -81,7 +80,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
}
/**编辑 */
const onEdit = (value: any, type: number, index: number, idx: number) => {
console.log(value, type, index, idx)
const data = [...payItem];
if (type === 2) {
data[idx].payParametersList[index] = { ...value };
......@@ -90,7 +88,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
data[idx].payParametersAddListRequests[index] = { ...value };
data[idx].payParametersAddListRequests = [...data[idx].payParametersAddListRequests]
}
console.log(data, 10086)
setPayItem(data);
}
......
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