diff --git a/src/api/supermarketerp/common.ts b/src/api/supermarketerp/common.ts
index aa14def..0591f93 100644
--- a/src/api/supermarketerp/common.ts
+++ b/src/api/supermarketerp/common.ts
@@ -31,6 +31,24 @@ export function getErpSpuSimpleAll() {
})
}
+// 采购申请单分页查询
+export function getCgsqPage(query?: Object) {
+ return request({
+ url: "/supermarket/smErpCgDd/cgsq/page",
+ method: "get",
+ params: query,
+ })
+}
+
+// 采购订单分页查询
+export function getCgddPage(params?: Object) {
+ return request({
+ url: "/supermarket/smErpInventoryRecords/cgdd/page",
+ method: "get",
+ params,
+ })
+}
+
// 获取出入库订单列表
export function getCgInventoryPage(params?: Object) {
return request({
diff --git a/src/api/supermarketerp/report.ts b/src/api/supermarketerp/report.ts
index 79a7d8e..b287795 100644
--- a/src/api/supermarketerp/report.ts
+++ b/src/api/supermarketerp/report.ts
@@ -8,3 +8,12 @@ export function getInventoryPage(params?: object) {
params,
})
}
+
+// 分页获取出入库汇总 orderType: 1入库 2出库
+export function getInventoryPageSum(params?: object) {
+ return request({
+ url: "/supermarket/smErpInventoryRecords/inventoryTypeSum/page",
+ method: "get",
+ params,
+ })
+}
diff --git a/src/api/supermarketerp/smErpCgBack.ts b/src/api/supermarketerp/smErpCgBack.ts
deleted file mode 100644
index 06d448b..0000000
--- a/src/api/supermarketerp/smErpCgBack.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import request from "/@/utils/request"
-
-export function fetchList(query?: Object) {
- return request({
- url: "/supermarket/smErpCgBack/page",
- method: "get",
- params: query,
- })
-}
-
-export function addObj(obj?: Object) {
- return request({
- url: "/supermarket/smErpCgBack",
- method: "post",
- data: obj,
- })
-}
-
-export function getObj(id?: string) {
- return request({
- url: "/supermarket/smErpCgBack/" + id,
- method: "get",
- })
-}
-
-export function delObjs(ids?: Object) {
- return request({
- url: "/supermarket/smErpCgBack",
- method: "delete",
- data: ids,
- })
-}
-
-export function putObj(obj?: Object) {
- return request({
- url: "/supermarket/smErpCgBack",
- method: "put",
- data: obj,
- })
-}
diff --git a/src/api/supermarketerp/smErpCgDd.ts b/src/api/supermarketerp/smErpCgDd.ts
index 7ea5c4f..480f205 100644
--- a/src/api/supermarketerp/smErpCgDd.ts
+++ b/src/api/supermarketerp/smErpCgDd.ts
@@ -38,12 +38,3 @@ export function putObj(obj?: Object) {
data: obj,
})
}
-
-// 采购申请单分页查询
-export function getCgsqPage(query?: Object) {
- return request({
- url: "/supermarket/smErpCgDd/cgsq/page",
- method: "get",
- params: query,
- })
-}
diff --git a/src/api/supermarketerp/smErpCgInventory.ts b/src/api/supermarketerp/smErpInventoryRecords.ts
similarity index 82%
rename from src/api/supermarketerp/smErpCgInventory.ts
rename to src/api/supermarketerp/smErpInventoryRecords.ts
index f1657a9..0b1a17c 100644
--- a/src/api/supermarketerp/smErpCgInventory.ts
+++ b/src/api/supermarketerp/smErpInventoryRecords.ts
@@ -38,11 +38,3 @@ export function putObj(obj?: Object) {
data: obj,
})
}
-
-export function getCgddPage(params?: Object) {
- return request({
- url: "/supermarket/smErpInventoryRecords/cgdd/page",
- method: "get",
- params,
- })
-}
diff --git a/src/api/wallet/wallet-type.ts b/src/api/wallet/wallet-type.ts
index e96fd1b..37e1b1a 100644
--- a/src/api/wallet/wallet-type.ts
+++ b/src/api/wallet/wallet-type.ts
@@ -1,41 +1,49 @@
import request from "/@/utils/request"
export function fetchList(query?: Object) {
- return request({
- url: '/wallet/walletType/page',
- method: 'get',
- params: query
- })
+ return request({
+ url: "/wallet/walletType/page",
+ method: "get",
+ params: query,
+ })
+}
+
+// 获取钱包类型下拉列表
+export function getWalletTypeSimple(query?: Object) {
+ return request({
+ url: "/wallet/walletType/list",
+ method: "get",
+ params: query,
+ })
}
export function addObj(obj?: Object) {
- return request({
- url: '/wallet/walletType',
- method: 'post',
- data: obj
- })
+ return request({
+ url: "/wallet/walletType",
+ method: "post",
+ data: obj,
+ })
}
export function getObj(id?: string) {
- return request({
- url: '/wallet/walletType/' + id,
- method: 'get'
- })
+ return request({
+ url: "/wallet/walletType/" + id,
+ method: "get",
+ })
}
export function delObjs(ids?: Object) {
- return request({
- url: '/wallet/walletType',
- method: 'delete',
- data: ids
- })
+ return request({
+ url: "/wallet/walletType",
+ method: "delete",
+ data: ids,
+ })
}
export function putObj(obj?: Object) {
- return request({
- url: '/wallet/walletType',
- method: 'put',
- data: obj
- })
+ return request({
+ url: "/wallet/walletType",
+ method: "put",
+ data: obj,
+ })
}
-
diff --git a/src/components/DraggableDepTree/index.vue b/src/components/DraggableDepTree/index.vue
index 6259ff7..3c56300 100644
--- a/src/components/DraggableDepTree/index.vue
+++ b/src/components/DraggableDepTree/index.vue
@@ -50,7 +50,16 @@
show-checkbox
@node-click="handleNodeClick"
@check="handleCheck"
- />
+ >
+
+
+
+ {{ node.label }}
+
+
+
+
+
@@ -115,6 +124,7 @@ const props = withDefaults(
label: "name",
children: "children",
value: "id",
+ disabled: "isLock",
}
},
nodeClickable: true,
diff --git a/src/components/Select/SelectWalletType.vue b/src/components/Select/SelectWalletType.vue
index c3b194d..3fa1119 100644
--- a/src/components/Select/SelectWalletType.vue
+++ b/src/components/Select/SelectWalletType.vue
@@ -26,8 +26,8 @@
diff --git a/src/views/supermarketerp/report/deliverySummary/index.vue b/src/views/supermarketerp/report/deliverySummary/index.vue
new file mode 100644
index 0000000..8534fa5
--- /dev/null
+++ b/src/views/supermarketerp/report/deliverySummary/index.vue
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -88,11 +83,11 @@ const state: BasicTableProps = reactive({
const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
// 清空搜索条件
-// const resetQuery = () => {
-// // 清空搜索条件
-// queryRef.value?.resetFields()
-// getDataList()
-// }
+const resetQuery = () => {
+ // 清空搜索条件
+ queryRef.value?.resetFields()
+ getDataList()
+}
// 多选事件
const selectionChangHandle = (objs: { id: string }[]) => {
diff --git a/src/views/supermarketerp/report/warehousingSummary/index.vue b/src/views/supermarketerp/report/warehousingSummary/index.vue
new file mode 100644
index 0000000..b97738f
--- /dev/null
+++ b/src/views/supermarketerp/report/warehousingSummary/index.vue
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+