往来账款页面样式调整

front-vue/src/views/service/bill/bill.vue

@@ -1,16 +1,6 @@
 <template>
 <div class="app-container zap-main">
-    <el-row class="zap-table-search">
-        <div class="zap-padding-end">
-            <right-toolbar style="margin-top: 4px;" :showSearch.sync="showSearch" @queryTable="getList">收起</right-toolbar>
-            <span class="zap-padding-start zap-font-title">所选条件:</span>
-            <div style="float: right;margin-right:1%">
-                <el-button type="cyan" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-                <el-button icon="el-icon-refresh" @click="resetQuery" style="float: ;margin-right: 20px;">重置</el-button>
-                <column-setting :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" style="margin-left:5px"></column-setting>
-            </div>
-        </div>
-        <hr style="margin-top: 16px;">
+    <search-bar :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" @query="handleQuery" @reset="resetQuery">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
             <el-form-item prop="value" size="large">
                 <el-select v-model="queryParams.value" placeholder="请选择" clearable v-if="companyType !='00'" @change="change">
@@ -37,43 +27,45 @@
             </el-form-item>
 
         </el-form>
-    </el-row>
+    </search-bar>
     <div class="zap-content zap-margin-top">
         <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['service:bill:add']">新增</el-button>
     </div>
 
-    <el-table stripe v-loading="loading" :data="billList" row-key="categoryId" default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}" border>
-        <el-table-column label="序号" type="index" width="50" align="center">
-            <template slot-scope="scope">
-                <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
-            </template>
-        </el-table-column>
-        <el-table-column label="账款编号" align="center" prop="zbiNumber" v-if="uncheckList.zbiNumber" :show-overflow-tooltip="true" />
-        <el-table-column label="账款名称" align="center" prop="zbiName" v-if="uncheckList.zbiName" :show-overflow-tooltip="true" />
-        <el-table-column label="账款类型" align="center" prop="zbiType" v-if="uncheckList.zbiType&&company.scyType!='00'" :show-overflow-tooltip="true" :formatter="typeFormat" />
-        <el-table-column label="关联融信" align="center" prop="zfiNumber" v-if="uncheckList.zfiNumber" :show-overflow-tooltip="true" />
-        <el-table-column label="应付方" align="center" prop="payerName" v-if="uncheckList.payerName" :show-overflow-tooltip="true" />
-        <el-table-column label="应收方" align="center" prop="payeeName" v-if="uncheckList.payeeName" :show-overflow-tooltip="true" />
-        <el-table-column label="账款金额" align="center" :formatter="moneyFormat" prop="zbiAmount" v-if="uncheckList.zbiAmount" :show-overflow-tooltip="true" />
-        <el-table-column label="贸易日期" align="center" prop="zbiDate" v-if="uncheckList.zbiDate" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-                <span>{{ parseTime(new Date(scope.row.zbiDate),'{y}-{m}-{d}') }}</span>
-            </template>
-        </el-table-column>
-        <el-table-column label="预计还款日" align="center" prop="zbiPayDate" v-if="uncheckList.zbiPayDate" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-                <span>{{ parseTime(new Date(scope.row.zbiPayDate),'{y}-{m}-{d}') }}</span>
-            </template>
-        </el-table-column>
-        <el-table-column label="账款状态" align="center" prop="zbiStatus" v-if="uncheckList.zbiStatus" :show-overflow-tooltip="true" :formatter="statusFormat" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
-            <template slot-scope="scope">
-                <el-button size="mini" type="text" icon="el-icon-info" @click="handleDetail(scope.row)" v-show="scope.row.zfiNumber" v-hasPermi="['service:bill:detail']">详情</el-button>
-                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-show="!scope.row.zfiNumber" v-hasPermi="['service:bill:edit']">修改</el-button>
-                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-show="!scope.row.zfiNumber" v-hasPermi="['service:bill:del']">删除</el-button>
-            </template>
-        </el-table-column>
-    </el-table>
+    <el-row class="zap-content">
+        <el-table stripe v-loading="loading" :data="billList" row-key="categoryId" default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+            <el-table-column label="序号" type="index" width="50" align="center">
+                <template slot-scope="scope">
+                    <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="账款编号" align="center" prop="zbiNumber" v-if="uncheckList.zbiNumber" :show-overflow-tooltip="true" />
+            <el-table-column label="账款名称" align="center" prop="zbiName" v-if="uncheckList.zbiName" :show-overflow-tooltip="true" />
+            <el-table-column label="账款类型" align="center" prop="zbiType" v-if="uncheckList.zbiType&&company.scyType!='00'" :show-overflow-tooltip="true" :formatter="typeFormat" />
+            <el-table-column label="关联融信" align="center" prop="zfiNumber" v-if="uncheckList.zfiNumber" :show-overflow-tooltip="true" />
+            <el-table-column label="应付方" align="center" prop="payerName" v-if="uncheckList.payerName" :show-overflow-tooltip="true" />
+            <el-table-column label="应收方" align="center" prop="payeeName" v-if="uncheckList.payeeName" :show-overflow-tooltip="true" />
+            <el-table-column label="账款金额" align="center" :formatter="moneyFormat" prop="zbiAmount" v-if="uncheckList.zbiAmount" :show-overflow-tooltip="true" />
+            <el-table-column label="贸易日期" align="center" prop="zbiDate" v-if="uncheckList.zbiDate" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <span>{{ parseTime(new Date(scope.row.zbiDate),'{y}-{m}-{d}') }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="预计还款日" align="center" prop="zbiPayDate" v-if="uncheckList.zbiPayDate" :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                    <span>{{ parseTime(new Date(scope.row.zbiPayDate),'{y}-{m}-{d}') }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="账款状态" align="center" prop="zbiStatus" v-if="uncheckList.zbiStatus" :show-overflow-tooltip="true" :formatter="statusFormat" />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
+                <template slot-scope="scope">
+                    <el-button class="zap-button-plain" size="mini" type="text" @click="handleDetail(scope.row)" v-show="scope.row.zfiNumber" v-hasPermi="['service:bill:detail']">详情</el-button>
+                    <el-button class="zap-button-primary" size="mini" type="text" @click="handleUpdate(scope.row)" v-show="!scope.row.zfiNumber" v-hasPermi="['service:bill:edit']">修改</el-button>
+                    <el-button class="zap-button-confirmation" size="mini" type="text" @click="handleDelete(scope.row)" v-show="!scope.row.zfiNumber" v-hasPermi="['service:bill:del']">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+    </el-row>
 
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
@@ -97,10 +89,12 @@ import {
 } from "@/api/common/columnSetting";
 import ColumnSetting from '../../../components/Table/columnSetting.vue';
 import Cookies from 'js-cookie'
+import SearchBar from '@/components/SearchBar/index.vue'
 export default {
     name: "Bill",
     components: {
-        ColumnSetting
+        ColumnSetting,
+        SearchBar
     },
     data() {
         return {
@@ -378,31 +372,3 @@ export default {
     }
 };
 </script>
-
-<style lang="scss" scoped>
-.zap-table-search {
-    padding-top: 12px;
-    background-color: #ffffff;
-}
-
-.zap-table-search__form {
-    display: flex;
-    align-items: center;
-    min-height: 90px;
-
-    .el-form-item--medium.el-form-item {
-        margin-bottom: 0;
-    }
-
-    .el-form-item__label {
-        line-height: 40px;
-        font-size: 14px;
-        color: #333333;
-    }
-
-    .el-input--small .el-input__inner {
-        height: 40px;
-        line-height: 40px;
-    }
-}
-</style>

front-vue/src/views/service/companyInformation/companyInformation.vue

@@ -365,7 +365,7 @@
             <!--———————————————————————————————————— 链属关系 ————————————————————————————————————————————————-->
             <el-tab-pane v-if="companyType != '03'" label="链属关系" name="Section">
                 <search-bar :hiddenSetting="true" @query="handleQuery" @reset="resetQuery" style="padding-left: 0;padding-right: 0;">
-                    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="150px">
+                    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="80px">
                         <el-form-item label="企业类型" prop="scrType">
                             <el-select v-model="queryParams.scrType" placeholder="企业类型" clearable size="small" style="width: 215px">
                                 <el-option v-for="dict in scrTypeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>