精简搜索函数, 添加页面

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;
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
+    const val = searchValueFormat(e.detail.value);
     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;
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
+    const val = searchValueFormat(e.detail.value);
     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;
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
+    const val = searchValueFormat(e.detail.value);
     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;
-    this.setData({ params: this.data.params });
-  },
-  searchChange2(e: any) {
-    const key = getDataSet(e).key;
-    const val = `${e.detail.value || ''}`.trim();
+    const val = searchValueFormat(e.detail.value);
     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>