添加首页统计跳转页面

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 });

miniprogram/pages/index/index.wxml

@@ -2,7 +2,8 @@
   bind:handleLogin="handleLogin" hasTabBar="1">
   <view class="block-box">
     <block wx:for="{{block}}" wx:key="index">
-      <view class="block-item-box" style="background: {{BGColors[index]}};">
+      <view class="block-item-box" style="background: {{BGColors[index]}};" bind:tap="onBlockNavTo"
+        data-index="{{index}}">
         <view class="block-item-name">{{item.name}}</view>
         <view class="block-item-value">
           <text>{{item.value}}</text>
@@ -15,8 +16,9 @@
     <view class="menu-box">
       <view class="menu-title">
         <t-icon name="{{ item.icon }}"
-          style="color: {{item.iconColor}};font-size: 1.2em;margin-right: 8rpx;" />
+          style="color: {{item.iconColor}};font-size: 1.2em;margin-right: 16rpx;" />
-        <text style="font-weight: bold;font-size: 1.1em;">{{ item.title }}</text>
+        <text
+          style="font-weight: bold;font-size: 1.1em;color: {{item.iconColor}}">{{ item.title }}</text>
       </view>
       <view class="menu-children-box">
         <block wx:for="{{ item.children }}" wx:key="index" wx:for-item="child">

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();
+    }
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

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();
+    }
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

miniprogram/pages/other/outbound/outbound.wxml

@@ -13,10 +13,10 @@
         bind:confirm="datePickerConfirm" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
         bind:confirm="datePickerConfirm" />
-      <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
+      <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
         bind:confirm="datePickerConfirm" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="datePickerConfirm" />
     </view>
   </search-popup>
 

miniprogram/pages/produce/processManage/processManage.wxml

@@ -1,13 +1,20 @@
-<page-plugin hasTabBar="1" isAuth="{{authInfo['SF_ERP_PRODUCT_PROCESS_VIEW']}}"
+<page-plugin isAuth="{{authInfo['SF_ERP_PRODUCT_PROCESS_VIEW']}}" loading="{{loading}}"
-  loading="{{loading}}" is-login="{{isLogin}}" bind:handleLogin="handleLogin">
+  is-login="{{isLogin}}" bind:handleLogin="handleLogin">
   <block wx:for="{{ process }}" wx:key="parent_process_id">
-    <view class="process-box">
+    <view class="p_process_name-box">
       <view class="p_process_name">{{ item.p_process_name }}</view>
-      <view class="process-child-box">
+    </view>
+    <view class="process-child-box2">
+      <view class="process-child-box2-content">
+        <view class="process-tr process-head-tr">
+          <view class="process-th">工序名称</view>
+          <view class="process-th">可作数</view>
+        </view>
         <block wx:for="{{ item.child }}" wx:key="process_id" wx:for-item="child" wx:for-index="ci">
-          <view class="process-child-item-box" bind:tap="navDetail" data-index="{{ index+','+ci }}">
+          <view class="process-tr process-tr-active" bind:tap="navDetail"
-            {{ child.process_name }}
+            data-index="{{ index+','+ci }}">
-            <view class="process-child-item-num">{{ child.num }}</view>
+            <view class="process-td">{{ child.process_name }}</view>
+            <view class="process-td">{{ child.num }}</view>
           </view>
         </block>
       </view>

miniprogram/pages/produce/processManage/processManage.wxss

@@ -1,22 +1,19 @@
-.process-box {
+.p_process_name-box {
-  border: 1rpx solid #ddd;
+  background-color: #fff;
-  margin-bottom: 24rpx;
+  position: sticky;
-  border-radius: 8rpx;
+  top: 0;
-}
+  z-index: 2;
-
-.process-child-box {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  column-gap: 32rpx;
-  row-gap: 32rpx;
-  padding: 32rpx 16rpx 24rpx;
 }
 
 .p_process_name {
   font-weight: bold;
-  padding: 16rpx;
+  padding: 16rpx 16rpx;
-  border-bottom: 1rpx solid #ddd;
+  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;
+}

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();
+    }
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml

@@ -17,10 +17,10 @@
         bind:confirm="datePickerConfirm" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
         bind:confirm="datePickerConfirm" />
-      <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
+      <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
         bind:confirm="datePickerConfirm" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="datePickerConfirm" />
     </view>
   </search-popup>
 

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();
+    }
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

miniprogram/pages/purchase/buyOrder/buyOrder.wxml

@@ -18,10 +18,10 @@
         bind:confirm="datePickerConfirm" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
         bind:confirm="datePickerConfirm" />
-      <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
+      <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
         bind:confirm="datePickerConfirm" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="datePickerConfirm" />
     </view>
   </search-popup>
 

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();
+    }
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

miniprogram/pages/purchase/requestOrder/requestOrder.wxml

@@ -18,10 +18,10 @@
         bind:confirm="datePickerConfirm" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
         bind:confirm="datePickerConfirm" />
-      <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
+      <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
         bind:confirm="datePickerConfirm" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="datePickerConfirm" />
     </view>
   </search-popup>
 

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');
+};