t

src/api/house.js

@@ -82,24 +82,6 @@ export default {
   admestatesortedit: params => { // 楼盘排序接口
     return getRequestNoSort('/adm/estate/sort/edit', params, 'loading')
   },
-  admschoolsortedit: params => { // 学校排序接口
-    return getRequestNoSort('/adm/school/sort/edit', params, 'loading')
-  },
-  admschoollist: params => { // 学校列表接口
-    return getRequest('/adm/school/list', params)
-  },
-  admschooladd: params => { // 学校添加
-    return getRequestNoSort('/adm/school/add', params, 'loading')
-  },
-  admschooledit: params => { // 学校编辑
-    return getRequestNoSort('/adm/school/edit', params, 'loading')
-  },
-  admschooldetail: params => { // 学校详情
-    return getRequestNoSort('/adm/school/detail', params, 'loading')
-  },
-  admschooldel: params => { // 学校删除
-    return getRequestNoSort('/adm/school/del', params, 'loading')
-  },
   adminformationlist: params => { // 洪楼文章列表接口
     return getRequest('/adm/information/list', params)
   },

src/api/index.js

@@ -2,9 +2,11 @@ import base from './base'
 import house from './house'
 import user from './user'
 import other from './other'
+import school from './school'
 export default {
   base,
   house,
   user,
   other,
+  school,
 }

src/api/school.js

@@ -0,0 +1,40 @@
+/**
+  * 房
+*/
+import { getRequest, getRequestNoSort } from '@/utils/request'
+
+export default {
+  admschoolsortedit: params => { // 学校排序接口
+    return getRequestNoSort('/adm/school/sort/edit', params, 'loading')
+  },
+  admschoollist: params => { // 学校列表接口
+    return getRequest('/adm/school/list', params)
+  },
+  admschooladd: params => { // 学校添加
+    return getRequestNoSort('/adm/school/add', params, 'loading')
+  },
+  admschooledit: params => { // 学校编辑
+    return getRequestNoSort('/adm/school/edit', params, 'loading')
+  },
+  admschooldetail: params => { // 学校详情
+    return getRequestNoSort('/adm/school/detail', params, 'loading')
+  },
+  admschooldel: params => { // 学校删除
+    return getRequestNoSort('/adm/school/del', params, 'loading')
+  },
+  admschoolmodulelist: params => { // 学校分类 - 列表
+    return getRequest('/adm/school/module/list', params)
+  },
+  admschoolmoduleadd: params => { // 学校分类 - 添加
+    return getRequestNoSort('/adm/school/module/add', params, 'loading')
+  },
+  admschoolmoduleedit: params => { // 学校分类 - 编辑
+    return getRequestNoSort('/adm/school/module/edit', params, 'loading')
+  },
+  admschoolmoduledetail: params => { // 学校分类 - 详情
+    return getRequestNoSort('/adm/school/module/detail', params, 'loading')
+  },
+  admschoolmoduledel: params => { // 学校分类 - 删除
+    return getRequestNoSort('/adm/school/module/del', params, 'loading')
+  },
+}

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

@@ -135,7 +135,7 @@ export default {
       if (val) {
         if (this.curObj.id) {
           this.loading = true
-          this.$api.house.admestatedetail({id: this.curObj.id}).then(res => {
+          this.$api.school.admestatedetail({id: this.curObj.id}).then(res => {
             let curData = res || {}
             if (curData.house_type) curData.house_type = curData.house_type.split(',')
             if (curData.product_type) curData.product_type = curData.product_type.split(',')
@@ -338,7 +338,7 @@ export default {
         // { label: '均价范围1', key: 'price_min', class: 'c-3', type: 'inputFont', appendFont: '元(最小)'},
         // { label: '均价范围2', key: 'price_max', class: 'c-3', type: 'inputFont', appendFont: '元(最大)'},
         { label: '就读学校', key: 'school_id_list', type: 'selectRemote', multiple: true,
-          remoteParams: { skey: 'school_name', api: `house.admschoollist`, opKey: 'school_name', opVal: 'id' },
+          remoteParams: { skey: 'school_name', api: `school.admschoollist`, opKey: 'school_name', opVal: 'id' },
           remoteOptions: remoteOptionsSchoolList
         },
         { label: '楼盘地址', key: 'address', rules: 1 },

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

@@ -47,7 +47,7 @@ export default {
           { label: '楼盘名称', key: 'estate_name' },
           { label: '是否新房', key: 'is_new', type: 'select', options: this.$dictData.sys_yesno},
           { label: '就读学校', key: 'school_id', type: 'selectRemote',
-            remoteParams: { skey: 'school_name', api: `house.admschoollist`, opKey: 'school_name', opVal: 'id' }
+            remoteParams: { skey: 'school_name', api: `school.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},
@@ -61,7 +61,7 @@ export default {
           { label: '楼盘名称', key: 'estate_name' },
           { label: '是否新房', key: 'is_new', type: 'select', options: this.$dictData.sys_yesno},
           { label: '就读学校', key: 'school_id', type: 'selectRemote',
-            remoteParams: { skey: 'school_name', api: `house.admschoollist`, opKey: 'school_name', opVal: 'id' }
+            remoteParams: { skey: 'school_name', api: `school.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 },

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

@@ -51,7 +51,7 @@ export default {
       if (val) {
         if (val) {
           if (this.curObj.id) {
-            this.$api.house.admschooldetail({id: this.curObj.id}).then(res => {
+            this.$api.school.admschooldetail({id: this.curObj.id}).then(res => {
               let curData = res || {}
               this.cObj = curData || {}
               this.getDef()
@@ -141,7 +141,7 @@ export default {
             else if (!newForm.latitude) return this.$msgw('请选择纬度！')
             let apiStr = 'admschooladd'
             if (newForm.id) apiStr = 'admschooledit'
-            this.$api.house[apiStr](newForm).then(data => {
+            this.$api.school[apiStr](newForm).then(data => {
               this.$msgs(newForm.id ? '编辑成功' : '新增成功')
               this.$emit('close', newForm)
             })

src/views/school/components/popup/ThemeEdit.vue

@@ -41,7 +41,7 @@ export default {
     isShow: function(val) {
       if (val) {
         if (this.curObj.id) {
-          this.$api.house.admestatemoduledetail({id: this.curObj.id}).then(res => {
+          this.$api.school.admschoolmoduledetail({id: this.curObj.id}).then(res => {
             let curData = res || {}
             this.cObj = curData || {}
             this.getDef()
@@ -58,12 +58,12 @@ export default {
       let disabled = false
       if (this.curObj.id) disabled = true
       const params = { ...this.cObj }
-      params.module_type = this.parentData.curNavVal || ''
+      params.school_cate = this.parentData.curNavVal || ''
       this.formData = [
-        { label: '所属模块', key: 'module_type', disabled, rules: 1, type: 'select', options: this.$dictData.module_type },
-        { label: '所属楼盘', key: 'estate_id', rules: 1, type: 'selectRemote', changeHandle: this.deviceChange,
-          remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
-          remoteOptions: [{ keyRO: params.estate_name, valRO: params.estate_id }]
+        { label: '所属模块', key: 'school_cate', disabled, rules: 1, type: 'select', options: this.$dictData.school_cate },
+        { label: '关联学校', key: 'school_id', rules: 1, type: 'selectRemote',
+          remoteParams: { skey: 'school_name', api: `school.admschoollist`, opKey: 'school_name', opVal: 'id' },
+          remoteOptions: [{ keyRO: params.school_name, valRO: params.school_id }]
         },
         { label: '排序', key: 'sort' },
       ]
@@ -78,9 +78,9 @@ export default {
             if (this.curObj.id) {
               newForm.id = this.curObj.id
             }
-            let apiStr = 'admestatemoduleadd'
-            if (newForm.id) apiStr = 'admestatemoduleedit'
-            this.$api.house[apiStr](newForm).then(data => {
+            let apiStr = 'admschoolmoduleadd'
+            if (newForm.id) apiStr = 'admschoolmoduleedit'
+            this.$api.school[apiStr](newForm).then(data => {
               this.$msgs(newForm.id ? '编辑成功' : '新增成功')
               this.$emit('close', newForm)
             })

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

@@ -26,7 +26,7 @@ export default {
       let params = { ...this.$refs.ruleForm.baseForm }
       this.searchData = [
         { label: '学校', key: 'school_id', type: 'selectRemote',
-            remoteParams: { skey: 'school_name', api: `house.admschoollist`, opKey: 'school_name', opVal: 'id' },
+            remoteParams: { skey: 'school_name', api: `school.admschoollist`, opKey: 'school_name', opVal: 'id' },
         }
       ]
       this.setDefaultValue(params, 'searchData')
@@ -34,7 +34,7 @@ export default {
     searchHandle() {
       const oldform = this.$refs.ruleForm.baseForm
       const newForm = { ...oldform }
-      newForm.module_type = this.parentData.curNavVal
+      newForm.school_cate = this.parentData.curNavVal
       this.$emit('change', newForm)
     }
   }

src/views/school/index.vue

@@ -43,7 +43,7 @@ export default {
   mixins: [baseTable],
   data() {
     return {
-      apiStr: 'house.admschoollist',
+      apiStr: 'school.admschoollist',
       searchForm: null,
       isDtlShow: false,
       curObj: {},
@@ -87,7 +87,7 @@ export default {
   },
   methods: {
     saveHandle (row) {
-      this.$api.house.admschoolsortedit({
+      this.$api.school.admschoolsortedit({
         id: row.id,
         sort: row.sort,
       }).then(data => {
@@ -97,7 +97,7 @@ export default {
     },
     delHandle(row) {
       this.$msg(`您确定要删除该楼盘吗？`, 'confirm', () => {
-        this.$api.house.admschooldel({
+        this.$api.school.admschooldel({
           id: row.id,
         }).then(data => {
           this.$msgs(`已删除！`)

src/views/school/theme.vue

@@ -46,7 +46,7 @@ export default {
     const mtArr = this.$dictData.school_cate || []
     const curNavVal = mtArr.length > 0 ? mtArr[0].val : ''
     return {
-      apiStr: 'house.admestatemodulelist',
+      apiStr: 'school.admschoolmodulelist',
       searchForm: {},
       isDtlShow: false,
       // noCreated: true,
@@ -92,7 +92,7 @@ export default {
     },
     delHandle(row) {
       this.$msg(`您确定要删除该模块主题吗？`, 'confirm', () => {
-        this.$api.house.admestatemoduledel({
+        this.$api.school.admschoolmoduledel({
           id: row.id,
         }).then(data => {
           this.$msgs(`已删除！`)