doway-coms 2.11.57 → 2.11.59
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -3665,6 +3665,28 @@ export default {
|
|
|
3665
3665
|
}
|
|
3666
3666
|
switch (tempControlType) {
|
|
3667
3667
|
case controlType.date:
|
|
3668
|
+
if (loopBindingValue.value[0] && loopBindingValue.value[1]) {
|
|
3669
|
+
tempPushExp.operator = 'RA'
|
|
3670
|
+
tempPushExp.value = [loopBindingValue.value[0]+' 00:00:00',loopBindingValue.value[1]+' 23:59:59']
|
|
3671
|
+
expStr = '范围'
|
|
3672
|
+
tempStr.exp =
|
|
3673
|
+
tempStr.exp +
|
|
3674
|
+
loopBindingValue.value[0] +
|
|
3675
|
+
'到' +
|
|
3676
|
+
loopBindingValue.value[1] +
|
|
3677
|
+
'或'
|
|
3678
|
+
} else if (loopBindingValue.value[0]) {
|
|
3679
|
+
tempPushExp.operator = 'GE'
|
|
3680
|
+
tempPushExp.value = loopBindingValue.value[0] +' 00:00:00'
|
|
3681
|
+
tempStr.exp = tempStr.exp + tempPushExp.value + '或'
|
|
3682
|
+
expStr = '大于等于'
|
|
3683
|
+
} else {
|
|
3684
|
+
tempPushExp.operator = 'LE'
|
|
3685
|
+
tempPushExp.value = loopBindingValue.value[1] +' 23:59:59'
|
|
3686
|
+
tempStr.exp = tempStr.exp + tempPushExp.value + '或'
|
|
3687
|
+
expStr = '小于等于'
|
|
3688
|
+
}
|
|
3689
|
+
break
|
|
3668
3690
|
case controlType.datetime:
|
|
3669
3691
|
if (loopBindingValue.value[0] && loopBindingValue.value[1]) {
|
|
3670
3692
|
tempPushExp.operator = 'RA'
|
|
@@ -30,7 +30,12 @@
|
|
|
30
30
|
:pager="gridPager"
|
|
31
31
|
:showCheckBox="false"
|
|
32
32
|
:editStates="['view']"
|
|
33
|
-
|
|
33
|
+
:scrollY="{ enabled: false }"
|
|
34
|
+
>
|
|
35
|
+
<template #customCell="{item}">
|
|
36
|
+
<slot name="customCell" :item="item"></slot>
|
|
37
|
+
</template>
|
|
38
|
+
</BaseGrid>
|
|
34
39
|
</div>
|
|
35
40
|
</vxe-modal>
|
|
36
41
|
</div>
|