diff --git a/miniprogram/pages/db/api/db.js b/miniprogram/pages/db/api/db.js new file mode 100644 index 000000000..62fb39ef4 --- /dev/null +++ b/miniprogram/pages/db/api/db.js @@ -0,0 +1,41 @@ +/** + * 地磅业务 API(对齐 mobile-h5) + */ +import db from '@/utils/dbRequest' + +export const dashboardApi = { + getInboundByCargo: () => db.get('/dashboard/inbound/by-cargo'), + getInboundByPartnerCargo: () => db.get('/dashboard/inbound/by-partner-cargo'), + getOutboundByCargo: () => db.get('/dashboard/outbound/by-cargo'), + getOutboundByPartnerCargo: () => db.get('/dashboard/outbound/by-partner-cargo') +} + +export const planApi = { + list: (params) => db.get('/plans', params), + get: (id) => db.get(`/plans/${id}`), + getRelated: (id) => db.get(`/plans/${id}/related`), + create: (payload) => db.post('/plans', payload), + update: (id, payload) => db.patch(`/plans/${id}`, payload), + delete: (id) => db.del(`/plans/${id}`) +} + +export const inventoryApi = { + list: (params) => db.get('/inventory', params), + get: (id) => db.get(`/inventory/${id}`), + getRelated: (id) => db.get(`/inventory/${id}/related`), + create: (payload) => db.post('/inventory', payload), + update: (id, payload) => db.patch(`/inventory/${id}`, payload), + delete: (id) => db.del(`/inventory/${id}`), + createLinkForPlan: (purchasePlanId, remarks) => + db.post('/inventory/create-link-for-plan', { purchasePlanId, remarks }) +} + +export const weighingApi = { + list: (params) => db.get('/weighing', params), + get: (id) => db.get(`/weighing/${id}`), + getRelated: (id) => db.get(`/weighing/${id}/related`), + create: (payload) => db.post('/weighing', payload), + update: (id, payload) => db.patch(`/weighing/${id}`, payload), + void: (id) => db.post(`/weighing/${id}/void`), + delete: (id) => db.del(`/weighing/${id}`) +} diff --git a/miniprogram/pages/db/dashboard/index.vue b/miniprogram/pages/db/dashboard/index.vue index 987277e1a..e3df5257d 100644 --- a/miniprogram/pages/db/dashboard/index.vue +++ b/miniprogram/pages/db/dashboard/index.vue @@ -1,134 +1,152 @@ + + - + diff --git a/miniprogram/pages/db/inventory/detail.vue b/miniprogram/pages/db/inventory/detail.vue index c3be16ec9..a72664b07 100644 --- a/miniprogram/pages/db/inventory/detail.vue +++ b/miniprogram/pages/db/inventory/detail.vue @@ -1,121 +1,228 @@ - - + + + + diff --git a/miniprogram/pages/db/inventory/list.vue b/miniprogram/pages/db/inventory/list.vue index b21f26316..803f31bec 100644 --- a/miniprogram/pages/db/inventory/list.vue +++ b/miniprogram/pages/db/inventory/list.vue @@ -1,141 +1,246 @@ - - + diff --git a/miniprogram/pages/db/plans/detail.vue b/miniprogram/pages/db/plans/detail.vue index 44f9ac153..fe6ad17bc 100644 --- a/miniprogram/pages/db/plans/detail.vue +++ b/miniprogram/pages/db/plans/detail.vue @@ -1,139 +1,214 @@ + + - + diff --git a/miniprogram/pages/db/plans/list.vue b/miniprogram/pages/db/plans/list.vue index 2d2d74869..d55dbf9a0 100644 --- a/miniprogram/pages/db/plans/list.vue +++ b/miniprogram/pages/db/plans/list.vue @@ -1,119 +1,277 @@ + + - + diff --git a/miniprogram/pages/db/utils/dbDate.js b/miniprogram/pages/db/utils/dbDate.js new file mode 100644 index 000000000..f2627e6d9 --- /dev/null +++ b/miniprogram/pages/db/utils/dbDate.js @@ -0,0 +1,33 @@ +/** 地磅页日期工具(避免引入 dayjs) */ +export function formatYmd(d = new Date()) { + const x = d instanceof Date ? d : new Date(d) + if (Number.isNaN(x.getTime())) return '' + const y = x.getFullYear() + const m = String(x.getMonth() + 1).padStart(2, '0') + const day = String(x.getDate()).padStart(2, '0') + return `${y}-${m}-${day}` +} + +export function addDays(base, n) { + const d = new Date(base) + d.setDate(d.getDate() + n) + return d +} + +/** 本周周一~周日 YYYY-MM-DD */ +export function weekRange(base = new Date()) { + const today = new Date(base) + const day = today.getDay() || 7 + const monday = addDays(today, 1 - day) + const sunday = addDays(monday, 6) + return { from: formatYmd(monday), to: formatYmd(sunday) } +} + +export function nowYmdHms() { + const d = new Date() + const ymd = formatYmd(d) + const hh = String(d.getHours()).padStart(2, '0') + const mm = String(d.getMinutes()).padStart(2, '0') + const ss = String(d.getSeconds()).padStart(2, '0') + return `${ymd} ${hh}:${mm}:${ss}` +} diff --git a/miniprogram/pages/db/weighing/detail.vue b/miniprogram/pages/db/weighing/detail.vue index 16bda2f85..e7b81375d 100644 --- a/miniprogram/pages/db/weighing/detail.vue +++ b/miniprogram/pages/db/weighing/detail.vue @@ -1,157 +1,335 @@ - - + + + + diff --git a/miniprogram/pages/db/weighing/list.vue b/miniprogram/pages/db/weighing/list.vue index d8a0ceabb..db34435f0 100644 --- a/miniprogram/pages/db/weighing/list.vue +++ b/miniprogram/pages/db/weighing/list.vue @@ -1,168 +1,256 @@ - - +