xiaohaizhao 2 лет назад
Родитель
Сommit
1d794be0f9
2 измененных файлов с 28 добавлено и 1 удалено
  1. 13 0
      components/Yl_Filtrate1/index.js
  2. 15 1
      components/Yl_Filtrate1/index.wxml

+ 13 - 0
components/Yl_Filtrate1/index.js

@@ -33,6 +33,13 @@ Component({
         dateRange: {
             type: Boolean
         }, //是否开启日期范围筛选
+        dateRangeName: {
+            type: String,
+            value: "日期范围"
+        },
+        dateRange1: {
+            type: Boolean
+        }, //是否开启日期范围筛选
         zIndex: {
             type: String,
             value: 99999,
@@ -48,6 +55,8 @@ Component({
     data: {
         startdate: "", //开始时间
         enddate: "", //结束时间
+        periodstart: "",
+        periodend: "",
     },
     lifetimes: {
         ready() {
@@ -125,6 +134,10 @@ Component({
                 obj.startdate = this.data.startdate;
                 obj.enddate = this.data.enddate;
             };
+            if (this.data.dateRange1) {
+                obj.periodstart = this.data.periodstart;
+                obj.periodend = this.data.periodend;
+            };
             this.triggerEvent("handle", obj);
             this.onClose();
         },

+ 15 - 1
components/Yl_Filtrate1/index.wxml

@@ -14,7 +14,7 @@
         </block>
         <view wx:if="{{dateRange}}" class="groud">
             <view class="label">
-                日期范围
+                {{dateRangeName}}
             </view>
             <view class="content time">
                 <picker mode="date" bindchange='changeDate' data-name="startdate">
@@ -26,6 +26,20 @@
                 </picker>
             </view>
         </view>
+        <view wx:if="{{dateRange1}}" class="groud">
+            <view class="label">
+                预测时间
+            </view>
+            <view class="content time">
+                <picker mode="date" bindchange='changeDate' data-name="periodstart">
+                    <view class="tbox">{{periodstart||'开始日期'}}</view>
+                </picker>
+                <view class="partition">-</view>
+                <picker mode="date" bindchange='changeDate' data-name="periodend">
+                    <view class="tbox">{{periodend||"结束日期"}}</view>
+                </picker>
+            </view>
+        </view>
         <slot />
     </Yl_ListBox>
     <view class="footer" bindtap="onClick">