Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/api/modular/main/DjyTenantConfig.js

@@ -31,3 +31,10 @@ export function DjyTenantConfigSave(parameter) {
     data: parameter
   })
 }
+export function getDjyTenantConfig(parameter) {
+  return axios({
+    url: '/DjyTenantConfig/get',
+    method: 'get',
+    params: parameter
+  })
+}

src/views/main/DjyTenantConfig/index.vue

@@ -8,7 +8,7 @@
               <a-row :gutter="48">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="字段名称：">
-                    <a-input v-model="queryParam.SearchValue" allow-clear placeholder="请输入字段名称" />
+                    <a-input v-model="queryParam.fieldName" allow-clear placeholder="请输入字段名称" />
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -74,7 +74,7 @@
   </div>
 </template>
 <script>
-import { DjyTenantConfigPage, DjyTenantConfigSave } from '@/api/modular/main/DjyTenantConfig'
+import { getDjyTenantConfig, DjyTenantConfigSave } from '@/api/modular/main/DjyTenantConfig'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 import { mapGetters } from 'vuex'
@@ -132,7 +132,7 @@ export default {
         }
       })
       this.DisplayLoadData = Rdata
-      this.init()
+      // this.init()
     },
     FnReset() {
       this.queryParam = { currentPage: 1, pageSize: 9999, Type: 'booking_default_value' }
@@ -170,10 +170,10 @@ export default {
     },
     FnGetData() {
       this.loading = true
-      DjyTenantConfigPage(this.queryParam).then(res => {
+      getDjyTenantConfig({ type: 'booking_default_value' }).then(res => {
         if (res.code == 200) {
           console.log(this.userInfo)
-          this.loadData = JSON.parse(res.data.rows[0].configJson)
+          this.loadData = JSON.parse(res.data.configJson)
           this.DisplayLoadData = this.loadData
         } else {
           this.loadData = []