From 73b9a68605f46d63426084d1ea4ec34bdd9d56e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E5=BD=AA=E8=BE=89?= Date: Tue, 29 Apr 2025 23:41:03 +0800 Subject: [PATCH] =?UTF-8?q?refactor(erp):=20=E6=9B=B4=E6=96=B0=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=88=86=E7=B1=BB=E5=92=8C=E5=8D=95=E4=BD=8D=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 优化库存和采购相关页面布局 - 修复供应商和仓库选择功能 - 调整统计页面显示内容 - 优化表单验证逻辑 --- src/addon/erp/api/product.ts | 8 ++++ .../zh-Hans/pages.product.product.add.json | 4 +- .../zh-Hans/pages.product.product.list.json | 4 +- .../erp/locale/zh-Hans/pages.statistics.json | 2 +- src/addon/erp/pages/base/customer/add.vue | 4 +- src/addon/erp/pages/base/customer/detail.vue | 4 +- src/addon/erp/pages/base/supplier/add.vue | 4 +- src/addon/erp/pages/base/supplier/detail.vue | 4 +- src/addon/erp/pages/base/warehouse/detail.vue | 4 +- src/addon/erp/pages/canteen/return/add.vue | 13 +++--- src/addon/erp/pages/canteen/return/list.vue | 2 +- .../erp/pages/inbound/stockPending/add.vue | 21 ++++++--- .../erp/pages/inventory/inventory/add.vue | 16 +++---- .../erp/pages/outbound/outPending/add.vue | 18 ++++---- src/addon/erp/pages/product/product/add.vue | 43 +++++++------------ .../pages/product/product/product-select.vue | 2 - src/addon/erp/pages/purchase/return/add.vue | 10 +++-- src/addon/erp/pages/statistics.vue | 23 +++++++++- src/manifest.json | 2 +- 19 files changed, 109 insertions(+), 79 deletions(-) diff --git a/src/addon/erp/api/product.ts b/src/addon/erp/api/product.ts index 835f6ca..b067c85 100644 --- a/src/addon/erp/api/product.ts +++ b/src/addon/erp/api/product.ts @@ -20,6 +20,14 @@ export function getProductTypeSelect() { export function getProductTypeInfo(id : number) { return request.get(`erp/product/type/${id}`); } +// /** +// * 根据分类id查询商品 +// * @param type 商品分类id +// * @returns +// */ +// export function getProductByTypeList(type : number) { +// return request.get(`erp/product/getListsByType/${type}`); +// } /** * 添加商品分类 diff --git a/src/addon/erp/locale/zh-Hans/pages.product.product.add.json b/src/addon/erp/locale/zh-Hans/pages.product.product.add.json index ddbc3d2..823dd16 100644 --- a/src/addon/erp/locale/zh-Hans/pages.product.product.add.json +++ b/src/addon/erp/locale/zh-Hans/pages.product.product.add.json @@ -4,7 +4,7 @@ "name": "食材名称", "namePlaceholder": "请输入食材名称", "productTypeId": "食材类型", - "productTypeIdPlaceholder": "请输入食材类型", + "productTypeIdPlaceholder": "请选择食材类型", "spec": "规格", "specPlaceholder": "请输入规格", "inventory": "食材库存", @@ -18,7 +18,7 @@ "remark": "备注", "remarkPlaceholder": "请输入备注", "productUnitId": "单位", - "productUnitIdPlaceholder": "请输入单位", + "productUnitIdPlaceholder": "请选择单位", "unit": "单位值", "unitPlaceholder": "请输入单位值", "image": "图片", diff --git a/src/addon/erp/locale/zh-Hans/pages.product.product.list.json b/src/addon/erp/locale/zh-Hans/pages.product.product.list.json index 2b64044..380b35e 100644 --- a/src/addon/erp/locale/zh-Hans/pages.product.product.list.json +++ b/src/addon/erp/locale/zh-Hans/pages.product.product.list.json @@ -4,7 +4,7 @@ "name":"食材名称", "namePlaceholder":"请输入食材名称", "productTypeId":"食材类型", - "productTypeIdPlaceholder":"请输入食材类型", + "productTypeIdPlaceholder":"请选择食材类型", "spec":"食材规格", "specPlaceholder":"请输入规格", "inventory":"食材库存", @@ -18,7 +18,7 @@ "remark":"备注", "remarkPlaceholder":"请输入备注", "productUnitId":"食材单位", - "productUnitIdPlaceholder":"请输入单位", + "productUnitIdPlaceholder":"请选择单位", "unit":"单位值", "unitPlaceholder":"请输入单位值", "image":"图片", diff --git a/src/addon/erp/locale/zh-Hans/pages.statistics.json b/src/addon/erp/locale/zh-Hans/pages.statistics.json index 5ae2d35..0f32177 100644 --- a/src/addon/erp/locale/zh-Hans/pages.statistics.json +++ b/src/addon/erp/locale/zh-Hans/pages.statistics.json @@ -1,5 +1,5 @@ { - "dataSummary": "今日汇总", + "dataSummary": "汇总数据", "updateTime": "更新时间", "todayPurchaseCount": "今日入库订单数", "purchaseCount": "采购订单总数", diff --git a/src/addon/erp/pages/base/customer/add.vue b/src/addon/erp/pages/base/customer/add.vue index 99937cf..137e03a 100644 --- a/src/addon/erp/pages/base/customer/add.vue +++ b/src/addon/erp/pages/base/customer/add.vue @@ -2,11 +2,11 @@ - + diff --git a/src/addon/erp/pages/base/customer/detail.vue b/src/addon/erp/pages/base/customer/detail.vue index 8e5cc99..b53a859 100644 --- a/src/addon/erp/pages/base/customer/detail.vue +++ b/src/addon/erp/pages/base/customer/detail.vue @@ -3,9 +3,9 @@ - + {{formData.name}} diff --git a/src/addon/erp/pages/base/supplier/add.vue b/src/addon/erp/pages/base/supplier/add.vue index 44c2301..9f06a58 100644 --- a/src/addon/erp/pages/base/supplier/add.vue +++ b/src/addon/erp/pages/base/supplier/add.vue @@ -4,11 +4,11 @@ - + diff --git a/src/addon/erp/pages/base/supplier/detail.vue b/src/addon/erp/pages/base/supplier/detail.vue index 9453c69..dcc955e 100644 --- a/src/addon/erp/pages/base/supplier/detail.vue +++ b/src/addon/erp/pages/base/supplier/detail.vue @@ -3,9 +3,9 @@ - + {{formData.name}} diff --git a/src/addon/erp/pages/base/warehouse/detail.vue b/src/addon/erp/pages/base/warehouse/detail.vue index 3832d56..99f6dd1 100644 --- a/src/addon/erp/pages/base/warehouse/detail.vue +++ b/src/addon/erp/pages/base/warehouse/detail.vue @@ -3,9 +3,9 @@ - + {{formData.name}} diff --git a/src/addon/erp/pages/canteen/return/add.vue b/src/addon/erp/pages/canteen/return/add.vue index c1846a9..9de81d0 100644 --- a/src/addon/erp/pages/canteen/return/add.vue +++ b/src/addon/erp/pages/canteen/return/add.vue @@ -80,7 +80,7 @@ - + ([]); const customeChange=(e: any) =>{ formData.value.customer_id = e.id - formData.value.contact = e.contact - formData.value.phone = e.phone - formData.value.address = e.address + formData.value.contact = e?.contact ?? '' + formData.value.phone = e?.phone ?? '' + formData.value.address = e?.address ?? '' getOutboundManualAllFn(e.id) if (formRef.value) { formRef.value.validateField('customer_id'); @@ -400,7 +400,10 @@ uni.showToast({ icon: 'none', title: t('billingTimePlaceholder') }) return false; } - + if (imageFileList.value.length === 0) { + uni.showToast({ icon: 'none', title: '请上传图片' }) + return false; + } loading.value = true formData.value.total_num = totalData.value.total_num; formData.value.total_amount = totalData.value.total_amount; diff --git a/src/addon/erp/pages/canteen/return/list.vue b/src/addon/erp/pages/canteen/return/list.vue index 31d5d5a..bd0e4cb 100644 --- a/src/addon/erp/pages/canteen/return/list.vue +++ b/src/addon/erp/pages/canteen/return/list.vue @@ -109,7 +109,7 @@ placeholder="请输入拒绝原因" /> - + diff --git a/src/addon/erp/pages/inbound/stockPending/add.vue b/src/addon/erp/pages/inbound/stockPending/add.vue index 3c80be4..2c1deec 100644 --- a/src/addon/erp/pages/inbound/stockPending/add.vue +++ b/src/addon/erp/pages/inbound/stockPending/add.vue @@ -92,13 +92,13 @@ - + - + @@ -189,7 +189,7 @@ - +