From eaecfe4730d1c785e8579bf56a59248a9e6784cf Mon Sep 17 00:00:00 2001 From: weiwei Date: Mon, 11 Aug 2025 10:32:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/supermarketerp/stockTaking.ts | 4 +-- src/views/supermarketerp/stockTaking/form.vue | 35 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/api/supermarketerp/stockTaking.ts b/src/api/supermarketerp/stockTaking.ts index b208261..d1830f4 100644 --- a/src/api/supermarketerp/stockTaking.ts +++ b/src/api/supermarketerp/stockTaking.ts @@ -12,8 +12,8 @@ export function addObj(data?: object) { // 库存盘点修改 export function putObj(data?: object) { return request({ - url: "/supermarket/smErpInventoryRecords/savePD", - method: "post", + url: "/supermarket/smErpInventoryRecords/updatePD", + method: "put", data, }) } diff --git a/src/views/supermarketerp/stockTaking/form.vue b/src/views/supermarketerp/stockTaking/form.vue index 80d7197..6233f15 100644 --- a/src/views/supermarketerp/stockTaking/form.vue +++ b/src/views/supermarketerp/stockTaking/form.vue @@ -95,7 +95,9 @@ @@ -144,17 +146,17 @@ {{ computeLoss(row) }} - + - + From 370b2f80abdf4b07e1a8a87a49f59969a066d416 Mon Sep 17 00:00:00 2001 From: weiwei Date: Mon, 11 Aug 2025 16:13:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E5=85=A5=E5=BA=93=E5=8D=95=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E8=A7=84=E6=A0=BC=EF=BC=9B=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E7=9A=84=E5=8D=95=E6=8D=AE=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supermarketerp/purchaseManagement/smErpCgDd/index.vue | 4 +++- .../purchaseManagement/smErpCgInventory/form.vue | 7 ++++++- .../purchaseManagement/smErpCgInventory/index.vue | 1 + .../purchaseManagement/smErpCgPlan/index.vue | 4 +++- src/views/supermarketerp/stockTaking/form.vue | 1 - 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue index d2bbfea..61a96cd 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue @@ -1,5 +1,7 @@ diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue index 19b9fbf..cc43d86 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue @@ -1,6 +1,6 @@ @@ -135,71 +101,29 @@ import { BasicTableProps, useTable } from "/@/hooks/table" import { fetchList, delObjs } from "/@/api/supermarketerp/smErpInventoryRecords" import { useMessage, useMessageBox } from "/@/hooks/message" -import { useDict } from "/@/hooks/dict" -import ProcessDrawer from "/@/components/processDrawer/index.vue" -import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction" +import { displayPrice } from "/@/utils/formatMoney" const SmForm = defineAsyncComponent(() => import("./form.vue")) -const { check_status } = useDict("check_status") -// 搜索变量 const queryRef = ref() const showSearch = ref(true) -// 多选变量 const selectObjs = ref([]) as any const multiple = ref(true) -const processFormState = reactive<{ formId: string | undefined; formDisabled: boolean; showForm: boolean }>({ - formId: undefined, - formDisabled: true, - showForm: false, -}) -const processDrawerRef = ref | null>(null) - const state: BasicTableProps = reactive({ queryForm: { inventoryType: "4", }, pageList: fetchList, }) +const showForm = ref(false) +const formDisabled = ref(false) +const formId = ref("") -// table hook -const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) - -// 清空搜索条件 -const resetQuery = () => { - // 清空搜索条件 - queryRef.value?.resetFields() - // 清空多选 - selectObjs.value = [] - getDataList() -} - -// 导出excel -const exportExcel = () => { - // downBlobFile("/supermarket/smErpInventoryRecords/export", Object.assign(state.queryForm, { ids: selectObjs }), "采购退货.xlsx") -} - -// 多选事件 -const selectionChangHandle = (objs: { id: string }[]) => { - selectObjs.value = objs.map(({ id }) => id) - multiple.value = !objs.length -} - -const { create, edit, close } = useSmProcessTableAction(processFormState) - -const formClose = () => { - close() - getDataList() -} - -// 点击开始处理 -const deal = (row: tableRow) => { - if (!row.processInstanceId) return useMessage().warning("流程id不存在") - processDrawerRef.value && processDrawerRef.value.openProcessDrawer(row) -} -// 审批提交事件 -const taskSubmitEvent = () => { - getDataList() +// 新增 +const create = () => { + formDisabled.value = false + formId.value = "" + showForm.value = true } // 删除操作 @@ -218,4 +142,41 @@ const handleDelete = async (ids: string[]) => { useMessage().error(err.msg) } } + +// 编辑 +const edit = (row: any) => { + if (!row.id) return useMessage().warning("清单id不存在") + formId.value = row.id + showForm.value = true +} + +// 表单关闭 +const formClose = () => { + showForm.value = false + formId.value = "" + formDisabled.value = false + getDataList() +} + +const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) + +// 清空搜索条件 +const resetQuery = () => { + // 清空搜索条件 + queryRef.value?.resetFields() + // 清空多选 + selectObjs.value = [] + getDataList() +} + +// 导出excel +const exportExcel = () => { + downBlobFile("/supermarket/smErpInventoryRecords/export", Object.assign(state.queryForm, { ids: selectObjs }), "采购退货.xlsx") +} + +// 多选事件 +const selectionChangHandle = (objs: { id: string }[]) => { + selectObjs.value = objs.map(({ id }) => id) + multiple.value = !objs.length +} diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue index 61a96cd..7ff0ed1 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue @@ -101,7 +101,6 @@ import { useMessage, useMessageBox } from "/@/hooks/message" import { useDict } from "/@/hooks/dict" import ProcessDrawer from "/@/components/processDrawer/index.vue" import { getSupplierSimpleAll } from "/@/api/supermarketerp/smErpSupplier" -import { tableRow, useSmProcessTableAction } from "/@/hooks/smProcessTableAction" const SmForm = defineAsyncComponent(() => import("./form.vue")) @@ -145,8 +144,6 @@ const selectionChangHandle = (objs: { id: string }[]) => { multiple.value = !objs.length } -const { create, edit, close } = useSmProcessTableAction(processFormState) - const formClose = () => { close() getDataList() diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue index 768bb37..586ab19 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue @@ -20,10 +20,6 @@ :isDisplayName="true" /> --> -
- 关联补货申请： - {{ baseDataForm.linkCode }} -
货商： @@ -131,9 +127,6 @@ :value="item" /> -