From 8832c1f157c81b2c96f7df0f0cca8e88cfa492da Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 23 May 2025 11:04:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E5=A4=96=E6=9D=A5=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E3=80=81=E8=B7=A8=E5=8D=95=E4=B8=BA=E4=BF=AE=E6=94=B9=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wallet/wallet-foreign/index.vue | 36 +++++++++++---- src/views/wallet/wallet-stride/index.vue | 54 ++++++++++++++++------- 2 files changed, 65 insertions(+), 25 deletions(-) diff --git a/src/views/wallet/wallet-foreign/index.vue b/src/views/wallet/wallet-foreign/index.vue index c298913..0bb46ec 100644 --- a/src/views/wallet/wallet-foreign/index.vue +++ b/src/views/wallet/wallet-foreign/index.vue @@ -50,7 +50,7 @@ - + @@ -93,6 +99,8 @@ import { fetchList, pageJoin, delObjs } from "/@/api/wallet/wallet-foreign" import { useMessage, useMessageBox } from "/@/hooks/message" import { useDict } from "/@/hooks/dict" +import ProcessDrawer from "/@/components/processDrawer/index.vue" + // 引入组件 const FormDialog = defineAsyncComponent(() => import("./form.vue")) const CodeUseTable = defineAsyncComponent(() => import("../components/code-use-table.vue")) @@ -101,6 +109,7 @@ const { check_status } = useDict("check_status") // 定义变量内容 const formDialogRef = ref() const codeUseTableRef = ref() +const processDrawerRef = ref() // 搜索变量 const queryRef = ref() const showSearch = ref(true) @@ -142,6 +151,17 @@ const selectionChangHandle = (objs: { id: string }[]) => { multiple.value = !objs.length } +// 审批提交事件 +const taskSubmitEvent = () => { + getDataList() +} + +// 点击开始处理 +const deal = (row: any) => { + if (!row.processId) return useMessage().warning("流程id不存在") + processDrawerRef.value.openProcessDrawer(row) +} + // 删除操作 const handleDelete = async (ids: string[]) => { try { diff --git a/src/views/wallet/wallet-stride/index.vue b/src/views/wallet/wallet-stride/index.vue index 6c5e1df..6d407bf 100644 --- a/src/views/wallet/wallet-stride/index.vue +++ b/src/views/wallet/wallet-stride/index.vue @@ -61,31 +61,37 @@ - + + @@ -95,6 +101,8 @@ import { fetchList, delObjs, pageJoin } from "/@/api/wallet/wallet-stride" import { useMessage, useMessageBox } from "/@/hooks/message" import { useDict } from "/@/hooks/dict" +import ProcessDrawer from "/@/components/processDrawer/index.vue" + const { push } = useRouter() // 引入组件 @@ -105,6 +113,7 @@ const { check_status, yes_no_type } = useDict("check_status", "yes_no_type") // 定义变量内容 const formDialogRef = ref() const codeUseTableRef = ref() +const processDrawerRef = ref() // 搜索变量 const queryRef = ref() const showSearch = ref(true) @@ -144,6 +153,17 @@ const selectionChangHandle = (objs: { id: string }[]) => { multiple.value = !objs.length } +// 审批提交事件 +const taskSubmitEvent = () => { + getDataList() +} + +// 点击开始处理 +const deal = (row: any) => { + if (!row.processId) return useMessage().warning("流程id不存在") + processDrawerRef.value.openProcessDrawer(row) +} + // 删除操作 const handleDelete = async (ids: string[]) => { try { From 7fb8187256771d8229c42d30242267765bf41aa3 Mon Sep 17 00:00:00 2001 From: weiwei Date: Fri, 23 May 2025 12:27:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canteen/canteenErpMaterial/index.vue | 53 +++++++++++-------- .../canteen/canteenInventoryRecords/form.vue | 1 + .../canteen/canteenInventoryRecords/index.vue | 25 ++++++++- .../purchaseManagement/smErpCgBack/form.vue | 2 + .../purchaseManagement/smErpCgDd/form.vue | 2 + .../smErpCgInventory/form.vue | 2 + .../purchaseManagement/smErpCgPlan/form.vue | 1 + .../retailManagement/smErpRetailBack/form.vue | 2 + .../smErpRetailDelivery/form.vue | 2 + 9 files changed, 68 insertions(+), 22 deletions(-) diff --git a/src/views/canteen/canteenErpMaterial/index.vue b/src/views/canteen/canteenErpMaterial/index.vue index 85a9201..5b8ea6f 100644 --- a/src/views/canteen/canteenErpMaterial/index.vue +++ b/src/views/canteen/canteenErpMaterial/index.vue @@ -39,26 +39,38 @@ :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle" - @sort-change="sortChangeHandle"> - - - - - - - - - - - - - - - + @sort-change="sortChangeHandle" + > + + + + + + + + + + + + + + + + + @@ -73,7 +85,6 @@ import { displayPrice } from "/@/utils/formatMoney" // 引入组件 const FormDialog = defineAsyncComponent(() => import("./form.vue")) -// 定义查询字典 // 定义变量内容 const formDialogRef = ref() diff --git a/src/views/canteen/canteenInventoryRecords/form.vue b/src/views/canteen/canteenInventoryRecords/form.vue index 45ee28b..69184d6 100644 --- a/src/views/canteen/canteenInventoryRecords/form.vue +++ b/src/views/canteen/canteenInventoryRecords/form.vue @@ -250,6 +250,7 @@ const tableFormItems = () => totalAmount: storePrice((Number(item.quantity || 0) * Number(item.realPrice || 0)).toFixed(2)), stock: item.stock, remark: item.remark, + orderType: baseForm.orderType, })) // 提交数据 成功返回 true 失败返回 false diff --git a/src/views/canteen/canteenInventoryRecords/index.vue b/src/views/canteen/canteenInventoryRecords/index.vue index 4bb325a..824693b 100644 --- a/src/views/canteen/canteenInventoryRecords/index.vue +++ b/src/views/canteen/canteenInventoryRecords/index.vue @@ -75,7 +75,9 @@ - + + + @@ -116,6 +118,8 @@ import { BasicTableProps, useTable } from "/@/hooks/table" import { fetchList, delObjs } from "/@/api/canteen/canteenInventoryRecords" import { useMessage, useMessageBox } from "/@/hooks/message" import { displayPrice } from "/@/utils/formatMoney" +import { canteenSupplierSelect } from "/@/api/canteen/canteenSupplier" +import { getSimpleUserAll } from "/@/api/admin/user" const CtForm = defineAsyncComponent(() => import("./form.vue")) @@ -130,6 +134,8 @@ const state: BasicTableProps = reactive({ }, pageList: fetchList, }) +const supplierSelect = ref([]) +// const handleUserSelect = ref([]) const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) @@ -169,4 +175,21 @@ const handleDelete = async (ids: string[]) => { useMessage().error(err.msg) } } + +onMounted(async () => { + // 获取经办人 + try { + const { data } = await canteenSupplierSelect() + supplierSelect.value = data ? data : [] + } catch (error) { + supplierSelect.value = [] + } + // 获取货商 + // try { + // const { data } = await getSimpleUserAll() + // handleUserSelect.value = data ?? [] + // } catch (error) { + // handleUserSelect.value = [] + // } +}) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue index 4f092ee..19f3fe0 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue @@ -389,6 +389,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: Number(unit?.purchasePrice || 0) * item.quantity, remark: item.remark, unitId: item.unitId, + orderType: baseDataForm.orderType, } } else { return { @@ -399,6 +400,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, + orderType: baseDataForm.orderType, } } }) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue index ad4c040..f473aee 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue @@ -394,6 +394,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: Number(unit?.purchasePrice || 0) * item.quantity, remark: item.remark, unitId: item.unitId, + orderType: baseDataForm.orderType, } } else { return { @@ -404,6 +405,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, + orderType: baseDataForm.orderType, } } }) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue index 4b1e110..325a250 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue @@ -420,6 +420,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: storePrice(Number(unitObj?.realPrice || 0) * item.quantity), remark: item.remark, unitId: unitObj.id, + orderType: baseDataForm.orderType, } } else { return { @@ -431,6 +432,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: item?.realPrice && item.quantity ? storePrice(Number(item.realPrice) * item.quantity) : 0, remark: item.remark, unitId: item.unitId, + orderType: baseDataForm.orderType, } } }) diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue index cb10af2..cee0aeb 100644 --- a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue +++ b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/form.vue @@ -314,6 +314,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: Number(unit?.purchasePrice || 0) * item.quantity, remark: item.remark, unitId: item.unitId, + orderType: baseDataForm.orderType, } }) }) diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue index 4b0b3a5..0f8577c 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue @@ -435,6 +435,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: unit?.purchasePrice && item.quantity ? Number(unit.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, + orderType: baseDataForm.orderType, } } else { return { @@ -445,6 +446,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, + orderType: baseDataForm.orderType, } } }) diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue index 7f008f1..364473f 100644 --- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue +++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue @@ -427,6 +427,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: unit?.purchasePrice && item.quantity ? Number(unit.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, + orderType: baseDataForm.orderType, } } else { return { @@ -437,6 +438,7 @@ const cgPlanSpuItems = computed(() => { totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0, remark: item.remark, unitId: item.unitId, + orderType: baseDataForm.orderType, } } }) From dfd92eec893989e3d12de20f7fab5a1862edd54c Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 23 May 2025 14:32:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E5=A4=96=E6=9D=A5=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E3=80=81=E8=B7=A8=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wallet/wallet-freeze/form.vue | 166 +++++++++++------------ src/views/wallet/wallet-freeze/index.vue | 24 +++- 2 files changed, 105 insertions(+), 85 deletions(-) diff --git a/src/views/wallet/wallet-freeze/form.vue b/src/views/wallet/wallet-freeze/form.vue index 888a34d..bdee61f 100644 --- a/src/views/wallet/wallet-freeze/form.vue +++ b/src/views/wallet/wallet-freeze/form.vue @@ -1,116 +1,116 @@ \ No newline at end of file + openDialog, +}) + diff --git a/src/views/wallet/wallet-freeze/index.vue b/src/views/wallet/wallet-freeze/index.vue index 5007182..9e724fd 100644 --- a/src/views/wallet/wallet-freeze/index.vue +++ b/src/views/wallet/wallet-freeze/index.vue @@ -69,7 +69,9 @@ @@ -88,6 +91,8 @@ + + @@ -96,6 +101,9 @@ import { BasicTableProps, useTable } from "/@/hooks/table" import { delObjs, pageJoin } from "/@/api/wallet/wallet-freeze" import { useMessage, useMessageBox } from "/@/hooks/message" import { useDict } from "/@/hooks/dict" + +import ProcessDrawer from "/@/components/processDrawer/index.vue" + const { push } = useRouter() // 引入组件 @@ -104,6 +112,7 @@ const FormDialog = defineAsyncComponent(() => import("./form.vue")) const { check_status, yes_no_type } = useDict("check_status", "yes_no_type") // 定义变量内容 const formDialogRef = ref() +const processDrawerRef = ref() // 搜索变量 const queryRef = ref() const showSearch = ref(true) @@ -143,6 +152,17 @@ const selectionChangHandle = (objs: { id: string }[]) => { multiple.value = !objs.length } +// 审批提交事件 +const taskSubmitEvent = () => { + getDataList() +} + +// 点击开始处理 +const deal = (row: any) => { + if (!row.processId) return useMessage().warning("流程id不存在") + processDrawerRef.value.openProcessDrawer(row) +} + // 删除操作 const handleDelete = async (ids: string[]) => { try {