Browse Source

fix: 日期查询条件优化

johnsen 11 months ago
parent
commit
3718cab63a

+ 1 - 1
src/components/ibps-more-search/index.vue

@@ -41,7 +41,7 @@ import IbpsToolbar from '@/components/ibps-toolbar' // 工具栏
 import searchField from './search-field'
 
 export default {
-  name: 'ibps-more-search',
+  name: 'IbpsMoreSearch',
   components: {
     searchField,
     IbpsToolbar

+ 4 - 2
src/components/ibps-more-search/search-field.vue

@@ -94,7 +94,9 @@
         <!-- 日期 -->
         <ibps-date-picker
           v-else-if="
-            item.fieldType === 'datePicker' || item.fieldType === 'date'
+            item.fieldType === 'datePicker' ||
+            item.fieldType === 'date' ||
+            item.fieldType === 'datetime'
           "
           :key="i"
           v-model="params[item.modelValue]"
@@ -222,7 +224,7 @@ export default {
       if (!item) {
         return defaultVal
       }
-      const fieldOptions = item.options || {}
+      const fieldOptions = item.options || item.fieldOptions || {}
       if (this.$utils.isEmpty(fieldOptions) || !fieldOptions[key]) {
         return defaultVal
       }

+ 10 - 5
src/views/component/facility/facilityData.vue

@@ -57,7 +57,12 @@
             label="填写频率"
             :readonly="!(!readonly && !isCul)"
           />
-          <van-field v-model="item.value" label="参数值" :readonly="readonly" />
+          <van-field
+            v-model="item.value"
+            label="参数值"
+            placeholder="请输入"
+            :readonly="readonly"
+          />
           <van-field v-model="item.result" label="最终值" :readonly="true" />
           <van-field v-model="item.status" label="状态" :readonly="true" />
         </div>
@@ -197,8 +202,8 @@ export default {
                 item.rangeArr.length === 2
                   ? item.rangeArr.join('至')
                   : item.rangeArr.length === 1
-                    ? `${item.rangeArr[0]}至/`
-                    : '/'
+                  ? `${item.rangeArr[0]}至/`
+                  : '/'
             })
           } else {
             if (this.isFirst) {
@@ -210,8 +215,8 @@ export default {
                   item.rangeArr.length === 2
                     ? item.rangeArr.join('至')
                     : item.rangeArr.length === 1
-                      ? `${item.rangeArr[0]}至/`
-                      : '/'
+                    ? `${item.rangeArr[0]}至/`
+                    : '/'
               })
               this.isFirst = false
             }