供应商融资管理页面调整

front-vue/src/App.vue

@@ -19,9 +19,11 @@ export default {
     min-height: 100vh;
     background-color: #f4f5f6;
 }
-.zap-bg{
+
+.zap-bg {
     background-color: #ffffff;
 }
+
 .zap-padding {
     padding: 0 30px;
 }
@@ -33,12 +35,15 @@ export default {
 .zap-padding-end {
     padding-right: 25px;
 }
-.zap-padding-bottom{
+
+.zap-padding-bottom {
     padding-bottom: 25px !important;
 }
-.zap-padding-top{
+
+.zap-padding-top {
     padding-top: 25px !important;
 }
+
 .zap-margin-top {
     margin-top: 20px;
 }
@@ -113,12 +118,14 @@ export default {
         margin: 0;
     }
 }
+
 .zap-title {
     padding: 25px;
     font-size: 16px;
     color: #333333;
     background-color: #ffffff;
 }
+
 .zap-title__prefix {
     display: inline-block;
     margin-right: 10px;
@@ -126,6 +133,7 @@ export default {
     height: 20px;
     background-color: #4280f2;
 }
+
 .zap-upload-invoice .el-dialog__header {
     padding: 0;
 }
@@ -191,7 +199,8 @@ export default {
     font-size: 12px;
     color: #999999;
 }
-.zap-upload-invoce__inner{
+
+.zap-upload-invoce__inner {
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -199,6 +208,7 @@ export default {
     width: 100%;
     height: 100%;
 }
+
 .zap-form {
     padding: 0 25px;
     background-color: #ffffff;
@@ -207,21 +217,57 @@ export default {
 .zap-table ::v-deep .el-form-item__content {
     width: 100%;
 }
+
 .zap-accounts-receivable {
-  height: 36px;
-  .label {
-    font-size: 12px;
-    color: #999999;
-  }
-  .value {
-    font-size: 14px;
-    color: #333333;
-  }
+    height: 36px;
+
+    .label {
+        font-size: 12px;
+        color: #999999;
+    }
+
+    .value {
+        font-size: 14px;
+        color: #333333;
+    }
 }
-.el-table__fixed::before, .el-table__fixed-right::before{
+
+.el-table__fixed::before,
+.el-table__fixed-right::before {
     background-color: transparent;
 }
-.el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th{
+
+.el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
     background-color: #F6F9FF;
 }
+.el-table .fixed-width .el-button--mini.zap-button-info, 
+.el-table .fixed-width .el-button--mini.zap-button-parimary, 
+.el-table .fixed-width .el-button--mini.zap-button-waring, 
+.el-table .fixed-width .el-button--mini.zap-button-plain {
+    min-width: 36px;
+    height: 24px;
+    line-height: 24px;
+    text-align: center;
+    padding: 0 6px;
+    font-size: 12px;
+    border-radius: 4px;
+    box-sizing: border-box;
+}
+.el-table .fixed-width .el-button--mini.zap-button-plain{
+    color: #333333;
+    border: 1px solid #EBEBEB;
+}
+.el-table .fixed-width .el-button--mini.zap-button-waring{
+    color: #ffffff;
+    background-color: #FFB700;
+}
+.el-table .fixed-width .el-button--mini.zap-button-parimary{
+    color: #ffffff;
+    background-color: #4280F2;
+}
+.el-table .fixed-width .el-button--mini.zap-button-info{
+    color: #999999;
+    background-color: #EBEBEB;
+}
 </style>

front-vue/src/components/InvoiceButton/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-button  class="zap-invoice-button" size="mini" v-bind="$attrs" v-on="$listeners">发票</el-button>
+  <el-button  class="zap-invoice-button" size="mini" v-bind="$attrs" v-on="$listeners"><slot></slot></el-button>
 </template>
 
 <script>

front-vue/src/views/service/cost/userCostManage.vue

@@ -56,7 +56,7 @@
             <el-table-column label="快递单号" align="center" prop="zciExpressNo" v-if="uncheckList.zciExpressNo" show-overflow-tooltip />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
                 <template slot-scope="scope">
-                    <invoice-button v-if="scope.row.zciInvoiceStatus == '2' || scope.row.zciInvoiceStatus == '4'" size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['service:cost:update']"></invoice-button>
+                    <plain-button v-if="scope.row.zciInvoiceStatus == '2' || scope.row.zciInvoiceStatus == '4'" size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['service:cost:update']">发票</plain-button>
                     <pay-button v-if="scope.row.zfrStatus != '02' && (scope.row.zciStatus == '00' || scope.row.zciStatus == '05')" size="mini" type="text" @click="handlePay(scope.row)" v-hasPermi="['service:cost:pay']"></pay-button>
                     <apply-button v-if="scope.row.zciStatus == '02' && (scope.row.zfrStatus == '01' || scope.row.zfrStatus == '03') && scope.row.zciInvoiceStatus == '0'" size="mini" type="text" @click="handleApply(scope.row)" v-hasPermi="['service:cost:apply']"></apply-button>
                 </template>
@@ -151,7 +151,7 @@ import SearchBar from '@/components/SearchBar/index.vue'
 import ExportButton from '@/components/ExportButton/index.vue'
 import PayButton from '@/components/PayButton/index.vue'
 import ApplyButton from '@/components/ApplyButton/index.vue'
-import InvoiceButton from '@/components/InvoiceButton/index.vue'
+import PlainButton from '@/components/PlainButton/index.vue'
 import {
     balance,
     transfer
@@ -164,7 +164,7 @@ export default {
         ExportButton,
         PayButton,
         ApplyButton,
-        InvoiceButton
+        PlainButton
     },
     data() {
         return {

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

@@ -1,28 +1,7 @@
 <template>
 <div class="app-container zap-main">
-    <el-row class="zap-table-search">
-        <div class="zap-padding-end">
-            <right-toolbar class="zap-right-toolbar" :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: ;">重置</el-button>
-                <column-setting class="zap-column-setting" :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :tableId="tableId" style="margin-left:5px" v-if="this.companyType != '02'"></column-setting>
-            </div>
-            <hr style="margin-top: 16px;">
+    <search-bar :checkList="checkList" :tableList="tableList" :selfDom="selfDom" :companyType="companyType" :tableId="tableId" @query="handleQuery" @reset="resetQuery">
             <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
-                <!-- <el-form-item prop="rzScyName" label="资金方名称" v-if="companyType != '02'" size="large">
-                    <el-input v-model="queryParams.rzScyName" placeholder="请输入资金方名称" clearable maxlength="25" />
-                </el-form-item>
-                <el-form-item prop="zfpName" label="融资产品" size="large">
-                    <el-input v-model="queryParams.zfpName" placeholder="请输入融资产品" clearable maxlength="25" />
-                </el-form-item>
-                <el-form-item prop="AmountA" label="授信额度范围" size="large">
-                    <el-input v-model="queryParams.AmountA" placeholder="请输授信额度" clearable maxlength="20" />
-                </el-form-item>
-                <el-form-item prop="AmountB" size="large">
-                    <el-input v-model="queryParams.AmountB" placeholder="请输授信额度" clearable maxlength="20" />
-                </el-form-item> -->
                 <el-form-item label="授信类型" prop="zfpType" v-if="companyType != '02'" size="large">
                     <el-select v-model="queryParams.zfpType" placeholder="请选择类型" clearable>
                         <el-option v-for="dict in queryTypeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
@@ -63,8 +42,7 @@
                     </el-date-picker>
                 </el-form-item>
             </el-form>
-        </div>
-    </el-row>
+    </search-bar>
     <div class="zap-content zap-margin-top">
         <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['credit:line:add']">新增</el-button>
     </div>
@@ -87,7 +65,7 @@
         <el-table-column label="授信状态" :formatter="statuFormat" align="center" prop="zfsqStatus" show-overflow-tooltip />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
             <template slot-scope="scope">
-                <el-button size="mini" type="text" icon="el-icon-view" @click="handleRows(scope.row)" v-hasPermi="['credit:line:query']">详情</el-button>
+                <plain-button size="mini" type="text" @click="handleRows(scope.row)" v-hasPermi="['credit:line:query']">详情</plain-button>
             </template>
         </el-table-column>
     </el-table>
@@ -142,10 +120,14 @@ import { columnQuery, columnfilter} from "@/api/common/columnSetting";
 import ColumnSetting from "../../../components/Table/columnSetting.vue";
 import { getPreMonthDay, getCurrentDateStr} from "@/api/common/getDateUtils";
 import { getUserProfile } from "@/api/system/user";
+import SearchBar from '@/components/SearchBar/index.vue'
+import PlainButton from '@/components/PlainButton/index.vue'
 export default {
     name: "CreditLine",
     components: {
-        ColumnSetting
+        ColumnSetting,
+        SearchBar,
+        PlainButton
     },
     data() {
         return {