Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

llj

2026-02-02 19756b3475d70b5758a12ff2383970ef3edcece7

 pages/MJGL/SBMJReport/Sb_EquipMaintainTaskReport.vue

@@ -145,6 +145,7 @@
               </view>

               <view class="op" v-if="operations == item.hmainid">
                        <button class="op1" v-if="activeTab == 0" size="mini" plain @tap.stop="pushBill(0,item)">下推保养单</button>
                  <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
               </view>
            </uni-card>
@@ -180,7 +181,7 @@
            activeTab: 0,

            tabs: [{
                  label: '今日待保养',
                  label: '近日待保养',
                  type: 0,
                  count: 0,
                  listData: [], // 添加这个
@@ -191,7 +192,7 @@
                  }
               },
               {
                  label: '今日已保养',
                  label: '近日已保养',
                  type: 1,
                  count: 0,
                  listData: [], // 添加这个
@@ -202,7 +203,7 @@
                  }
               },
               {
                  label: '今日全部任务',
                  label: '近日全部任务',
                  type: 2,
                  count: 0,
                  listData: [], // 添加这个
@@ -221,9 +222,9 @@
            },

            dateRangePicker: ["任意间隔", "今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"],
            curDateGap: "今天",
            curDateGap: "近七天",
            enableCustomDateRange: false,
            startDate: dayjs(new Date()).format('YYYY-MM-DD'),
            startDate: dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD'),
            endDate: dayjs(new Date()).format('YYYY-MM-DD'),
            HBillNo: '',

@@ -268,6 +269,14 @@
         // #endif
      },
      methods: {
            pushBill(currTab, item) {
                let Query = `?operationType=4&HBarCode=${item['设备代码']}`
                if(currTab == 0) {
                    uni.navigateTo({
                        url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill' + Query
                    })
                }
            },
         goTop: function(e) {
            // 解决view层不同步的问题
            this.scrollTop = this.old.scrollTop
@@ -335,9 +344,9 @@
         },

         clear() {
            this.curDateGap = "今天"
            this.curDateGap = "近7天"
            this.enableCustomDateRange = false
            this.startDate = dayjs(new Date()).format('YYYY-MM-DD')
            this.startDate = dayjs(new Date()).subtract(7, 'days').format('YYYY-MM-DD')
            this.endDate = dayjs(new Date()).format('YYYY-MM-DD')
            this.HBillNo = ''
         },