Commit a0f494bf authored by 李腾's avatar 李腾

feat: 优化多物流发货交互

parent df6c07b0
...@@ -177,6 +177,7 @@ const UpdateStatusModal = (props, ref) => { ...@@ -177,6 +177,7 @@ const UpdateStatusModal = (props, ref) => {
const { companys } = props; const { companys } = props;
const formRef = useRef(); const formRef = useRef();
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
const [renderModal, setRenderModal] = useState(true);
const [confirmLoading, setConfirmLoading] = useState(false); const [confirmLoading, setConfirmLoading] = useState(false);
const [record, setRecord] = useState(); const [record, setRecord] = useState();
const [oldPackageList, setOldPackageList] = useState(); const [oldPackageList, setOldPackageList] = useState();
...@@ -208,6 +209,7 @@ const UpdateStatusModal = (props, ref) => { ...@@ -208,6 +209,7 @@ const UpdateStatusModal = (props, ref) => {
}; };
const open = (item, tableRef) => { const open = (item, tableRef) => {
setRenderModal(true);
setActionRef(tableRef); setActionRef(tableRef);
setVisible(true); setVisible(true);
setOldPackageList(JSON.parse(JSON.stringify(item.packageList))); setOldPackageList(JSON.parse(JSON.stringify(item.packageList)));
...@@ -216,23 +218,18 @@ const UpdateStatusModal = (props, ref) => { ...@@ -216,23 +218,18 @@ const UpdateStatusModal = (props, ref) => {
const onCancel = () => { const onCancel = () => {
formRef.current.form.resetFields(); formRef.current.form.resetFields();
setRecord(null);
setConfirmLoading(false); setConfirmLoading(false);
setVisible(false); setVisible(false);
setTimeout(() => {
setRenderModal(false);
setRecord(null);
}, 500);
}; };
const onOk = async () => { const onOk = async () => {
formRef.current.form.validateFields().then(async values => { formRef.current.form.validateFields().then(async values => {
const packageList = onFilterParams(values.packageList); const packageList = onFilterParams(values.packageList);
// oldPackageList.forEach((item, index) => {
// if (JSON.stringify(item) !== JSON.stringify(packageList[index])) {
// packageList[index].preExpressCompanyCode = item.expressCompanyCode;
// packageList[index].preExpressCompanyName = item.expressCompanyName;
// packageList[index].preExpressNo = item.expressNo;
// }
// });
// 对比修改差异 // 对比修改差异
oldPackageList.forEach((item, index) => { oldPackageList.forEach((item, index) => {
const updateAttr = () => { const updateAttr = () => {
...@@ -263,7 +260,9 @@ const UpdateStatusModal = (props, ref) => { ...@@ -263,7 +260,9 @@ const UpdateStatusModal = (props, ref) => {
packageList, packageList,
}; };
console.log('params', params); console.log('params', params);
setConfirmLoading(true);
const res = await apiDeliveriesAdd(params); const res = await apiDeliveriesAdd(params);
setConfirmLoading(false);
if (res.code === '0000' && res.businessCode === '0000') { if (res.code === '0000' && res.businessCode === '0000') {
notification.success({ notification.success({
message: '提交成功', message: '提交成功',
...@@ -287,7 +286,7 @@ const UpdateStatusModal = (props, ref) => { ...@@ -287,7 +286,7 @@ const UpdateStatusModal = (props, ref) => {
onOk, onOk,
}; };
return visible ? ( return renderModal ? (
<Modal {...modalProps}> <Modal {...modalProps}>
{record ? <FormWarpper ref={formRef} record={record} companys={companys} /> : ''} {record ? <FormWarpper ref={formRef} record={record} companys={companys} /> : ''}
</Modal> </Modal>
......
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