diff --git a/miniprogram/pages/index/index.ts b/miniprogram/pages/index/index.ts index e448fcb..c1b8fbc 100644 --- a/miniprogram/pages/index/index.ts +++ b/miniprogram/pages/index/index.ts @@ -42,6 +42,13 @@ Page({ block: [] as any[], authInfo: {} as any, menuList: [] as any, + blockUrls: { + 今日销售订单: '/pages/orders/ordersList/ordersList?type=today', + 今日请购订单: '/pages/purchase/requestOrder/requestOrder?type=today', + 今日采购订单: '/pages/purchase/buyOrder/buyOrder?type=today', + 今日采购入库: '/pages/purchase/buyInOrder/buyInOrder?type=today', + 今日原料出库单: '/pages/other/outbound/outbound?type=today', + } as any, }, handleLogin(e: any) { this.setData({ isLogin: e.detail }); @@ -49,7 +56,6 @@ Page({ this.init(); } }, - init() { this.data.authInfo = {}; const companyInfo = toObject(wx.getStorageSync('company_info')); @@ -85,6 +91,14 @@ Page({ this.setData({ block }); }); }, + onBlockNavTo(e: any) { + const data = getDataSet(e); + const item = this.data.block[data.index]; + const url = this.data.blockUrls[item.name]; + if (url) { + wx.navigateTo({ url }); + } + }, nav(e: any) { const data = getDataSet(e); wx.navigateTo({ url: data.url }); diff --git a/miniprogram/pages/index/index.wxml b/miniprogram/pages/index/index.wxml index 78891b7..8c5a8e4 100644 --- a/miniprogram/pages/index/index.wxml +++ b/miniprogram/pages/index/index.wxml @@ -2,7 +2,8 @@ bind:handleLogin="handleLogin" hasTabBar="1"> - + {{item.name}} {{item.value}} @@ -15,8 +16,9 @@ - {{ item.title }} + style="color: {{item.iconColor}};font-size: 1.2em;margin-right: 16rpx;" /> + {{ item.title }} diff --git a/miniprogram/pages/orders/ordersList/ordersList.ts b/miniprogram/pages/orders/ordersList/ordersList.ts index abe4064..4d6b8bc 100644 --- a/miniprogram/pages/orders/ordersList/ordersList.ts +++ b/miniprogram/pages/orders/ordersList/ordersList.ts @@ -8,6 +8,7 @@ import { cloneLite, getAuthInfo, getDataSet, + getDay, showModal, sleep, toArray, @@ -180,7 +181,13 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad(_options) {}, + onLoad(options) { + const { type } = options; + if (type == 'today') { + this.data.params.create_dateL = getDay(); + this.data.params.create_dateU = getDay(); + } + }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/miniprogram/pages/other/outbound/outbound.ts b/miniprogram/pages/other/outbound/outbound.ts index 1754604..f8a3dc1 100644 --- a/miniprogram/pages/other/outbound/outbound.ts +++ b/miniprogram/pages/other/outbound/outbound.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + getDay, showModal, sleep, toArray, @@ -131,7 +132,13 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad(_options) {}, + onLoad(options) { + const { type } = options; + if (type == 'today') { + this.data.params.create_dateL = getDay(); + this.data.params.create_dateU = getDay(); + } + }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/miniprogram/pages/other/outbound/outbound.wxml b/miniprogram/pages/other/outbound/outbound.wxml index 23323ad..7fa8d16 100644 --- a/miniprogram/pages/other/outbound/outbound.wxml +++ b/miniprogram/pages/other/outbound/outbound.wxml @@ -13,10 +13,10 @@ bind:confirm="datePickerConfirm" /> - + bind:confirm="datePickerConfirm" /> diff --git a/miniprogram/pages/produce/processManage/processManage.wxml b/miniprogram/pages/produce/processManage/processManage.wxml index 140ba75..e335838 100644 --- a/miniprogram/pages/produce/processManage/processManage.wxml +++ b/miniprogram/pages/produce/processManage/processManage.wxml @@ -1,13 +1,20 @@ - + - + {{ item.p_process_name }} - + + + + + 工序名称 + 可作数 + - - {{ child.process_name }} - {{ child.num }} + + {{ child.process_name }} + {{ child.num }} diff --git a/miniprogram/pages/produce/processManage/processManage.wxss b/miniprogram/pages/produce/processManage/processManage.wxss index c903803..7950737 100644 --- a/miniprogram/pages/produce/processManage/processManage.wxss +++ b/miniprogram/pages/produce/processManage/processManage.wxss @@ -1,22 +1,19 @@ -.process-box { - border: 1rpx solid #ddd; - margin-bottom: 24rpx; - border-radius: 8rpx; -} - -.process-child-box { - display: flex; - flex-wrap: wrap; - align-items: center; - column-gap: 32rpx; - row-gap: 32rpx; - padding: 32rpx 16rpx 24rpx; +.p_process_name-box { + background-color: #fff; + position: sticky; + top: 0; + z-index: 2; } .p_process_name { font-weight: bold; - padding: 16rpx; - border-bottom: 1rpx solid #ddd; + padding: 16rpx 16rpx; + display: flex; + align-items: center; + border: 1rpx solid #ddd; + box-sizing: border-box; + border-top-left-radius: 8rpx; + border-top-right-radius: 8rpx; } .process-child-item-box { @@ -42,3 +39,54 @@ padding: 2rpx 8rpx; font-size: 28rpx; } + +.process-child-box2 { + padding: 16rpx; + border: 1rpx solid #ddd; + border-top: none; + box-sizing: border-box; + border-bottom-left-radius: 8rpx; + border-bottom-right-radius: 8rpx; + margin-bottom: 24rpx; +} + +.process-tr { + display: flex; + border-bottom: 1rpx solid #ddd; +} + +.process-th, +.process-td { + align-items: center; + padding: 12rpx 16rpx; + word-break: break-all; + display: inline-flex; + border-right: 1rpx solid #ddd; +} + +.process-th { + font-weight: bold; + background-color: #f5f5f5; + border-top: 1rpx solid #ddd; +} + +.process-td { + color: #0052d9; +} + +.process-tr .process-th:first-child, +.process-tr .process-td:first-child { + flex: 1; + border-left: 1rpx solid #ddd; +} + +.process-tr .process-th:last-child, +.process-tr .process-td:last-child { + min-width: 0; + width: 5em; + flex-shrink: 0; +} + +.process-tr-active:active { + background-color: #f5f5f5; +} diff --git a/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts b/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts index 5292b13..89d0ac0 100644 --- a/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts +++ b/miniprogram/pages/purchase/buyInOrder/buyInOrder.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + getDay, showModal, sleep, toArray, @@ -121,7 +122,13 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad(_options) {}, + onLoad(options) { + const { type } = options; + if (type == 'today') { + this.data.params.create_dateL = getDay(); + this.data.params.create_dateU = getDay(); + } + }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml b/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml index ffc07c3..3ec49c0 100644 --- a/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml +++ b/miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml @@ -17,10 +17,10 @@ bind:confirm="datePickerConfirm" /> - + bind:confirm="datePickerConfirm" /> diff --git a/miniprogram/pages/purchase/buyOrder/buyOrder.ts b/miniprogram/pages/purchase/buyOrder/buyOrder.ts index a378318..051098a 100644 --- a/miniprogram/pages/purchase/buyOrder/buyOrder.ts +++ b/miniprogram/pages/purchase/buyOrder/buyOrder.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + getDay, showModal, sleep, toArray, @@ -124,7 +125,13 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad(_options) {}, + onLoad(options) { + const { type } = options; + if (type == 'today') { + this.data.params.create_dateL = getDay(); + this.data.params.create_dateU = getDay(); + } + }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/miniprogram/pages/purchase/buyOrder/buyOrder.wxml b/miniprogram/pages/purchase/buyOrder/buyOrder.wxml index 29f658b..a2f6b55 100644 --- a/miniprogram/pages/purchase/buyOrder/buyOrder.wxml +++ b/miniprogram/pages/purchase/buyOrder/buyOrder.wxml @@ -18,10 +18,10 @@ bind:confirm="datePickerConfirm" /> - + bind:confirm="datePickerConfirm" /> diff --git a/miniprogram/pages/purchase/requestOrder/requestOrder.ts b/miniprogram/pages/purchase/requestOrder/requestOrder.ts index dfd99b8..8c10453 100644 --- a/miniprogram/pages/purchase/requestOrder/requestOrder.ts +++ b/miniprogram/pages/purchase/requestOrder/requestOrder.ts @@ -3,6 +3,7 @@ import { cloneLite, getAuthInfo, getDataSet, + getDay, showModal, sleep, toArray, @@ -124,7 +125,13 @@ Page({ /** * 生命周期函数--监听页面加载 */ - onLoad(_options) {}, + onLoad(options) { + const { type } = options; + if (type == 'today') { + this.data.params.create_dateL = getDay(); + this.data.params.create_dateU = getDay(); + } + }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/miniprogram/pages/purchase/requestOrder/requestOrder.wxml b/miniprogram/pages/purchase/requestOrder/requestOrder.wxml index fa986d0..ef4cb9f 100644 --- a/miniprogram/pages/purchase/requestOrder/requestOrder.wxml +++ b/miniprogram/pages/purchase/requestOrder/requestOrder.wxml @@ -18,10 +18,10 @@ bind:confirm="datePickerConfirm" /> - + bind:confirm="datePickerConfirm" /> diff --git a/miniprogram/utils/util.ts b/miniprogram/utils/util.ts index 2a4c88d..3bb9543 100644 --- a/miniprogram/utils/util.ts +++ b/miniprogram/utils/util.ts @@ -1,5 +1,6 @@ import { http } from './config'; import Big from 'big.js'; +import dayjs from 'dayjs'; export const formatTime = (date: Date) => { const year = date.getFullYear(); @@ -383,3 +384,8 @@ export const formatFileSize = (fileSize: any): string => { const size = file_size / 1024 ** index; return size.toFixed(0) + unitArr[index]; }; + +export const getDay = (option?: { value: number; unit: 'day' | 'month' | 'year' }) => { + const { value = 0, unit = 'day' } = option || {}; + return dayjs().subtract(value, unit).format('YYYY-MM-DD'); +};