temp save

src/components/Common/BaseForm.vue

@@ -80,7 +80,7 @@
           unlink-panels
           :type="`${item.type2 ? item.type2 : 'daterange'}`"
           :align="'right'"
-          value-format="yyyy-MM-dd"
+          :value-format="`${item.valueFormat ? item.valueFormat : 'yyyy-MM-dd'}`"
           range-separator="至"
           :disabled="item.disabled || false"
           :placeholder="`请选择${item.label}`"

src/views/base/components/popup/DictDtlEdit.vue

@@ -39,7 +39,7 @@ export default {
         let disabled = false
         if (params.id) disabled = true
         this.formData = [
-          { label: '值', key: 'dict_value', rules: 1 },
+          { label: '值', key: 'dict_value', disabled, rules: 1 },
           { label: '名称', key: 'dict_label', rules: 1 },
           { label: '自定义值1', key: 'option1' },
           { label: '自定义值2', key: 'option2' },

src/views/house/components/popup/IndexEdit.vue

@@ -261,8 +261,8 @@ export default {
         { label: '周边医院', key: 'hospital_type', type: 'select', class: 'c-3', options: this.$dictData.hospital_type, multiple: true },
         { label: '周边商圈', key: 'high_street', type: 'select', class: 'c-3', options: this.$dictData.high_street, multiple: true },
         { label: '周边公园', key: 'park_type', type: 'select', class: 'c-3', options: this.$dictData.park_type, multiple: true },
-        { label: '建设时间', key: 'build_time', class: 'c-3', type: 'datePicker', type2: 'month'},
-        { label: '竣工时间', key: 'complete_time', class: 'c-3', type: 'datePicker', type2: 'month'},
+        { label: '建设时间', key: 'build_time', class: 'c-3', type: 'datePicker', type2: 'month', valueFormat: 'yyyy-MM'},
+        { label: '竣工时间', key: 'complete_time', class: 'c-3', type: 'datePicker', type2: 'month', valueFormat: 'yyyy-MM'},
         { label: '容积率', key: 'plot_ratio', class: 'c-3', type: 'inputFont', appendFont: '%'},
         { label: '占地面积', key: 'acreage', class: 'c-3', type: 'inputFont', appendFont: '平方米'},
         { label: '建筑面积', key: 'built_up_area', class: 'c-3', type: 'inputFont', appendFont: '平方米'},

src/views/house/components/searchForm/Index.vue

@@ -42,26 +42,26 @@ export default {
         this.searchData = [
           { label: '所属区域', key: 'area_type', type: 'select', options: this.$dictData.area_type},
           { label: '楼盘名称', key: 'estate_name' },
-          // { label: '就读学校', key: 'search_EQ_companyId', type: 'selectRemote',
-          //   remoteParams: { skey: 'search_LIKE_companyName', api: `config.merchantlist?search_EQ_orgType=90&search_EQ_status=1`, opKey: 'companyName', opVal: 'id' }
-          // },
-          // { label: '地铁线路', key: 'metro_line', type: 'select', options: this.$dictData.metro_line, changeHandle: this.subwayLineChange},
-          // { label: '地铁站名', key: 'metro_type', type: 'select', class: 'c-3', options: subwayNameDD},
-          // { label: '周边医院', key: 'hospital_type', type: 'select', class: 'c-3', options: this.$dictData.hospital_type },
-          // { label: '周边商圈', key: 'high_street', type: 'select', class: 'c-3', options: this.$dictData.high_street },
-          // { label: '周边公园', key: 'park_type', type: 'select', class: 'c-3', options: this.$dictData.park_type },
+          { label: '就读学校', key: 'school_id', type: 'selectRemote',
+            remoteParams: { skey: 'school_name', api: `house.admschoollist`, opKey: 'school_name', opVal: 'id' }
+          },
+          { label: '地铁线路', key: 'metro_line', type: 'select', options: this.$dictData.metro_line, changeHandle: this.subwayLineChange},
+          { label: '地铁站名', key: 'metro_type', type: 'select', class: 'c-3', options: subwayNameDD},
+          { label: '周边医院', key: 'hospital_type', type: 'select', class: 'c-3', options: this.$dictData.hospital_type },
+          { label: '周边商圈', key: 'high_street', type: 'select', class: 'c-3', options: this.$dictData.high_street },
+          { label: '周边公园', key: 'park_type', type: 'select', class: 'c-3', options: this.$dictData.park_type },
         ]
       } else {
         this.searchData = [
           { label: '所属区域', key: 'area_type', type: 'select', options: this.$dictData.area_type},
           { label: '楼盘名称', key: 'estate_name' },
-          // { label: '就读学校', key: 'search_EQ_companyId', type: 'selectRemote',
-          //   remoteParams: { skey: 'search_LIKE_companyName', api: `config.merchantlist?search_EQ_orgType=90&search_EQ_status=1`, opKey: 'companyName', opVal: 'id' }
-          // },
-          // { label: '地铁线路', key: 'metro_line', type: 'select', options: this.$dictData.metro_line, changeHandle: this.subwayLineChange},
-          // { label: '周边医院', key: 'hospital_type', type: 'select', class: 'c-3', options: this.$dictData.hospital_type },
-          // { label: '周边商圈', key: 'high_street', type: 'select', class: 'c-3', options: this.$dictData.high_street },
-          // { label: '周边公园', key: 'park_type', type: 'select', class: 'c-3', options: this.$dictData.park_type },
+          { label: '就读学校', key: 'school_id', type: 'selectRemote',
+            remoteParams: { skey: 'school_name', api: `house.admschoollist`, opKey: 'school_name', opVal: 'id' }
+          },
+          { label: '地铁线路', key: 'metro_line', type: 'select', options: this.$dictData.metro_line, changeHandle: this.subwayLineChange},
+          { label: '周边医院', key: 'hospital_type', type: 'select', class: 'c-3', options: this.$dictData.hospital_type },
+          { label: '周边商圈', key: 'high_street', type: 'select', class: 'c-3', options: this.$dictData.high_street },
+          { label: '周边公园', key: 'park_type', type: 'select', class: 'c-3', options: this.$dictData.park_type },
         ]
       }
       this.setDefaultValue(params, 'searchData')

src/views/school/components/searchForm/Index.vue

@@ -19,9 +19,8 @@ export default {
       searchData: [
         { label: '所属区域', key: 'area_type', type: 'select', options: this.$dictData.area_type},
         { label: '学校名称', key: 'school_name' },
-        // { label: '周边楼盘', key: 'search_EQ_companyId', type: 'selectRemote',
-        //   remoteParams: { skey: 'search_LIKE_companyName', api: `config.merchantlist?search_EQ_orgType=90&search_EQ_status=1`, opKey: 'companyName', opVal: 'id' }
-        // },
+        { label: '学校属性', key: 'school_attrib', type: 'select', class: 'c-3', options: this.$dictData.school_attrib },
+        { label: '学校类型', key: 'school_type', type: 'select', class: 'c-3', options: this.$dictData.school_type },
       ]
     }
   },