@zscreate/zhxy-app-component 1.0.290 → 1.0.292
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.
|
@@ -189,7 +189,7 @@
|
|
|
189
189
|
<uni-icons style="margin-left: auto;margin-top: 8rpx;" @click.native.stop="handlezbrqClear" v-if="!widget.options.disabled && dataModel" type="clear" color="#e1e1e1" size="14"></uni-icons>
|
|
190
190
|
</view>
|
|
191
191
|
|
|
192
|
-
<u-calendar v-model="zbrqshow" :
|
|
192
|
+
<u-calendar v-if="zbrqshow" v-model="zbrqshow" :defaultDate="dataModel" :mode="'date'" @change="changeZBRQDate" :min-date="zbrqList.minTime" :max-date="zbrqList.maxTime" class="zbrq-calendar"></u-calendar>
|
|
193
193
|
</view>
|
|
194
194
|
<view class="evan-form-item-container__main--body" v-else-if="zjfmFormDesign && thrqList && widget.model == 'thrq'">
|
|
195
195
|
<view style="display: flex;align-items: center">
|
|
@@ -198,7 +198,7 @@
|
|
|
198
198
|
</view>
|
|
199
199
|
<uni-icons style="margin-left: auto;margin-top: 8rpx;" @click.native.stop="handlethrqClear" v-if="!widget.options.disabled && dataModel" type="clear" color="#e1e1e1" size="14"></uni-icons>
|
|
200
200
|
</view>
|
|
201
|
-
<u-calendar v-model="thrqshow" :
|
|
201
|
+
<u-calendar v-if="thrqshow" v-model="thrqshow" :defaultDate="dataModel" :mode="'date'" @change="changeTHRQDate" :min-date="thrqList.minTime" :max-date="thrqList.maxTime" class="zbrq-calendar"></u-calendar>
|
|
202
202
|
</view>
|
|
203
203
|
<view class="evan-form-item-container__main--body" v-else>
|
|
204
204
|
<uni-datetime-picker ref="datetime_picker" @change="dateChange" :hide-second="!widget.options.format.includes(':ss')" @click.native="isClickByUser = true" :type="widget.options.type"
|
|
@@ -1030,14 +1030,7 @@ export default {
|
|
|
1030
1030
|
this.models.thr = ''
|
|
1031
1031
|
this.$emit('changedate', 'thrqDataModalShow')
|
|
1032
1032
|
this.models.thxq = ''
|
|
1033
|
-
let chooseVal =
|
|
1034
|
-
let minTime = this.zbrqList.minTime
|
|
1035
|
-
let maxTime = this.zbrqList.maxTime
|
|
1036
|
-
if(new Date(chooseVal).getTime() >= new Date(minTime).getTime() && new Date(chooseVal).getTime() <= new Date(maxTime).getTime()) {
|
|
1037
|
-
console.log('成功');
|
|
1038
|
-
} else {
|
|
1039
|
-
chooseVal = ''
|
|
1040
|
-
}
|
|
1033
|
+
let chooseVal = val.result
|
|
1041
1034
|
if (this.tableKey) {
|
|
1042
1035
|
this.models[this.tableKey][this.tableIndex][this.widget.model] = chooseVal;
|
|
1043
1036
|
} else {
|
|
@@ -1053,14 +1046,7 @@ export default {
|
|
|
1053
1046
|
this.models.thr = ''
|
|
1054
1047
|
this.$emit('changedate', 'thrqDataModalShow')
|
|
1055
1048
|
this.models.thxq = ''
|
|
1056
|
-
|
|
1057
|
-
let minTime = this.thrqList.minTime
|
|
1058
|
-
let maxTime = this.thrqList.maxTime
|
|
1059
|
-
if(new Date(chooseVal).getTime() >= new Date(minTime).getTime() && new Date(chooseVal).getTime() <= new Date(maxTime).getTime()) {
|
|
1060
|
-
console.log('成功');
|
|
1061
|
-
} else {
|
|
1062
|
-
chooseVal = ''
|
|
1063
|
-
}
|
|
1049
|
+
let chooseVal = val.result
|
|
1064
1050
|
if (this.tableKey) {
|
|
1065
1051
|
this.models[this.tableKey][this.tableIndex][this.widget.model] = chooseVal;
|
|
1066
1052
|
} else {
|