linwenxin 3 hónapja
szülő
commit
05374f02bb

+ 4 - 2
src/views/userManagement/masterElectronicPaymentQuiry/index.vue

@@ -131,9 +131,11 @@ export default {
           pam.overEndTime = `${this.value1?.[1]} 23:59:59`
           pam.params.push({ param: 'a.pay_time', compare: '>=', value: pam.overTime })
           pam.params.push({ param: 'a.pay_time', compare: '<=', value: pam.overEndTime })
-          cb && cb(pam)
-          return settlementOrderNewListPageV3(pam)
+        } else if (pam.params.length == 0) {
+          pam.params.push({ param: 'a.worker_order_id', compare: '=', value: 'XXXXXXXX' })
         }
+        cb && cb(pam)
+        return settlementOrderNewListPageV3(pam)
       } catch (err) {}
     },
     // 列表导出函数

+ 11 - 2
src/views/workOrder/qualityFeedback/index.vue

@@ -670,6 +670,9 @@ export default {
             placeholder: '请选择',
             'picker-options': {
               disabledDate: time => {
+                if (time.getTime() > new Date()) {
+                  return true
+                }
                 if (this.formData.useDate) {
                   var data = this.formData.useDate?.split(' ')?.[0]
                   return time.getTime() >= new Date(data ? `${data} 00:00:00` : '')
@@ -705,6 +708,9 @@ export default {
             placeholder: '请选择',
             'picker-options': {
               disabledDate: time => {
+                if (time.getTime() > new Date()) {
+                  return true
+                }
                 var a = false
                 var b = false
                 if (this.formData.outDate) {
@@ -713,7 +719,7 @@ export default {
                 }
                 if (this.formData.repairDate) {
                   let data = this.formData.repairDate?.split(' ')?.[0]
-                  b = time.getTime() >= new Date(data ? `${data} 00:00:00` : '')
+                  b = time.getTime() > new Date(data ? `${data} 00:00:00` : '')
                 }
                 return a || b
               }
@@ -739,9 +745,12 @@ export default {
             placeholder: '请选择',
             'picker-options': {
               disabledDate: time => {
+                if (time.getTime() > new Date()) {
+                  return true
+                }
                 if (this.formData.useDate) {
                   var data = this.formData.useDate?.split(' ')?.[0]
-                  return time.getTime() <= new Date(data ? `${data} 00:00:00` : '')
+                  return time.getTime() < new Date(data ? `${data} 00:00:00` : '')
                 } else {
                   return false
                 }