diff --git a/src/api/warehouse_product_storege.ts b/src/api/warehouse_product_storege.ts index 3538f13df..32dc7854c 100644 --- a/src/api/warehouse_product_storege.ts +++ b/src/api/warehouse_product_storege.ts @@ -27,3 +27,15 @@ export function apiWarehouseProductStoregeDelete(params: any) { export function apiWarehouseProductStoregeDetail(params: any) { return request.get({ url: '/warehouse_product_storege/warehouseproductstorege/detail', params }) } + +/** + * 是否强制校验 + * @param params + * @returns + */ +export function apiWarehouseProductStoregeVerify(params: any) { + return request.post({ + url: '/warehouse_product_storege/warehouseproductstorege/verify', + params + }) +} diff --git a/src/views/order/beforehand_order/component/outbound.vue b/src/views/order/beforehand_order/component/outbound.vue index 0819f3671..2b95b62c1 100644 --- a/src/views/order/beforehand_order/component/outbound.vue +++ b/src/views/order/beforehand_order/component/outbound.vue @@ -108,7 +108,9 @@ @@ -219,19 +221,22 @@ const resetWarehouseData = ref({ const disableClick = ref(false) const oneClickStorage = () => { - disableClick.value = true - try { - apiBeforehandOrderCreateOutboundOrder(one_click_storage.value).then((res) => { - ElMessage.success('出库成功') - dialogBuyer.value = false - disableClick.value = false - getLists() - }) - } catch (error) { - setTimeout(() => { - disableClick.value = false - }, 2000) - } + disableClick.value = true + // try { + apiBeforehandOrderCreateOutboundOrder(one_click_storage.value).then((res) => { + ElMessage.success('出库成功') + dialogBuyer.value = false + disableClick.value = false + getLists() + }) + // } catch (error) { + // setTimeout(() => { + // disableClick.value = false + // }, 2000) + // } + setTimeout(() => { + disableClick.value = false + }, 4000) } const OclickDialogBuyer = () => { dialogBuyer.value = true diff --git a/src/views/warehouse/product_import.vue b/src/views/warehouse/product_import.vue index d0ad20961..998f6f76c 100644 --- a/src/views/warehouse/product_import.vue +++ b/src/views/warehouse/product_import.vue @@ -1,16 +1,29 @@ \ No newline at end of file +let resolves +let nodes +const flag = ref(false) +let name +const beforeFilter = (value) => { + name = value + flag.value = true + props.lazyLoad(nodes, resolves) + return false +} +const props = { + value: 'id', + label: 'name', + emitPath: false, + lazy: true, + lazyLoad(node, resolve) { + if (!resolves) resolves = resolve + if (!nodes) nodes = node + const pid = node.value || 0 + let data = {} + if (flag.value) { + data = { name: name } + if (!name) { + data = { + pid: pid, + page_size: 10000 + } + } + } else { + data = { + pid: pid, + page_size: 10000 + } + } + apiStoreCategoryLists({ + ...data + }).then((res) => { + resolve( + res.lists.map((item: any) => { + // item.leaf = item.is_children == 0; + item.leaf = true + flag.value = false + return item + }) + ) + }) + } +} +const verifyChange = (row: any) => { + apiWarehouseProductStoregeVerify({ + id: row.id, + is_verify: row.is_verify + }) +} +onMounted(() => { + getLists() +}) +