精简搜索函数, 添加页面

miniprogram/app.json

@@ -4,6 +4,7 @@
     "pages/agreement/agreement",
     "pages/my/my",
     "pages/processEntry/processEntry",
+    "pages/produce/orderTask/orderTask",
     "pages/produce/processManage/processManage",
     "pages/produce/processManageDetail/processManageDetail",
     "pages/orders/ordersList/ordersList",

miniprogram/assets/icons/生产任务.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1770345434320" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2491" width="64" height="64" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M448 543.6H320c-17.7 0-32-14.3-32-32s14.3-32 32-32h128c17.7 0 32 14.3 32 32 0 17.6-14.4 32-32 32z" fill="#165dff" p-id="2492"></path><path d="M863.2 126.7l0.1 0.1v767.5l-0.1 0.1H161.4l-0.1-0.1V126.8l0.1-0.1h701.8m0.1-64h-702c-35.2 0-64 28.8-64 64v767.7c0 35.2 28.8 64 64 64h702c35.2 0 64-28.8 64-64V126.7c0-35.2-28.8-64-64-64z" fill="#165dff" p-id="2493"></path><path d="M702.6 287.1H319.3c-17.7 0-32-14.3-32-32s14.3-32 32-32h383.3c17.7 0 32 14.3 32 32s-14.4 32-32 32zM702.6 415H319.3c-17.7 0-32-14.3-32-32s14.3-32 32-32h383.3c17.7 0 32 14.3 32 32s-14.4 32-32 32zM545.1 861.7c-8.2 0-16.4-3.1-22.6-9.3L417.4 747.5c-12.5-12.5-12.5-32.7-0.1-45.3 12.5-12.5 32.7-12.5 45.3-0.1L567.7 807c12.5 12.5 12.5 32.7 0.1 45.3-6.3 6.3-14.5 9.4-22.7 9.4z" fill="#165dff" p-id="2494"></path><path d="M545.1 861.7c-8.2 0-16.4-3.1-22.6-9.3-12.5-12.5-12.5-32.7 0-45.3l225.2-225.7c12.5-12.5 32.7-12.5 45.3 0s12.5 32.7 0 45.3L567.7 852.3c-6.2 6.3-14.4 9.4-22.6 9.4z" fill="#165dff" p-id="2495"></path></svg>

miniprogram/pages/base/account/account.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -34,12 +35,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -47,16 +43,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/base/account/account.wxml

@@ -5,11 +5,11 @@
     hideMore="{{true}}">
     <!-- <view slot="content">
       <search-input label="手机号码" value="{{params.crm_phone}}" data-key="crm_phone"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view> -->
   </search-popup>
 

miniprogram/pages/base/customer/customer.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -34,12 +35,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -47,16 +43,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/base/customer/customer.wxml

@@ -4,12 +4,12 @@
     bind:reset="searchReset" value="{{params.crm_name}}" data-key="crm_name">
     <view slot="content">
       <search-input label="手机号码" value="{{params.crm_phone}}" data-key="crm_phone"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
       <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="searchChange" /> -->
     </view>
   </search-popup>
 

miniprogram/pages/base/supplier/supplier.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -34,12 +35,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -47,16 +43,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/base/supplier/supplier.wxml

@@ -4,12 +4,12 @@
     bind:reset="searchReset" value="{{params.crm_name}}" data-key="crm_name">
     <view slot="content">
       <search-input label="手机号码" value="{{params.crm_phone}}" data-key="crm_phone"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
       <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="searchChange" /> -->
     </view>
   </search-popup>
 

miniprogram/pages/components/date-picker-plugin/date-picker-plugin.wxml

@@ -1,7 +1,7 @@
 <t-cell title="{{title || ''}}" hover arrow bindtap="showPicker">
   <view slot="note" style="display: flex;align-items: center;column-gap: 12rpx;">
-    <view>{{value || ''}}</view>
+    <view style="color: {{value? '#000': ''}}">{{value || ''}}</view>
-    <t-icon wx:if="{{value}}" name="close-circle-filled" catch:tap="onClear"></t-icon>
+    <t-icon wx:if="{{value}}" name="close-circle-filled" catch:tap="onClear" />
     <text wx:else>{{placeholder || title || '选择日期'}}</text>
   </view>
 </t-cell>

miniprogram/pages/components/page-plugin/page-plugin.ts

@@ -78,7 +78,7 @@ Component({
               this.triggerEvent('handleLogin', true);
             }
           })
-          .catch((err) => {
+          .catch(() => {
             this.triggerEvent('handleLogin', false);
           });
       } else {

miniprogram/pages/components/select-plugin/select-plugin.wxml

@@ -1,15 +1,13 @@
 <t-cell title="{{title || ''}}" arrow hover bind:click="onOpenPicker">
   <view slot="note" style="display: flex;align-items: center;column-gap: 12rpx;">
-    <view>{{note || ''}}</view>
+    <view style="color: {{value? '#000': ''}}">{{note || ''}}</view>
-    <t-icon wx:if="{{value}}" name="close-circle-filled" catch:tap="onClear"></t-icon>
+    <t-icon wx:if="{{value}}" name="close-circle-filled" catch:tap="onClear" />
     <text wx:else>{{placeholder || title}}</text>
   </view>
 </t-cell>
 <t-picker visible="{{show}}" value="{{[value]}}" data-key="value" title="{{title || ''}}"
   cancelBtn="取消" confirmBtn="确认" bind:confirm="onConfirm" bindcancel="onPickerCancel">
   <t-picker-item options="{{options || []}}">
-    <block wx:for="{{options || []}}" wx:key="value">
+    <block wx:for="{{options || []}}" wx:key="value">{{item.label}}</block>
-      {{item.label}}
-    </block>
   </t-picker-item>
 </t-picker>

miniprogram/pages/finance/flow/flow.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -39,12 +40,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -52,16 +48,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/finance/flow/flow.wxml

@@ -5,19 +5,19 @@
     <view slot="content">
 
       <!-- <search-input label="付款账户" value="{{params.account_name}}" data-key="account_name"
-        bind:change="searchChange2" /> -->
+        bind:change="searchChange" /> -->
 
-      <!-- <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="onOptionChange"
+      <!-- <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="searchChange"
         mode="radio" options="{{states}}" data-key="state" /> -->
 
       <date-picker-plugin title="交易开始日期" value="{{params.pay_dateL}}" data-key="pay_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="交易结束日期" value="{{params.pay_dateU}}" data-key="pay_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="searchChange" /> -->
     </view>
   </search-popup>
 

miniprogram/pages/finance/giro/giro.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -39,12 +40,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -52,16 +48,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/finance/giro/giro.wxml

@@ -5,19 +5,19 @@
     <view slot="content">
 
       <search-input label="付款账户" value="{{params.account_name}}" data-key="account_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="onOptionChange"
+      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="searchChange"
         mode="radio" options="{{states}}" data-key="state" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="searchChange" /> -->
     </view>
   </search-popup>
 

miniprogram/pages/finance/income/income.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -39,12 +40,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -52,16 +48,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/finance/income/income.wxml

@@ -4,23 +4,23 @@
     bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no">
     <view slot="content">
       <search-input label="销售单号" value="{{params.rel_bill_no}}" data-key="rel_bill_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="收入账户" value="{{params.account_name}}" data-key="account_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="往来单位" value="{{params.crm_name}}" data-key="crm_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="onOptionChange"
+      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="searchChange"
         mode="radio" options="{{states}}" data-key="state" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="searchChange" /> -->
     </view>
   </search-popup>
 

miniprogram/pages/finance/outcome/outcome.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -39,12 +40,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -52,16 +48,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/finance/outcome/outcome.wxml

@@ -4,23 +4,23 @@
     bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no">
     <view slot="content">
       <search-input label="销售单号" value="{{params.rel_bill_no}}" data-key="rel_bill_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="收入账户" value="{{params.account_name}}" data-key="account_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="往来单位" value="{{params.crm_name}}" data-key="crm_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="onOptionChange"
+      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="searchChange"
         mode="radio" options="{{states}}" data-key="state" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="searchChange" /> -->
     </view>
   </search-popup>
 

miniprogram/pages/logs/loginLog/loginLog.ts

@@ -1,5 +1,12 @@
 import { loginStatus, post } from '@/utils/https';
-import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util';
+import {
+  cloneLite,
+  getAuthInfo,
+  getDataSet,
+  searchValueFormat,
+  toArray,
+  toNumber,
+} from '@/utils/util';
 
 const defaultParams = { curr_page: 1, page_count: 20 };
 
@@ -25,12 +32,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -38,16 +40,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/logs/loginLog/loginLog.wxml

@@ -4,11 +4,11 @@
     bind:reset="searchReset" value="{{params.login_name}}" data-key="login_name">
     <view slot="content">
       <search-input label="登录IP" value="{{params.login_ip}}" data-key="login_ip"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <date-picker-plugin title="登录开始日期" value="{{params.login_timeL}}" data-key="login_timeL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="登录结束日期" value="{{params.login_timeU}}" data-key="login_timeU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>
 

miniprogram/pages/logs/operateLog/operateLog.ts

@@ -1,5 +1,12 @@
 import { loginStatus, post } from '@/utils/https';
-import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util';
+import {
+  cloneLite,
+  getAuthInfo,
+  getDataSet,
+  searchValueFormat,
+  toArray,
+  toNumber,
+} from '@/utils/util';
 
 const defaultParams = { curr_page: 1, page_count: 20 };
 
@@ -25,12 +32,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -38,16 +40,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/logs/operateLog/operateLog.wxml

@@ -4,12 +4,12 @@
     bind:reset="searchReset" value="{{params.login_name}}" data-key="login_name">
     <view slot="content">
       <search-input label="操作IP" value="{{params.client_ip}}" data-key="client_ip"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
       <date-picker-plugin title="操作开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="操作结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>
 

miniprogram/pages/manage/department/department.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -37,12 +38,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -50,16 +46,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/manage/department/department.wxml

@@ -4,19 +4,19 @@
     bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no">
     <view slot="content">
       <search-input label="销售单号" value="{{params.rel_bill_no}}" data-key="rel_bill_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="收入账户" value="{{params.account_name}}" data-key="account_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="往来单位" value="{{params.crm_name}}" data-key="crm_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="onOptionChange"
+      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="searchChange"
         mode="radio" options="{{states}}" data-key="state" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup> -->
 

miniprogram/pages/manage/group/group.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -37,12 +38,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -50,16 +46,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/manage/group/group.wxml

@@ -4,19 +4,19 @@
     bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no">
     <view slot="content">
       <search-input label="销售单号" value="{{params.rel_bill_no}}" data-key="rel_bill_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="收入账户" value="{{params.account_name}}" data-key="account_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="往来单位" value="{{params.crm_name}}" data-key="crm_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="onOptionChange"
+      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="searchChange"
         mode="radio" options="{{states}}" data-key="state" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup> -->
 

miniprogram/pages/manage/staff/staff.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -44,12 +45,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -57,16 +53,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/manage/staff/staff.wxml

@@ -4,18 +4,17 @@
     bind:reset="searchReset" value="{{params.login_name}}" data-key="login_name">
     <view slot="content">
       <search-input label="手机" value="{{params.user_phone}}" data-key="user_phone"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
       <option-cell-plugin title="组织架构" value="{{params.department_id || ''}}"
-        bind:change="onOptionChange" mode="radio" options="{{depOption}}"
+        bind:change="searchChange" mode="radio" options="{{depOption}}" data-key="department_id" />
-        data-key="department_id" />
+      <option-cell-plugin title="组织架构" value="{{params.group_id || ''}}" bind:change="searchChange"
-      <option-cell-plugin title="组织架构" value="{{params.group_id || ''}}"
+        mode="radio" options="{{groupsOption}}" data-key="group_id" />
-        bind:change="onOptionChange" mode="radio" options="{{groupsOption}}" data-key="group_id" />
 
       <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="searchChange" /> -->
     </view>
   </search-popup>
 

miniprogram/pages/orders/orderSort/orderSort.ts

@@ -22,10 +22,9 @@ Page({
     post('Orders/getLiteOrders')
       .then((res: any) => {
         const list = toArray(res.data);
-        wx.stopPullDownRefresh();
+        this.setData({ list });
-        this.setData({ list: list });
       })
-      .catch(() => {
+      .finally(() => {
         wx.stopPullDownRefresh();
       });
   },
@@ -45,7 +44,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad(options) {},
+  onLoad(_options) {},
 
   /**
    * 生命周期函数--监听页面初次渲染完成

miniprogram/pages/orders/ordersList/ordersList.ts

@@ -9,6 +9,7 @@ import {
   getAuthInfo,
   getDataSet,
   getDay,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -67,12 +68,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -80,16 +76,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/orders/ordersList/ordersList.wxml

@@ -4,36 +4,36 @@
     bind:reset="searchReset" value="{{params.order_no}}" data-key="order_no">
     <view slot="content">
       <search-input label="自定义单号" value="{{params.custom_order_no}}" data-key="custom_order_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="经销商名称" value="{{params.custom_name}}" data-key="custom_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="经销商手机" value="{{params.custom_phone}}" data-key="custom_phone"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="客户名称" value="{{params.end_user_name}}" data-key="end_user_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="客户手机" value="{{params.end_user_phone}}" data-key="end_user_phone"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="客户地址" value="{{params.end_user_address}}" data-key="end_user_address"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="订单阶段" value="{{params.order_step}}" bind:change="onOptionChange"
+      <option-cell-plugin title="订单阶段" value="{{params.order_step}}" bind:change="searchChange"
         mode="checkbox" options="{{orderStep}}" data-key="order_step" />
 
-      <option-cell-plugin title="生产状态" value="{{params.process_state}}" bind:change="onOptionChange"
+      <option-cell-plugin title="生产状态" value="{{params.process_state}}" bind:change="searchChange"
-        mode="checkbox" data-key="process_state" options="{{saleOrderProcessStateOption}}" />
+        mode="checkbox" options="{{saleOrderProcessStateOption}}" data-key="process_state" />
 
       <option-cell-plugin title="收款状态" value="{{params.payed_state || ''}}"
-        bind:change="onOptionChange" mode="radio" options="{{payedStateOption}}"
+        bind:change="searchChange" mode="radio" options="{{payedStateOption}}"
         data-key="payed_state" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.document_dateL}}" data-key="document_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.document_dateU}}" data-key="document_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>
 

miniprogram/pages/other/batch/batch.ts

@@ -1,5 +1,12 @@
 import { loginStatus, post } from '@/utils/https';
-import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util';
+import {
+  cloneLite,
+  getAuthInfo,
+  getDataSet,
+  searchValueFormat,
+  toArray,
+  toNumber,
+} from '@/utils/util';
 
 const defaultParams = { curr_page: 1, page_count: 20 };
 
@@ -30,12 +37,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -43,16 +45,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/other/batch/batch.wxml

@@ -4,23 +4,23 @@
     bind:reset="searchReset" value="{{params.batch_no}}" data-key="batch_no">
     <view slot="content">
       <search-input label="自定义批号" value="{{params.batch_custom_no}}" data-key="batch_custom_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
-      <!-- <option-cell-plugin title="订单阶段" value="{{params.order_step}}" bind:change="onOptionChange"
+      <!-- <option-cell-plugin title="订单阶段" value="{{params.order_step}}" bind:change="searchChange"
         mode="checkbox" options="{{orderStep}}" data-key="order_step" /> -->
 
       <select-plugin title="仓库" options="{{depots}}" value="{{params.depot_id}}"
-        bind:change="onOptionChange" data-key="depot_id" />
+        bind:change="searchChange" data-key="depot_id" />
       <select-plugin title="供应商" options="{{crms}}" value="{{params.supplier_id}}"
-        bind:change="onOptionChange" data-key="supplier_id" />
+        bind:change="searchChange" data-key="supplier_id" />
 
       <date-picker-plugin title="保质期开始日期" value="{{params.expire_dateL}}" data-key="expire_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="保质期结束日期" value="{{params.expire_dateU}}" data-key="expire_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>
 

miniprogram/pages/other/batchDetail/batchDetail.ts

@@ -1,5 +1,12 @@
 import { loginStatus, post } from '@/utils/https';
-import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util';
+import {
+  cloneLite,
+  getAuthInfo,
+  getDataSet,
+  searchValueFormat,
+  toArray,
+  toNumber,
+} from '@/utils/util';
 
 const defaultParams = { curr_page: 1, page_count: 20, batch_id: '' };
 
@@ -28,12 +35,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -41,16 +43,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/other/goods/goods.ts

@@ -1,5 +1,12 @@
 import { loginStatus, post } from '@/utils/https';
-import { cloneLite, getAuthInfo, getDataSet, toArray, toNumber } from '@/utils/util';
+import {
+  cloneLite,
+  getAuthInfo,
+  getDataSet,
+  searchValueFormat,
+  toArray,
+  toNumber,
+} from '@/utils/util';
 
 const defaultParams = { curr_page: 1, page_count: 20 };
 
@@ -28,12 +35,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -41,16 +43,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/other/goods/goods.wxml

@@ -4,20 +4,20 @@
     bind:reset="searchReset" value="{{params.goods_name}}" data-key="goods_name">
     <view slot="content">
       <search-input label="商品编码" value="{{params.goods_code}}" data-key="goods_code"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="助记码" value="{{params.sku_alias}}" data-key="sku_alias"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <!-- <option-cell-plugin title="订单阶段" value="{{params.order_step}}" bind:change="onOptionChange"
+      <!-- <option-cell-plugin title="订单阶段" value="{{params.order_step}}" bind:change="searchChange"
         mode="checkbox" options="{{orderStep}}" data-key="order_step" /> -->
       <select-plugin title="仓库" options="{{depots}}" value="{{params.depot_id}}"
-        bind:change="onOptionChange" data-key="depot_id" />
+        bind:change="searchChange" data-key="depot_id" />
       <select-plugin title="商品分类" options="{{goodsClass}}" value="{{params.goods_class}}"
-        bind:change="onOptionChange" data-key="goods_class" />
+        bind:change="searchChange" data-key="goods_class" />
       <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>
 

miniprogram/pages/other/goodsDetail/goodsDetail.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -31,17 +32,11 @@ Page({
   },
   init() {
     this.setData({ authInfo: getAuthInfo() });
-
     this.getGoodsAttr();
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -49,16 +44,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList();
   },

miniprogram/pages/other/goodsDetail/goodsDetail.wxml

@@ -4,15 +4,15 @@
     bind:reset="searchReset" value="{{params.order_no}}" data-key="order_no">
     <view slot="content">
       <search-input label="自定义单号" value="{{params.custom_order_no}}" data-key="custom_order_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="订单阶段" value="{{params.order_step}}" bind:change="onOptionChange"
+      <option-cell-plugin title="订单阶段" value="{{params.order_step}}" bind:change="searchChange"
         mode="checkbox" options="{{orderStep}}" data-key="order_step" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.document_dateL}}" data-key="document_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.document_dateU}}" data-key="document_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
      
     </view>
   </search-popup> -->

miniprogram/pages/other/outbound/outbound.ts

@@ -4,6 +4,7 @@ import {
   getAuthInfo,
   getDataSet,
   getDay,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -40,12 +41,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -53,16 +49,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/other/outbound/outbound.wxml

@@ -4,19 +4,19 @@
     bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no">
     <view slot="content">
       <search-input label="销售单号" value="{{params.rel_bill_no}}" data-key="rel_bill_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="onOptionChange"
+      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="searchChange"
         mode="radio" options="{{states}}" data-key="state" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>
 

miniprogram/pages/other/transfer/transfer.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -39,12 +40,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -52,16 +48,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/other/transfer/transfer.wxml

@@ -4,18 +4,18 @@
     bind:reset="searchReset" value="{{params.bill_no}}" data-key="bill_no">
     <view slot="content">
       <!-- <search-input label="销售单号" value="{{params.rel_bill_no}}" data-key="rel_bill_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
-      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="onOptionChange"
+      <option-cell-plugin title="单据状态" value="{{params.state || ''}}" bind:change="searchChange"
         mode="radio" options="{{states}}" data-key="state" /> -->
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="searchChange" /> -->
     </view>
   </search-popup>
 

miniprogram/pages/produce/orderTask/orderTask.json

@@ -0,0 +1,18 @@
+{
+  "usingComponents": {
+    "search-popup": "/pages/components/search-popup/search-popup",
+    "card-plugin": "/pages/components/card-plugin/card-plugin",
+    "card-item-plugin": "/pages/components/card-item-plugin/card-item-plugin",
+    "option-cell-plugin": "/pages/components/option-cell-plugin/option-cell-plugin",
+    "date-picker-plugin": "/pages/components/date-picker-plugin/date-picker-plugin",
+    "sort-plugin": "/pages/components/sort-plugin/sort-plugin",
+    "count-plugin": "/pages/components/count-plugin/count-plugin",
+    "total-bar-plugin": "/pages/components/total-bar-plugin/total-bar-plugin",
+    "popup-plugin": "/pages/components/popup-plugin/popup-plugin",
+    "pagination-plugin": "/pages/components/pagination-plugin/pagination-plugin",
+    "search-input": "/pages/components/search-input/search-input",
+    "t-cell": "tdesign-miniprogram/cell/cell",
+    "t-cell-group": "tdesign-miniprogram/cell-group/cell-group"
+  },
+  "navigationBarTitleText": "生产任务"
+}

miniprogram/pages/produce/orderTask/orderTask.ts

@@ -0,0 +1,150 @@
+import { loginStatus, post } from '@/utils/https';
+import { SaleOrderProcessStateOption } from '@/utils/config';
+import {
+  cloneLite,
+  getAuthInfo,
+  getDataSet,
+  searchValueFormat,
+  toArray,
+  toNumber,
+} from '@/utils/util';
+
+const defaultParams = { curr_page: 1, page_count: 20, process_state: [200] };
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    params: cloneLite(defaultParams) as any,
+    list: [] as any[],
+    count: 0,
+    saleOrderProcessStateOption: SaleOrderProcessStateOption,
+    sort: [{ label: '创建日期', value: 'create_date' }],
+    detail: { show: false, title: '', data: [] as any[] },
+  },
+  handleLogin(e: any) {
+    this.setData({ isLogin: e.detail });
+    if (e.detail) {
+      this.init();
+    }
+  },
+  init() {
+    this.setData({ authInfo: getAuthInfo() });
+    this.getList();
+  },
+  searchChange(e: any) {
+    const key = getDataSet(e).key;
+    const val = searchValueFormat(e.detail.value);
+    if (val) {
+      this.data.params[key] = val;
+    } else {
+      delete this.data.params[key];
+    }
+    this.setData({ params: this.data.params });
+  },
+  searchOk() {
+    this.getList(1);
+  },
+  searchReset() {
+    this.data.params = cloneLite(defaultParams);
+    this.getList(1);
+  },
+  onSort(e: any) {
+    this.data.params.order = e.detail.value;
+    this.setData({ params: this.data.params });
+    this.getList(1);
+  },
+  paginationChange(e: any) {
+    this.getList(e.detail.curr_page);
+  },
+  getList(curr: number = 1) {
+    this.data.params.curr_page = curr;
+    this.setData({ params: this.data.params });
+    const temp = cloneLite(this.data.params);
+    if (temp.process_state && temp.process_state.length) {
+      temp.process_state = temp.process_state.join(',');
+    } else {
+      delete temp.process_state;
+    }
+
+    post('ProduceOrder/getListV2', temp).then((res: any) => {
+      const list = toArray(res.data);
+      if (list.length == 0 && this.data.params.curr_page > 1) {
+        this.getList(this.data.params.curr_page - 1);
+      }
+      this.setData({ count: toNumber(res.count), list });
+    });
+  },
+
+  onDetail(e: any) {
+    const data = getDataSet(e);
+    const index = data.index;
+    const index2 = data.index2;
+    const item = this.data.list[index];
+    const item2 = item?.produce_info[index2] || {};
+    // console.log(index, index2, item);
+    this.setData({
+      detail: {
+        show: true,
+        title: `${item2.goods_name} 流程配置`,
+        data: toArray(item2.produce_info_process),
+      },
+    });
+  },
+  onClose() {
+    this.data.detail.show = false;
+    this.setData({ detail: this.data.detail });
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(_options) {},
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {},
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    this.setData({ loading: true });
+    loginStatus()
+      .then(() => {
+        this.setData({ isLogin: true, loading: false });
+        this.init();
+      })
+      .catch((err) => {
+        this.setData({ isLogin: false, loading: false });
+        console.log('调用登录状态请求失败', err);
+      });
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {},
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {},
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {},
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {},
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {},
+});

miniprogram/pages/produce/orderTask/orderTask.wxml

@@ -0,0 +1,76 @@
+<page-plugin isAuth="{{authInfo['SF_ERP_PRODUCT_TASK_VIEW']}}" loading="{{loading}}"
+  is-login="{{isLogin}}" bind:handleLogin="handleLogin">
+  <search-popup placeholder="输入销售单号" bind:change="searchChange" bind:ok="searchOk"
+    bind:reset="searchReset" value="{{params.order_no}}" data-key="order_no">
+    <view slot="content">
+      <search-input label="自定义单号" value="{{params.custom_order_no}}" data-key="custom_order_no"
+        bind:change="searchChange" />
+      <search-input label="经销商名称" value="{{params.custom_name}}" data-key="custom_name"
+        bind:change="searchChange" />
+      <!-- <search-input label="经销商手机" value="{{params.custom_phone}}" data-key="custom_phone"
+        bind:change="searchChange" /> -->
+      <search-input label="客户名称" value="{{params.end_user_name}}" data-key="end_user_name"
+        bind:change="searchChange" />
+      <search-input label="客户手机" value="{{params.end_user_phone}}" data-key="end_user_phone"
+        bind:change="searchChange" />
+      <search-input label="客户地址" value="{{params.end_user_address}}" data-key="end_user_address"
+        bind:change="searchChange" />
+
+      <option-cell-plugin title="生产状态" value="{{params.process_state}}" bind:change="searchChange"
+        mode="checkbox" data-key="process_state" options="{{saleOrderProcessStateOption}}" />
+
+      <!-- <option-cell-plugin title="收款状态" value="{{params.payed_state || ''}}"
+        bind:change="searchChange" mode="radio" options="{{payedStateOption}}"
+        data-key="payed_state" /> -->
+
+      <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
+        bind:confirm="searchChange" />
+      <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
+        bind:confirm="searchChange" /> -->
+    </view>
+  </search-popup>
+
+  <count-plugin count="{{count}}">
+    <!-- <sort-plugin options="{{sort}}" bind:ok="onSort" value="{{params.order}}" slot="right" /> -->
+  </count-plugin>
+
+  <empty-plugin wx:if="{{list.length == 0}}" />
+  <card-plugin wx:for="{{ list }}" wx:key="order_no" wx:for-index="i">
+    <view slot="header">{{ item.order_no }}</view>
+    <view slot="content">
+      <card-item-plugin wx:if="{{item.custom_order_no}}" label="自定义单号"
+        value="{{item.custom_order_no}}" />
+      <card-item-plugin wx:if="{{item.custom_name}}" label="经销商名称" value="{{item.custom_name}}" />
+      <card-item-plugin wx:if="{{item.custom_phone}}" label="经销商手机" value="{{item.custom_phone}}" />
+      <card-item-plugin wx:if="{{item.end_user_name}}" label="客户名称"
+        value="{{item.end_user_name}}" />
+      <card-item-plugin wx:if="{{item.end_user_phone}}" label="客户手机"
+        value="{{item.end_user_phone}}" />
+      <card-item-plugin wx:if="{{item.end_user_address}}" label="客户地址"
+        value="{{item.end_user_address}}" />
+    </view>
+    <view wx:if="{{item.produce_info.length}}" slot="footer" class="card-plugin-footer"
+      style="flex-direction: column;">
+      <t-cell-group title="产品名称">
+        <block wx:for="{{item.produce_info}}" wx:key="index" wx:for-item="produce">
+          <t-cell title="{{produce.goods_name}}" bind:tap="onDetail" data-index="{{i}}"
+            data-index2="{{index}}" hover arrow />
+        </block>
+      </t-cell-group>
+    </view>
+  </card-plugin>
+  <pagination-plugin curr_page="{{params.curr_page}}" page_count="{{params.page_count}}"
+    total="{{count}}" bind:change="paginationChange" />
+</page-plugin>
+<popup-plugin visible="{{ detail.show }}" bind:close="onClose" title="{{detail.title}}">
+  <view style="padding: 24rpx;">
+    <card-plugin wx:for="{{ detail.data }}" wx:key="p_process_id" showAll="1">
+      <view slot="header">{{ item.p_process_name }}</view>
+      <view slot="content">
+        <card-item-plugin wx:for="{{ item.children }}" wx:key="process_id"
+          label="{{item.c_process_name}}" value="{{item.bonus_nums}}"
+          customStyle="color: {{item.state == 2 ? '#2ba471': ''}};" />
+      </view>
+    </card-plugin>
+  </view>
+</popup-plugin>

miniprogram/pages/produce/processManage/processManage.json

@@ -1,5 +1,6 @@
 {
   "usingComponents": { },
-  "navigationBarTitleText": "流程管理"
+  "navigationBarTitleText": "流程管理",
+  "enablePullDownRefresh": true
 }
 

miniprogram/pages/produce/processManage/processManage.ts

@@ -8,6 +8,7 @@ Page({
   data: {
     process: [] as any[],
     isFirstEnter: true,
+    isLogin: false,
   },
   navDetail(e: any) {
     const index = getDataSet(e).index.split(',');
@@ -31,8 +32,12 @@ Page({
     this.getList();
   },
   getList() {
-    post('CompanyProcessV2/getAllProcessNum').then((res: any) => {
+    post('CompanyProcessV2/getAllProcessNum')
+      .then((res: any) => {
         this.setData({ process: toArray(res.data) });
+      })
+      .finally(() => {
+        wx.stopPullDownRefresh();
       });
   },
   /**
@@ -78,7 +83,11 @@ Page({
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh() {},
+  onPullDownRefresh() {
+    if (this.data.isLogin) {
+      this.getList();
+    }
+  },
 
   /**
    * 页面上拉触底事件的处理函数

miniprogram/pages/produce/processManageDetail/processManageDetail.ts

@@ -1,5 +1,13 @@
 import { loginStatus, post } from '@/utils/https';
-import { cloneLite, getAuthInfo, getDataSet, toArray, toastSuccess, toNumber } from '@/utils/util';
+import {
+  cloneLite,
+  getAuthInfo,
+  getDataSet,
+  searchValueFormat,
+  toArray,
+  toastSuccess,
+  toNumber,
+} from '@/utils/util';
 
 const defaultParams = { curr_page: 1, page_count: 20, state: '1', process_id: '' };
 
@@ -30,12 +38,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {

miniprogram/pages/produce/processManageDetail/processManageDetail.wxml

@@ -4,19 +4,19 @@
     bind:change="searchChange" bind:ok="searchOk" bind:reset="searchReset">
     <view slot="content">
       <search-input label="自定义单号" value="{{params.custom_order_no}}" data-key="custom_order_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="经销商名称" value="{{params.custom_name}}" data-key="custom_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="经销商手机" value="{{params.custom_phone}}" data-key="custom_phone"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="经销商地址" value="{{params.custom_address}}" data-key="custom_address"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="客户名称" value="{{params.end_user_name}}" data-key="end_user_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="客户手机" value="{{params.end_user_phone}}" data-key="end_user_phone"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="客户地址" value="{{params.end_user_address}}" data-key="end_user_address"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
     </view>
   </search-popup>
   <view class="tabs">

miniprogram/pages/purchase/backOrder/backOrder.ts

@@ -3,6 +3,7 @@ import {
   cloneLite,
   getAuthInfo,
   getDataSet,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -41,12 +42,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -54,16 +50,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/purchase/backOrder/backOrder.wxml

@@ -5,21 +5,21 @@
     <view slot="content">
 
       <search-input label="供应商名称" value="{{params.crm_name}}" data-key="crm_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="关联单据" value="{{params.rel_bill_no}}" data-key="rel_bill_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="结算状态" bind:change="onOptionChange" value="{{params.pay_state}}"
+      <option-cell-plugin title="结算状态" bind:change="searchChange" value="{{params.pay_state}}"
         mode="checkbox" options="{{payState}}" data-key="pay_state" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <!-- <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" /> -->
+        bind:confirm="searchChange" /> -->
     </view>
   </search-popup>
 

miniprogram/pages/purchase/buyInOrder/buyInOrder.ts

@@ -4,6 +4,7 @@ import {
   getAuthInfo,
   getDataSet,
   getDay,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -42,12 +43,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -55,16 +51,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/purchase/buyInOrder/buyInOrder.wxml

@@ -5,22 +5,21 @@
     <view slot="content">
 
       <search-input label="供应商名称" value="{{params.crm_name}}" data-key="crm_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="关联单据" value="{{params.rel_bill_no}}" data-key="rel_bill_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="结算状态" bind:change="onOptionChange"
+      <option-cell-plugin title="结算状态" bind:change="searchChange" value="{{params.pay_state || ''}}"
-        value="{{params.pay_state || ''}}" options="{{payState}}" mode="radio"
+        options="{{payState}}" mode="radio" data-key="pay_state" />
-        data-key="pay_state" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>
 

miniprogram/pages/purchase/buyOrder/buyOrder.ts

@@ -4,6 +4,7 @@ import {
   getAuthInfo,
   getDataSet,
   getDay,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -40,12 +41,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -53,16 +49,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/purchase/buyOrder/buyOrder.wxml

@@ -5,23 +5,23 @@
     <view slot="content">
 
       <search-input label="供应商名称" value="{{params.crm_name}}" data-key="crm_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="结算账户" value="{{params.account_name}}" data-key="account_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="关联单据" value="{{params.rel_bill_no}}" data-key="rel_bill_no"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
 
-      <option-cell-plugin title="单据状态" bind:change="onOptionChange" value="{{params.states}}"
+      <option-cell-plugin title="单据状态" bind:change="searchChange" value="{{params.states}}"
         mode="checkbox" options="{{states}}" data-key="states" />
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>
 

miniprogram/pages/purchase/requestOrder/requestOrder.ts

@@ -4,6 +4,7 @@ import {
   getAuthInfo,
   getDataSet,
   getDay,
+  searchValueFormat,
   showModal,
   sleep,
   toArray,
@@ -40,12 +41,7 @@ Page({
   },
   searchChange(e: any) {
     const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
+    const val = searchValueFormat(e.detail.value);
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
     if (val) {
       this.data.params[key] = val;
     } else {
@@ -53,16 +49,6 @@ Page({
     }
     this.setData({ params: this.data.params });
   },
-  onOptionChange(e: any) {
-    const key = getDataSet(e).key;
-    this.data.params[key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
-  datePickerConfirm(e: any) {
-    const data = getDataSet(e);
-    this.data.params[data.key] = e.detail.value;
-    this.setData({ params: this.data.params });
-  },
   searchOk() {
     this.getList(1);
   },

miniprogram/pages/purchase/requestOrder/requestOrder.wxml

@@ -5,23 +5,23 @@
     <view slot="content">
 
       <!-- <search-input label="供应商名称" value="{{params.crm_name}}" data-key="crm_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="结算账户" value="{{params.account_name}}" data-key="account_name"
-        bind:change="searchChange2" />
+        bind:change="searchChange" />
       <search-input label="关联单据" value="{{params.rel_bill_no}}" data-key="rel_bill_no"
-        bind:change="searchChange2" /> -->
+        bind:change="searchChange" /> -->
 
-      <!-- <option-cell-plugin title="单据状态" bind:change="onOptionChange" value="{{params.states}}"
+      <!-- <option-cell-plugin title="单据状态" bind:change="searchChange" value="{{params.states}}"
         mode="checkbox" options="{{states}}" data-key="states" /> -->
 
       <date-picker-plugin title="单据开始日期" value="{{params.bill_dateL}}" data-key="bill_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="单据结束日期" value="{{params.bill_dateU}}" data-key="bill_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建开始日期" value="{{params.create_dateL}}" data-key="create_dateL"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
       <date-picker-plugin title="创建结束日期" value="{{params.create_dateU}}" data-key="create_dateU"
-        bind:confirm="datePickerConfirm" />
+        bind:confirm="searchChange" />
     </view>
   </search-popup>
 

miniprogram/utils/https.ts

@@ -74,12 +74,12 @@ const request = (url: string, options: any, config = { showLoading: true, showEr
 };
 
 // 封装get方法
-export const get = (url: string, data = {}, config?: any): any => {
+export const get = (url: string, data = {}, config?: any) => {
   return request(url, { method: 'GET', data }, config);
 };
 
 // 封装post方法
-export const post = (url: string, data = {}, config?: any): any => {
+export const post = (url: string, data = {}, config?: any) => {
   return request(url, { method: 'POST', data }, config);
 };
 

miniprogram/utils/menuConfig.ts

@@ -25,11 +25,11 @@ export const menuConfig = [
     icon: 'tools',
     iconColor: iconColor,
     children: [
-      // {
+      {
-      //   title: "生产任务",
+        title: '生产任务',
-      //   url: "/pages/produce/orderTask/orderTask",
+        url: '/pages/produce/orderTask/orderTask',
-      //   auth: "SF_ERP_PRODUCT_TASK_VIEW",
+        auth: 'SF_ERP_PRODUCT_TASK_VIEW',
-      // },
+      },
       {
         title: '流程管理',
         url: '/pages/produce/processManage/processManage',

miniprogram/utils/util.ts

@@ -357,9 +357,6 @@ export const numRetentionDigitsString = (value?: number) => {
 
 /**
  * sleep
- * @param callback 回调函数
- * @param ms 毫秒, 默认300ms
- * @returns
  */
 export const sleep = (callback?: () => void, ms = 300): Promise<boolean> => {
   return new Promise((resolve) => {
@@ -370,6 +367,9 @@ export const sleep = (callback?: () => void, ms = 300): Promise<boolean> => {
   });
 };
 
+export const searchValueFormat = (value: any) =>
+  isArray(value) || isObject(value) ? value : `${value || ''}`.trim();
+
 export const cloneLite = (data: any) => JSON.parse(JSON.stringify(data));
 
 /** 转换文件大小 */

package-lock.json

@@ -8,12 +8,12 @@
       "name": "miniprogram-ts-quickstart",
       "version": "1.0.0",
       "dependencies": {
+        "@types/big.js": "^6.2.2",
         "big.js": "v6.2.2",
         "dayjs": "^1.11.19",
         "tdesign-miniprogram": "^1.12.1"
       },
       "devDependencies": {
-        "@types/big.js": "^6.2.2",
         "miniprogram-api-typings": "^4.1.2"
       }
     },
@@ -21,7 +21,6 @@
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/@types/big.js/-/big.js-6.2.2.tgz",
       "integrity": "sha512-e2cOW9YlVzFY2iScnGBBkplKsrn2CsObHQ2Hiw4V1sSyiGbgWL8IyqE3zFi1Pt5o1pdAtYkDAIsF3KKUPjdzaA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/big.js": {

package.json

@@ -7,12 +7,12 @@
   "author": "",
   "license": "",
   "dependencies": {
+    "@types/big.js": "^6.2.2",
     "big.js": "v6.2.2",
     "dayjs": "^1.11.19",
     "tdesign-miniprogram": "^1.12.1"
   },
   "devDependencies": {
-    "@types/big.js": "^6.2.2",
     "miniprogram-api-typings": "^4.1.2"
   }
 }