From 4557cbef79e288439c84a33ca8cbbd96cf782e92 Mon Sep 17 00:00:00 2001 From: duan <1004387497@qq.com> Date: Wed, 9 Oct 2024 16:48:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/my-components/my-reportDamage.vue | 2 +- http/yskApi/devices.js | 8 +- http/yskApi/requestAll.js | 89 +++++ pageConsumables/addConsumables.vue | 207 ++++++++++ pageConsumables/addType.vue | 220 +++++++++++ .../components/my-action-sheet.vue | 108 ++++++ .../components/my-reportDamage.vue | 364 ++++++++++++++++++ pageConsumables/editConsumables.vue | 208 ++++++++++ pageConsumables/index.vue | 207 ++++++++-- pageConsumables/inventoryCheck.vue | 125 ++++-- pageConsumables/outbound.vue | 126 ++++-- pageConsumables/viewrecords.vue | 112 ++++++ pageConsumables/warehouseEntry.vue | 127 ++++-- pagePrinter/add-printer/add-printer.vue | 8 +- pages.json | 24 ++ 15 files changed, 1789 insertions(+), 146 deletions(-) create mode 100644 pageConsumables/addConsumables.vue create mode 100644 pageConsumables/addType.vue create mode 100644 pageConsumables/components/my-action-sheet.vue create mode 100644 pageConsumables/components/my-reportDamage.vue create mode 100644 pageConsumables/editConsumables.vue create mode 100644 pageConsumables/viewrecords.vue diff --git a/components/my-components/my-reportDamage.vue b/components/my-components/my-reportDamage.vue index e71d6cd..ce67f15 100644 --- a/components/my-components/my-reportDamage.vue +++ b/components/my-components/my-reportDamage.vue @@ -53,7 +53,7 @@ watch } from 'vue'; import { $uploadFile } from '@/http/yskApi/file.js' - import { consumableBreakage , productBreakage ,tbConCheck} from '@/http/yskApi/breakage.js' + import { consumableBreakage , productBreakage } from '@/http/yskApi/breakage.js' const props = defineProps({ show:{ diff --git a/http/yskApi/devices.js b/http/yskApi/devices.js index 6bbc7af..4a71945 100644 --- a/http/yskApi/devices.js +++ b/http/yskApi/devices.js @@ -32,11 +32,11 @@ export function tbPrintMachineGet(params) { }) } // 修改打印机状态 -export function shopConfigprinter(params) { +export function shopConfigprinter(data) { return request({ - url: '/api/shop-config/printer', - method: 'put', - params + url: '/api/shop-config/printer/update-status', + method: 'post', + data }) } diff --git a/http/yskApi/requestAll.js b/http/yskApi/requestAll.js index fece986..d6fb3ce 100644 --- a/http/yskApi/requestAll.js +++ b/http/yskApi/requestAll.js @@ -10,6 +10,14 @@ export function summaryTrade(data) { } }) } +// 耗材报损 +export function tbConsInfoFlowfrmLoss(data) { + return request({ + url: '/api/tbConsInfoFlow/frmLoss', + method: 'post', + data + }) +} // 销售排行榜 export function dateProduct(params) { return request({ @@ -33,6 +41,79 @@ export function tbPlussShopStaffDetail(id) { method: "get" }); } +// 新增耗材类型 +export function tbConsType(data) { + return request({ + url: '/api/tbConsType ', + method: 'post', + data + }) +} +// 编辑耗材类型 +export function tbConsTypeput(data) { + return request({ + url: '/api/tbConsInfo ', + method: "put", + data + }); +} + +// 获取耗材类型列表 +export function tbConsTypeList(params) { + return request({ + url: '/api/tbConsType', + method: 'get', + params + }) +} +// 修改耗材类型 +export function edittbConsTypeput(data) { + return request({ + url: '/api/tbConsType ', + method: "put", + data + }); +} +// 添加耗材列表 +export function tbConsInfoAddlist(data) { + return request({ + url: '/api/tbConsInfo ', + method: 'post', + data + }) +} +// 操作耗材入库 +export function tbConsInfostockInOut(data) { + return request({ + url: '/api/tbConsInfo/stockInOut ', + method: 'post', + data + }) +} +// 获取耗材列表 +export function tbConsInfoList(params) { + return request({ + url: '/api/tbConsInfo', + method: 'get', + params + }) +} +// 耗材盘点 +export function tbConsInfotbConCheck(data) { + return request({ + url: '/api/tbConCheck ', + method: 'post', + data + }) +} +// 获取供应商列表 +export function tbShopPurveyor(params) { + return request({ + url: '/api/tbShopPurveyor', + method: 'get', + params + }) +} // 桌型列表 export function callTable(params) { return request({ @@ -119,3 +200,11 @@ export function tbPlussShopStaff(data) { data }); } +// 耗材列表 +export function viewConInfoFlowget(data) { + return request({ + url: `/api/viewConInfoFlow/get`, + method: 'post', + data + }); +} \ No newline at end of file diff --git a/pageConsumables/addConsumables.vue b/pageConsumables/addConsumables.vue new file mode 100644 index 0000000..d160f63 --- /dev/null +++ b/pageConsumables/addConsumables.vue @@ -0,0 +1,207 @@ + + + + + \ No newline at end of file diff --git a/pageConsumables/addType.vue b/pageConsumables/addType.vue new file mode 100644 index 0000000..b0e6104 --- /dev/null +++ b/pageConsumables/addType.vue @@ -0,0 +1,220 @@ + + + + + \ No newline at end of file diff --git a/pageConsumables/components/my-action-sheet.vue b/pageConsumables/components/my-action-sheet.vue new file mode 100644 index 0000000..4111f2e --- /dev/null +++ b/pageConsumables/components/my-action-sheet.vue @@ -0,0 +1,108 @@ + + + + + \ No newline at end of file diff --git a/pageConsumables/components/my-reportDamage.vue b/pageConsumables/components/my-reportDamage.vue new file mode 100644 index 0000000..360d7c9 --- /dev/null +++ b/pageConsumables/components/my-reportDamage.vue @@ -0,0 +1,364 @@ + + + + + \ No newline at end of file diff --git a/pageConsumables/editConsumables.vue b/pageConsumables/editConsumables.vue new file mode 100644 index 0000000..aa574b0 --- /dev/null +++ b/pageConsumables/editConsumables.vue @@ -0,0 +1,208 @@ + + + + + \ No newline at end of file diff --git a/pageConsumables/index.vue b/pageConsumables/index.vue index a8ad785..d527136 100644 --- a/pageConsumables/index.vue +++ b/pageConsumables/index.vue @@ -1,24 +1,35 @@ \ No newline at end of file diff --git a/pageConsumables/warehouseEntry.vue b/pageConsumables/warehouseEntry.vue index 4f62122..d52bcb0 100644 --- a/pageConsumables/warehouseEntry.vue +++ b/pageConsumables/warehouseEntry.vue @@ -1,52 +1,52 @@ @@ -74,10 +74,51 @@ @@ -122,7 +177,7 @@ .warehouseEntry { width: 694rpx; - height: 740rpx; + height: 640rpx; background: #FFFFFF; border-radius: 18rpx 18rpx 18rpx 18rpx; margin: 32rpx; diff --git a/pagePrinter/add-printer/add-printer.vue b/pagePrinter/add-printer/add-printer.vue index 9c91ddc..32401de 100644 --- a/pagePrinter/add-printer/add-printer.vue +++ b/pagePrinter/add-printer/add-printer.vue @@ -53,14 +53,14 @@ 部分分类 -