fix: 页面调整

bs-ui/src/views/broker/broker/components/BrokerUser.vue

@@ -332,7 +332,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "BrokerUser",
-  mixins: [AutoTableHeight],
+  // mixins: [AutoTableHeight],
   dicts: ['sys_normal_disable', 'sys_user_sex'],
   components: {Treeselect},
   props: {

bs-ui/src/views/broker/broker/components/DfBroker.vue

@@ -137,6 +137,7 @@
 
     <pagination
       :total="total"
+      :pageSizes="[5, 10, 30, 50]"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
@@ -264,7 +265,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "DfBroker",
-  mixins: [AutoTableHeight],
+  // mixins: [AutoTableHeight],
   dicts: ["df_broker_staus","sys_yes_no"],
   components: {Treeselect},
   data() {
@@ -293,7 +294,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 5,
         parentId: null,
         brokerName: null,
         brokerAddress: null,

bs-ui/src/views/broker/broker/index.vue

@@ -1,10 +1,18 @@
 <template>
-  <my-page :left-style="{width: '50%'}">
+  <!-- <my-page :left-style="{width: '50%'}">
     <template slot="left">
       <DfBroker ref="dfBroker" :extraHeight="100" style="height: 97%;"  @row-click="handleRowClick"></DfBroker>
     </template>
     <BrokerUser ref="brokerUser" :extraHeight="100" style="height: 97%;margin-left: 8px;" :rowData="rowData"></BrokerUser>
-  </my-page>
+  </my-page> -->
+  <div style="padding: 10px;">
+    <el-card>
+      <DfBroker ref="dfBroker" :extraHeight="100"  @row-click="handleRowClick"></DfBroker>
+    </el-card>
+    <el-card>
+      <BrokerUser ref="brokerUser" :extraHeight="100" :rowData="rowData"></BrokerUser>
+    </el-card>
+  </div>
 </template>
 
 <script>

bs-ui/src/views/broker/product/components/DfBroker.vue

@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="负责人" prop="chargePerson">
+      <!-- <el-form-item label="负责人" prop="chargePerson">
         <el-input
           v-model="queryParams.chargePerson"
           placeholder="请输入负责人"
@@ -28,13 +28,13 @@
           <el-option v-for="dict in dict.type.df_broker_staus" :key="dict.value" :label="dict.label"
                      :value="dict.value"/>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -82,16 +82,16 @@
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
     <el-table v-loading="loading" :data="brokerList" @sort-change="handleSortChange" :height="tableHeight - 150"
               @selection-change="handleSelectionChange" row-key="id" :highlight-current-row="true" @row-click="handleRowClick"
               default-expand-all
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column type="selection" width="55" align="center"/>
+      <!-- <el-table-column type="selection" width="55" align="center"/> -->
       <!--      <el-table-column label="id" align="center" prop="id" sortable='custom'/>-->
 <!--      <el-table-column label="" prop="" width="200"/>-->
-      <el-table-column label="代理商名称"  prop="brokerName" sortable='custom' width="200px" fixed="left"/>
-      <el-table-column label="地址" align="center" prop="brokerAddress" sortable='custom'/>
+      <el-table-column label="代理商名称"  prop="brokerName" sortable='custom' min-width="200px"/>
+      <!-- <el-table-column label="地址" align="center" prop="brokerAddress" sortable='custom'/>
       <el-table-column label="简介" align="center" prop="brokerDesc" sortable='custom' show-overflow-tooltip/>
       <el-table-column label="负责人" align="center" prop="chargePerson" sortable='custom' width="90px"/>
       <el-table-column label="联系电话" align="center" prop="contactPhone" sortable='custom' width="100px"/>
@@ -132,15 +132,15 @@
           >删除
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
-    <pagination
+    <!-- <pagination
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
-    />
+    /> -->
 
     <!-- 添加或修改代理商经纪对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body :close-on-click-modal="false">
@@ -376,8 +376,8 @@ export default {
     /** 查询代理商经纪列表 */
     getList() {
       this.loading = true;
-      pageListBroker(this.queryParams).then(response => {
-        this.brokerList = this.convertToTreeData(response.rows);
+      listBroker(this.queryParams).then(response => {
+        this.brokerList = this.convertToTreeData(response.data);
         this.total = response.total;
         this.loading = false;
       }).catch(e => {

bs-ui/src/views/broker/product/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <my-page :left-style="{width: '50%'}">
+  <my-page :left-style="{width: '20vw'}">
     <template slot="left">
-      <DfBroker ref="dfBroker" :extraHeight="100" style="height: 97%;" @row-click="handleRowClick"></DfBroker>
+      <DfBroker ref="dfBroker" style="height: 100%;width: 100%;"  @row-click="handleRowClick"></DfBroker>
     </template>
     <BrokerProduct ref="brokerUser" :extraHeight="100" style="height: 97%;margin-left: 8px;"
                 :rowData="rowData"></BrokerProduct>

bs-ui/src/views/broker/user/components/DfBroker.vue

@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="负责人" prop="chargePerson">
+      <!-- <el-form-item label="负责人" prop="chargePerson">
         <el-input
           v-model="queryParams.chargePerson"
           placeholder="请输入负责人"
@@ -28,13 +28,13 @@
           <el-option v-for="dict in dict.type.df_broker_staus" :key="dict.value" :label="dict.label"
                      :value="dict.value"/>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -82,16 +82,16 @@
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
     <el-table v-loading="loading" :data="brokerList" @sort-change="handleSortChange" :height="tableHeight - 150"
               @selection-change="handleSelectionChange" row-key="id" :highlight-current-row="true" @row-click="handleRowClick"
               default-expand-all
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column type="selection" width="55" align="center"/>
+      <!-- <el-table-column type="selection" width="55" align="center"/> -->
       <!--      <el-table-column label="id" align="center" prop="id" sortable='custom'/>-->
 <!--      <el-table-column label="" prop="" width="200"/>-->
       <el-table-column label="代理商名称"  prop="brokerName" sortable='custom' width="200px" fixed="left"/>
-      <el-table-column label="地址" align="center" prop="brokerAddress" sortable='custom'/>
+      <!-- <el-table-column label="地址" align="center" prop="brokerAddress" sortable='custom'/>
       <el-table-column label="简介" align="center" prop="brokerDesc" sortable='custom' show-overflow-tooltip/>
       <el-table-column label="负责人" align="center" prop="chargePerson" sortable='custom' width="90px"/>
       <el-table-column label="联系电话" align="center" prop="contactPhone" sortable='custom' width="100px"/>
@@ -132,15 +132,15 @@
           >删除
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
-    <pagination
+    <!-- <pagination
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
-    />
+    /> -->
 
     <!-- 添加或修改代理商经纪对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body :close-on-click-modal="false">
@@ -376,8 +376,8 @@ export default {
     /** 查询代理商经纪列表 */
     getList() {
       this.loading = true;
-      pageListBroker(this.queryParams).then(response => {
-        this.brokerList = this.convertToTreeData(response.rows);
+      listBroker(this.queryParams).then(response => {
+        this.brokerList = this.convertToTreeData(response.data);
         this.total = response.total;
         this.loading = false;
       }).catch(e => {

bs-ui/src/views/broker/user/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <my-page :left-style="{width: '50%'}">
+  <my-page :left-style="{width: '20vw'}">
     <template slot="left">
-      <DfBroker ref="dfBroker" :extraHeight="100" style="height: 97%;"  @row-click="handleRowClick"></DfBroker>
+      <DfBroker ref="dfBroker" style="height: 100%;"  @row-click="handleRowClick"></DfBroker>
     </template>
     <BrokerUserVo ref="brokerUser" :extraHeight="100" style="height: 97%;margin-left: 8px;" :rowData="rowData"></BrokerUserVo>
   </my-page>

bs-ui/src/views/product/info/index.vue

@@ -187,35 +187,35 @@
     <el-table v-loading="loading" :data="infoList" @sort-change="handleSortChange"
               @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="产品名称" align="center" prop="productName" sortable='custom' fixed="left" width="100"/>
-      <el-table-column label="产品简称" align="center" prop="simpleName" sortable='custom' fixed="left" width="100"/>
-      <el-table-column label="产品类型" align="center" prop="productType" sortable='custom' fixed="left" width="100">
+      <el-table-column label="产品名称" align="center" prop="productName" sortable='custom' fixed="left" min-width="100"/>
+      <!-- <el-table-column label="产品简称" align="center" prop="simpleName" sortable='custom' min-width="100"/> -->
+      <el-table-column label="产品类型" align="center" prop="productType" sortable='custom' min-width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.product_type" :value="scope.row.productType"/>
         </template>
       </el-table-column>
-      <el-table-column label="产品细类" align="center" prop="productSubtype" sortable='custom' fixed="left" width="100"/>
-      <el-table-column label="最高额度(元)" align="center" prop="maxAmount" sortable='custom' fixed="left" width="120"/>
-      <el-table-column label="年利率(单利)" align="center" prop="interestRate" sortable='custom' fixed="left" width="120"/>
-      <el-table-column label="产品简介" align="center" prop="productIntro" sortable='custom' show-overflow-tooltip
-                       width="100"/>
-      <el-table-column label="产品详情" align="center" prop="productDetail" sortable='custom' show-overflow-tooltip
-                       width="100"/>
-      <el-table-column label="还款周期" align="center" prop="repaymentCycle" sortable='custom' width="100"/>
-      <el-table-column label="还款方式" align="center" prop="repaymentMethod" sortable='custom' width="100"/>
-      <el-table-column label="展业城市" align="center" prop="businessCity" sortable='custom' width="100" show-overflow-tooltip/>
-      <el-table-column label="综合费率" align="center" prop="combinedRates" sortable='custom' width="100"/>
-      <el-table-column label="上架时间起" align="center" prop="listBegin" width="150" sortable='custom'>
+      <!-- <el-table-column label="产品细类" align="center" prop="productSubtype" sortable='custom' min-width="100"/> -->
+      <el-table-column label="最高额度(元)" align="center" prop="maxAmount" sortable='custom' min-width="120"/>
+      <el-table-column label="年利率(单利)" align="center" prop="interestRate" sortable='custom' min-width="120"/>
+      <!-- <el-table-column label="产品简介" align="center" prop="productIntro" sortable='custom' show-overflow-tooltip
+      min-width="100"/> -->
+      <!-- <el-table-column label="产品详情" align="center" prop="productDetail" sortable='custom' show-overflow-tooltip
+      min-width="100"/> -->
+      <!-- <el-table-column label="还款周期" align="center" prop="repaymentCycle" sortable='custom' min-width="100"/> -->
+      <!-- <el-table-column label="还款方式" align="center" prop="repaymentMethod" sortable='custom' min-width="100"/> -->
+      <el-table-column label="展业城市" align="center" prop="businessCity" sortable='custom' min-width="150" show-overflow-tooltip/>
+      <el-table-column label="综合费率" align="center" prop="combinedRates" sortable='custom' min-width="100"/>
+      <el-table-column label="上架时间起" align="center" prop="listBegin" min-width="120" sortable='custom'>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.listBegin, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="上架时间止" align="center" prop="listEnd" width="150" sortable='custom'>
+      <el-table-column label="上架时间止" align="center" prop="listEnd" min-width="120" sortable='custom'>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.listEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" sortable='custom' show-overflow-tooltip/>
+      <!-- <el-table-column label="备注" align="center" prop="remark" sortable='custom' show-overflow-tooltip/> -->
       <el-table-column label="状态" align="center" prop="status" sortable='custom' fixed="right">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.product_status" :value="scope.row.status"/>