@zscreate/zhxy-app-component 1.0.288 → 1.0.290
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.
|
@@ -182,15 +182,22 @@
|
|
|
182
182
|
@cancel="cancel"
|
|
183
183
|
/> -->
|
|
184
184
|
<view class="evan-form-item-container__main--body" v-if="zjfmFormDesign && zbrqList && widget.model == 'zbrq'">
|
|
185
|
-
<view
|
|
185
|
+
<view style="display: flex;align-items: center">
|
|
186
|
+
<view class="option-font-size" @click="zbrqshow = !widget.options.disabled">
|
|
186
187
|
{{ dataModel | filterDataModel(widget) }}
|
|
187
188
|
</view>
|
|
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
|
+
</view>
|
|
191
|
+
|
|
188
192
|
<u-calendar v-model="zbrqshow" :date="zbrqList.minTime" :mode="'date'" @change="changeZBRQDate" :min-date="zbrqList.minTime" :max-date="zbrqList.maxTime" class="zbrq-calendar"></u-calendar>
|
|
189
193
|
</view>
|
|
190
194
|
<view class="evan-form-item-container__main--body" v-else-if="zjfmFormDesign && thrqList && widget.model == 'thrq'">
|
|
191
|
-
<view
|
|
195
|
+
<view style="display: flex;align-items: center">
|
|
196
|
+
<view class="option-font-size" @click="thrqshow = !widget.options.disabled">
|
|
192
197
|
{{ dataModel | filterDataModel(widget) }}
|
|
193
198
|
</view>
|
|
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
|
+
</view>
|
|
194
201
|
<u-calendar v-model="thrqshow" :date="thrqList.minTime" :mode="'date'" @change="changeTHRQDate" :min-date="thrqList.minTime" :max-date="thrqList.maxTime" class="zbrq-calendar" :defaultDate="'2024-08-02'"></u-calendar>
|
|
195
202
|
</view>
|
|
196
203
|
<view class="evan-form-item-container__main--body" v-else>
|
|
@@ -426,9 +433,9 @@
|
|
|
426
433
|
{{ widget.name }}
|
|
427
434
|
</view>
|
|
428
435
|
<view class="evan-form-item-container__main" :style="mContentStyle" @click="handleSeclet(widget.options.multiple)">
|
|
429
|
-
<view class="form-input" style="display: flex">
|
|
436
|
+
<view class="form-input" style="display: flex;align-items: center;">
|
|
430
437
|
<view class="option-font-size">{{ dataModelShow ? dataModelShow : widget.options.placeholder }}</view>
|
|
431
|
-
<uni-icons style="margin-left: auto; margin-right: 20rpx;
|
|
438
|
+
<uni-icons style="margin-left: auto; margin-right: 20rpx;margin-top: 8rpx;" @click.native.stop="handleClear" v-if="!widget.options.disabled && dataModelShow" type="clear" color="#e1e1e1" size="14"></uni-icons>
|
|
432
439
|
</view>
|
|
433
440
|
</view>
|
|
434
441
|
<!-- <icon type="clear" size="14" v-if="widget.options.canView" />-->
|
|
@@ -1000,6 +1007,22 @@ export default {
|
|
|
1000
1007
|
}
|
|
1001
1008
|
return flag
|
|
1002
1009
|
},
|
|
1010
|
+
// 定制化值班日期清空
|
|
1011
|
+
handlezbrqClear() {
|
|
1012
|
+
this.models.zbrq = ''
|
|
1013
|
+
this.models.zbxq = ''
|
|
1014
|
+
this.models.thrq = ''
|
|
1015
|
+
this.models.thr = ''
|
|
1016
|
+
this.$emit('changedate', 'thrqDataModalShow')
|
|
1017
|
+
this.models.thxq = ''
|
|
1018
|
+
},
|
|
1019
|
+
// 定制化调换日期清空
|
|
1020
|
+
handlethrqClear() {
|
|
1021
|
+
this.models.thrq = ''
|
|
1022
|
+
this.models.thr = ''
|
|
1023
|
+
this.$emit('changedate', 'thrqDataModalShow')
|
|
1024
|
+
this.models.thxq = ''
|
|
1025
|
+
},
|
|
1003
1026
|
// 工贸定制化时间切换
|
|
1004
1027
|
changeZBRQDate(val,e) {
|
|
1005
1028
|
this.models.zbxq = ''
|
|
@@ -2010,7 +2033,10 @@ export default {
|
|
|
2010
2033
|
// this.updateDataModel(); // 当脚本文件里面 改动 models值后 需要更新 对应的
|
|
2011
2034
|
// this.showFormData();
|
|
2012
2035
|
console.log(this.widget.model);
|
|
2013
|
-
if (this.tableKey || (['zbrq', 'zbxq', '
|
|
2036
|
+
if (this.tableKey || (['zbrq', 'zbxq', 'thrq', 'thr', 'thxq'].includes(this.widget.model) && this.zjfmFormDesign)) { //处理子表单删除行的时候 值未更新
|
|
2037
|
+
if(this.widget.model === 'thr' && !this.models.thr) {
|
|
2038
|
+
this.dataModelShow = ''
|
|
2039
|
+
}
|
|
2014
2040
|
this.updateDataModel();
|
|
2015
2041
|
if(!(this.widget.model == 'thr' && this.zjfmFormDesign)) this.showFormData();
|
|
2016
2042
|
}
|
|
@@ -2448,7 +2474,11 @@ checkbox-group label {
|
|
|
2448
2474
|
::v-deep .u-hover-class {
|
|
2449
2475
|
background-color: #f0f0f0 !important;
|
|
2450
2476
|
opacity: .3;
|
|
2477
|
+
|
|
2451
2478
|
}
|
|
2479
|
+
::v-deep .u-calendar__content__item__inner {
|
|
2480
|
+
color: #000000 !important
|
|
2481
|
+
}
|
|
2452
2482
|
::v-deep .u-calendar__action {
|
|
2453
2483
|
display: flex;
|
|
2454
2484
|
align-items: center;
|