Explorar el Código

fix:恢复原本日期控件的逻辑

liujiayin hace 2 años
padre
commit
1eafa3a686

+ 2 - 2
src/business/platform/data/components/search-form/index.vue

@@ -86,7 +86,7 @@
                     @change="date => changeDateAddEndDate(date, item)"
                     @keyup.enter.native.stop="handleEnter"
                 />
-                <el-date-picker
+                <!-- <el-date-picker
                     v-else-if="item.fieldType === 'datePicker'"
                     v-model="params[item.modelValue]"
                     :placeholder="item.placeholder"
@@ -100,7 +100,7 @@
                     :value-format="item.field_options.datefmt"
                     :format="item.field_options.datefmt"
                     @keyup.enter.native.stop="handleEnter"
-                />
+                /> -->
                 <!-- 日期范围-->
                 <ibps-date-range
                     v-else-if="item.fieldType === 'yearrange'"

+ 1 - 10
src/business/platform/data/templaterender/templates/list.vue

@@ -1520,16 +1520,7 @@ export default {
                     fieldType: 'date',
                     dateType: fieldOptions.datefmt_type ? fieldOptions.datefmt_type : 'date'
                 })
-            } else if (fieldType === 'datePicker') {
-                const datefmt = fieldOptions.datefmt || ''
-                const dateDealFmt = DateFormatUtil.dealFmt(fieldOptions.datefmt)
-                searchColumn = Object.assign(searchColumn, {
-                    prop: `Q^${field.name}^SL`,
-                    modelValue: `Q^${field.name}^SL`,
-                    fieldType: 'datePicker',
-                    field_options: fieldOptions
-                })
-            } else if (fieldType.toLowerCase() === 'daterange') {
+            } else if (fieldType === 'datePicker' || fieldType.toLowerCase() === 'daterange') {
                 const datefmt = fieldOptions.datefmt || ''
                 const dateDealFmt = DateFormatUtil.dealFmt(fieldOptions.datefmt)
                 searchColumn = Object.assign(searchColumn, {