From ad33c84b25b36ddf063d79ffa5ea6fc44840600d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Tue, 4 Apr 2023 17:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=20=E6=9B=BF=E6=8D=A2=20=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modular/main/DjyTenantConfig.js  |  7 +++++++
 src/views/main/DjyTenantConfig/index.vue | 14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/api/modular/main/DjyTenantConfig.js b/src/api/modular/main/DjyTenantConfig.js
index f74f55e..943fcb8 100644
--- a/src/api/modular/main/DjyTenantConfig.js
+++ b/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
+  })
+}
diff --git a/src/views/main/DjyTenantConfig/index.vue b/src/views/main/DjyTenantConfig/index.vue
index 3c2814f..cea56cd 100644
--- a/src/views/main/DjyTenantConfig/index.vue
+++ b/src/views/main/DjyTenantConfig/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-card :bordered="false" :bodyStyle="tstyle">
+    <!-- <a-card :bordered="false" :bodyStyle="tstyle">
       <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
         <a-form layout="inline">
           <a-row :gutter="48">
@@ -17,16 +17,16 @@
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="FnQuery">查询</a-button>
                 <a-button style="margin-left: 8px" @click="FnReset">重置</a-button>
-                <!-- <a @click="toggleAdvanced" style="margin-left: 8px">
+                <a @click="toggleAdvanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'" />
-                </a> -->
+                </a>
               </span>
             </a-col>
           </a-row>
         </a-form>
       </div>
-    </a-card>
+    </a-card> -->
     <a-card :bordered="false">
       <vxe-toolbar>
         <template #buttons>
@@ -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'
@@ -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 = []