diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index cb5563c..b5b03ba 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -11,7 +11,7 @@
单据日期:
{{ baseDataForm.inventoryDate }}
-
+
关联补货申请:
{{ baseDataForm.linkCode }}
@@ -53,14 +53,14 @@
:disabled="disabled"
/>
-->
-
+
@@ -81,7 +81,6 @@
border
:loading="loading"
show-overflow
- show-footer
max-height="410"
:edit-config="{
trigger: 'click',
@@ -98,9 +97,12 @@
:column-config="{ resizable: true }"
:row-config="{ isHover: true }"
:resizable-config="{ dragMode: 'fixed' }"
+ :checkbox-config="{ highlight: true, range: true }"
:data="vxeTableData"
:edit-rules="validRules"
+ show-footer
:footer-data="footerData"
+ :merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 6 }]"
@checkbox-all=""
@checkbox-change=""
size="mini"
@@ -189,6 +191,9 @@
@change="updateFootEvent"
/>
+
+ {{ footerData[0].totalAmount }} 元
+
@@ -207,7 +212,7 @@
保存
-
@@ -263,7 +268,6 @@ const baseDataForm = reactive({
id: "",
inventoryCode: "",
inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
- handlerUserId: "",
supplierId: "",
remark: "",
inventoryType: "3",
@@ -374,17 +378,8 @@ const getSelectedRows = (selectionRows: any) => {
isNew: true,
}
})
- // 仅添加新勾选的项
vxeTableData.value.push(...addedItems)
- // 筛选取消勾选的项
- // const removedItems = vxeTableData.value.filter(
- // (item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
- // )
- // 仅移除取消勾选的项
- // vxeTableData.value = vxeTableData.value.filter(
- // (item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
- // )
updateFootCount(vxeTableData.value)
console.log("vxeTableData.value", vxeTableData.value)
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
index b65b162..86328be 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
@@ -15,9 +15,9 @@
value-format="YYYY-MM-DD"
/>
-
+
查询
重置
@@ -65,7 +65,7 @@
-
+
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
index 485baa8..15e9cb2 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue
@@ -283,17 +283,8 @@ const getSelectedRows = (selectionRows: any) => {
// if (index !== -1) return vxeTableDataMemo.value[index]
return { ...addItem, unitId: addItem.erpUnitVos[0].id, quantity: 1, isNew: true }
})
- // 仅添加新勾选的项
vxeTableData.value.push(...addedItems)
- // 筛选取消勾选的项
- // const removedItems = vxeTableData.value.filter(
- // (item: any) => !selectionRows.some((selectedItem: any) => selectedItem.erpSpuId === item.erpSpuId),
- // )
- // 仅移除取消勾选的项
- // vxeTableData.value = vxeTableData.value.filter(
- // (item: any) => !removedItems.some((removeItem: any) => removeItem.erpSpuId === item.erpSpuId),
- // )
console.log("vxeTableData.value", vxeTableData.value)
}
diff --git a/src/views/supermarketerp/supermarketUtils.ts b/src/views/supermarketerp/supermarketUtils.ts
index 88adbe1..6b0bca7 100644
--- a/src/views/supermarketerp/supermarketUtils.ts
+++ b/src/views/supermarketerp/supermarketUtils.ts
@@ -14,19 +14,13 @@ function chunk(array: T[], size: number): T[][] {
}
// 表格分页 + 表单信息 打印
-export const tablePrint = (
- editableTableRef: any,
- baseDataInfoRef: any,
- editableTableData: any,
- tableChunkSize: number = 20,
- printTitle: string = "",
-) => {
- const $table = editableTableRef
- const formPrintHtml = baseDataInfoRef ? baseDataInfoRef.innerHTML : ""
+export const tablePrint = (vxeTableRef: any, baseInfoRef: any, vxeTableData: any, tableChunkSize: number = 20, printTitle: string = "") => {
+ const $table = vxeTableRef
+ const formPrintHtml = baseInfoRef ? baseInfoRef.innerHTML : ""
if ($table && formPrintHtml) {
// 分割每页20条
Promise.all(
- chunk(editableTableData, tableChunkSize).map((pageData: any, index: number) => {
+ chunk(vxeTableData, tableChunkSize).map((pageData: any, index: number) => {
return $table
.getPrintHtml({
data: pageData,