diff --git a/src/pages/pms/purchase/PurchaseRecord/api.ts b/src/pages/pms/purchase/PurchaseRecord/api.ts
index ccf6df2..99ab4ec 100644
--- a/src/pages/pms/purchase/PurchaseRecord/api.ts
+++ b/src/pages/pms/purchase/PurchaseRecord/api.ts
@@ -105,6 +105,7 @@ export interface ApplyParams{
payType?: string,
accountCheckPeriod?:number
parts?: any[]
+ isOutSide?: boolean
}
interface relationParams{
tradeCompanyId?: number,
@@ -158,6 +159,7 @@ export interface EditItem{
parts?:partItem[]
poolParts?: poolPart[]
planParts?: planePartItem[]
+ isOutSide?: boolean
}
interface poolPart{
id: string// 类型id(vin)
diff --git a/src/pages/pms/purchase/PurchaseRecord/comonents/AddPurchaseModal.tsx b/src/pages/pms/purchase/PurchaseRecord/comonents/AddPurchaseModal.tsx
index adbdaca..cc11fc2 100644
--- a/src/pages/pms/purchase/PurchaseRecord/comonents/AddPurchaseModal.tsx
+++ b/src/pages/pms/purchase/PurchaseRecord/comonents/AddPurchaseModal.tsx
@@ -57,7 +57,8 @@ export default function PartStorageModal({ onCancel, visible, itemData, setItemD
storageId: itemData.storageId,
supplierId: itemData.supplierId,
settlementMethod: itemData.payType,
- proportion: itemData.proportion
+ proportion: itemData.proportion,
+ isOutSide: itemData.isOutSide ? "1" : "0"
});
getrelationlist({tradeCompanyId: itemData.supplierId, compCategory: 1, dealerId: storages.find(i => i.id == itemData.storageId)?.dealerId}).then(res => {
if (res.success) {
@@ -98,8 +99,6 @@ export default function PartStorageModal({ onCancel, visible, itemData, setItemD
form.validateFields().then(fields => {
const supplier = suppliers.find(it => it.supplierId == fields.supplierId) || {};
const storage = storages.find(it => it.id == fields.storageId) || {};
-
- setBtnloading(true);
const params = {
storageId: storage.id,
storageName: storage.storageName,
@@ -111,8 +110,10 @@ export default function PartStorageModal({ onCancel, visible, itemData, setItemD
parts: [...selectedParts.map(i => ({partId: i.partId, partCnt: i.partCnt, price: i.price, type: 1})),
...planePart.map(i => ({poolId: i.poolId, partId: i.partId, partCnt: i.cnt, price: i.price, type: 2})),
...(casPart?.map(i => (i.details?.map(it => ({partId: it.partId, partCnt: it.partCnt, poolId: it.poolId, expectInTime: it.expectInTime, price: it.price, type: 3})))).flat() || [])
- ]
+ ],
+ isOutSide: !!fields.isOutSide
};
+ setBtnloading(true);
purchaseApply(params).then(res => {
message.success("提交成功");
setBtnloading(false);
@@ -189,8 +190,6 @@ export default function PartStorageModal({ onCancel, visible, itemData, setItemD
if (res.data?.length) {
form.setFieldsValue({ proportion: res.data[0].billAmountRatio, accountCheckPeriod: res.data && res.data[0].accountCheckPeriod});
setListRelation(res.data && res.data[0].settleMethodList);
- } else {
- message.error(`请财务先配置${suppliers.find(i => i.supplierId == form.getFieldValue('supplierId'))?.supplierName}的结算方式`);
}
}).catch(e => message.error(e.message));
}}
@@ -230,6 +229,15 @@ export default function PartStorageModal({ onCancel, visible, itemData, setItemD
-
+ -
+
+