diff --git a/src/pages.json b/src/pages.json index 6bd75f4..0e44ac4 100644 --- a/src/pages.json +++ b/src/pages.json @@ -311,11 +311,29 @@ "navigationBarTitleText": "客户管理" } }, + { + "path": "stockCard", + "style": { + "navigationBarTitleText": "库存卡管理" + } + }, { "path": "components/addSupplier", "style": { "navigationBarTitleText": "新增供应商" } + }, + { + "path": "components/addCustomer", + "style": { + "navigationBarTitleText": "新增客户" + } + }, + { + "path": "components/addStockCard", + "style": { + "navigationBarTitleText": "新增库存卡" + } } ] } diff --git a/src/pagesApp/components/addCustomer.vue b/src/pagesApp/components/addCustomer.vue new file mode 100644 index 0000000..f0a3fb3 --- /dev/null +++ b/src/pagesApp/components/addCustomer.vue @@ -0,0 +1,211 @@ + + + diff --git a/src/pagesApp/components/addStockCard.vue b/src/pagesApp/components/addStockCard.vue new file mode 100644 index 0000000..29ef3bd --- /dev/null +++ b/src/pagesApp/components/addStockCard.vue @@ -0,0 +1,191 @@ + + + diff --git a/src/pagesApp/components/addSupplier.vue b/src/pagesApp/components/addSupplier.vue index 6ee1867..ac0120e 100644 --- a/src/pagesApp/components/addSupplier.vue +++ b/src/pagesApp/components/addSupplier.vue @@ -199,7 +199,7 @@ const save = () => { if (model1.formData.id) { SupplierApi.updateSupplierUser(model1.formData).then((res) => { if (res.code === 200) { - uni.navigateTo({ + uni.redirectTo({ url: "/pagesApp/supplierMgt", // 要跳转到的页面路径 }); } @@ -207,7 +207,7 @@ const save = () => { } else { SupplierApi.addSupplierUser(model1.formData).then((res) => { if (res.code === 200) { - uni.navigateTo({ + uni.redirectTo({ url: "/pagesApp/supplierMgt", // 要跳转到的页面路径 }); } diff --git a/src/pagesApp/customerMgt.vue b/src/pagesApp/customerMgt.vue index ebeabb6..7ea6014 100644 --- a/src/pagesApp/customerMgt.vue +++ b/src/pagesApp/customerMgt.vue @@ -3,28 +3,87 @@ - 新增 + 新增 - + - 客户名称 - 联系人:张三 - 卡号:235466566 + {{ item.name }} + 联系人:{{ item.contacts }} + 卡号:{{ item.cardCode }} + + + 编辑 + 删除 - 删除 diff --git a/src/pagesHome/index.vue b/src/pagesHome/index.vue index 1f79df3..1943f27 100644 --- a/src/pagesHome/index.vue +++ b/src/pagesHome/index.vue @@ -423,9 +423,9 @@ const appList = reactive([ icon: "16.png", title: "库存卡管理", fn: () => { - // uni.navigateTo({ - // url: "/pagesApp/customerMgt", // 要跳转到的页面路径 - // }); + uni.navigateTo({ + url: "/pagesApp/stockCard", // 要跳转到的页面路径 + }); }, }, ]); diff --git a/src/static/img/statistic/1-1.png b/src/static/img/statistic/1-1.png deleted file mode 100644 index d5dc9c8..0000000 Binary files a/src/static/img/statistic/1-1.png and /dev/null differ diff --git a/src/static/img/statistic/1-2.png b/src/static/img/statistic/1-2.png deleted file mode 100644 index 1f14b8e..0000000 Binary files a/src/static/img/statistic/1-2.png and /dev/null differ diff --git a/src/static/img/statistic/2-1.png b/src/static/img/statistic/2-1.png deleted file mode 100644 index a544e4f..0000000 Binary files a/src/static/img/statistic/2-1.png and /dev/null differ diff --git a/src/static/img/statistic/2-2.png b/src/static/img/statistic/2-2.png deleted file mode 100644 index 25eff96..0000000 Binary files a/src/static/img/statistic/2-2.png and /dev/null differ diff --git a/src/static/img/statistic/3-1.png b/src/static/img/statistic/3-1.png deleted file mode 100644 index d9d70fb..0000000 Binary files a/src/static/img/statistic/3-1.png and /dev/null differ diff --git a/src/static/img/statistic/3-2.png b/src/static/img/statistic/3-2.png deleted file mode 100644 index 2916de4..0000000 Binary files a/src/static/img/statistic/3-2.png and /dev/null differ diff --git a/src/static/img/statistic/3-3.png b/src/static/img/statistic/3-3.png deleted file mode 100644 index 3b229b1..0000000 Binary files a/src/static/img/statistic/3-3.png and /dev/null differ diff --git a/src/static/img/statistic/a-feigangpanji2_huaban1.png b/src/static/img/statistic/a-feigangpanji2_huaban1.png deleted file mode 100644 index 09f5641..0000000 Binary files a/src/static/img/statistic/a-feigangpanji2_huaban1.png and /dev/null differ diff --git a/src/types/order.d.ts b/src/types/order.d.ts index 4898651..5180fe9 100644 --- a/src/types/order.d.ts +++ b/src/types/order.d.ts @@ -199,3 +199,12 @@ interface ReceiveProduct { isDeleted?: boolean; //逻辑删除 TRUE=是 FALSE=否 } + +// 库存卡 + +interface StockCard { + cardCode?: string, + type?: number, // 库存卡类型1=出库2=入库 + cardCode?: string, + name?: string +} diff --git a/src/types/user.d.ts b/src/types/user.d.ts index 969456f..4095a12 100644 --- a/src/types/user.d.ts +++ b/src/types/user.d.ts @@ -20,3 +20,10 @@ interface User { isDeleted: boolean; cardCode?: string; // 卡号 } + +interface Customer { + name?: string, + stockCardId?: number, + contacts?:string, + cardCode?: string, +} diff --git a/src/utils/enum.ts b/src/utils/enum.ts index 40e69f4..0e02c99 100644 --- a/src/utils/enum.ts +++ b/src/utils/enum.ts @@ -77,3 +77,9 @@ export enum DeviceType { Printer = 0, Weighbridge = 1 } + +// 1=出库(客户)2=入库(供应商) +export enum StockCardType { + Shipment = 1, + Receive = 2 +} \ No newline at end of file