Merge branch 'spp' into 'master'

Spp

See merge request !38

src/views/tabbar/Home.vue

@@ -84,7 +84,11 @@
           </div>
           <div class="material" v-if="item.no_pay_order">
             <div class="item-title bz-title">待支付耗材</div>
-            <div class="no-pay ma-item flex-h flex-hb" v-for="(child, index) in item.no_pay_order.goods" :key="index">
+            <div
+              class="no-pay ma-item flex-h flex-hb"
+              v-for="(child, index) in item.no_pay_order.goods"
+              :key="index"
+            >
               <div class="one one1 text-line-one">{{child.parent_detail.goods_name}}</div>
               <div class="one one2 flex-h">
                 <div class="_one text-line-one">{{child.good_detail.goods_name}}</div>
@@ -162,7 +166,7 @@
               v-if="item.is_can_see_appraisal==1"
               class="btn-item"
               @click="look_comment(item)"
-            >查看评价</div> -->
+            >查看评价</div>-->
             <div
               v-if="item.is_can_see_material==1"
               class="btn-item sf-btn"
@@ -344,7 +348,7 @@ export default {
                minDate: new Date(2021, 0, 1),
               maxDate: new Date(),
             },
-            currentDate: new Date(2021, 0, 17),
+            currentDate: new Date(),
             showEnd: false,
             endTime: "请选择截止日期",
             backShow: false,//工人退回弹窗
@@ -553,7 +557,18 @@ export default {
             if (item.type !== this.curSelect.type) {
                 this.curSelect = item
                 this.tabShow = false
+
                 if(this.curSelect.type == 4){
+                  this.startTime ='请选择开始日期'
+                  this.endTime='请选择截止日期'
+                  this.startObj={
+                    minDate: new Date(2021, 0, 1),
+                    maxDate: new Date(),
+                  }
+                  this.endObj={
+                    minDate: new Date(2021, 0, 1),
+                    maxDate: new Date(),
+                  }
                   return
                 }
                 this.initData()

src/views/tabbar/admin_home.vue

@@ -311,12 +311,12 @@ export default {
                minDate: new Date(2021, 0, 1),
               maxDate: new Date(),
             },
-            currentDate: new Date(2021, 0, 17),
+            currentDate: new Date(),
             showEnd: false,
             endTime: "请选择截止日期",
             // 头部日期范围筛选
             tabShow: false, // tab范围选择框是否显示
-            curSelect: { type: '3', name: '本月' }, // 当前选择的日期范围
+            curSelect: { type: '1', name: '今日' }, // 当前选择的日期范围
             optionList: [
                 { type: '1', name: '今日' },
                 { type: '2', name: '本周' },
@@ -624,6 +624,16 @@ export default {
                 this.curSelect = item
                 this.tabShow = false
                if(this.curSelect.type == 4){
+                  this.startTime ='请选择开始日期'
+                  this.endTime='请选择截止日期'
+                  this.startObj={
+                    minDate: new Date(2021, 0, 1),
+                    maxDate: new Date(),
+                  }
+                  this.endObj={
+                    minDate: new Date(2021, 0, 1),
+                    maxDate: new Date(),
+                  }
                   return
                 }
                 setTimeout(() => {