登录、注册、忘记密码图标替换，颜色统一

front-vue/src/assets/styles/login.scss

@@ -69,7 +69,7 @@
             }
         }
     }
-    .input-icon {
+    .zap-login__icon {
         height: 16px;
         width: 16px;
         margin-top: 12px;
@@ -214,7 +214,7 @@
         display: flex;
         flex-direction: column;
         align-items: flex-start;
-        color: #389cf4;
+        color: #4280F2;
         cursor: pointer;
     }
     .zap-code-button{

front-vue/src/components/Table/ButtonsGroup.vue

@@ -0,0 +1,93 @@
+<template>
+<div>
+    <el-button class="zap-button-plain" size="mini" type="text" @click="handleDetail(scope.row)" v-hasPermi="['credit:credit:query']">详情</el-button>
+    <!--
+                (核心方)核心开立+核心审批拒绝||融资/平台拒绝||
+                (融资方)融资申请+融资审批状态/平台审批拒绝+融信不等于待签收||
+                (融资方)融资开立+融资审批状态/平台审批拒绝||
+              -->
+    <el-button class="zap-button-primary" size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['credit:credit:update']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
+                        (scope.row.companyType == '02' && scope.row.zfiCreateType == '0' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02') && scope.row.zfiStatus != '01')||
+                        (scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))
+                        ">修改</el-button>
+    <!--融信状态待确权且为核心企业
+              -->
+    <el-button class="zap-button-confirmation" size="mini" type="text" @click="handleApprove(scope.row)" v-show="scope.row.zfiStatus == '00' && scope.row.companyType == '01'" v-hasPermi="['credit:credit:approve']">确权</el-button>
+    <!--原补充资料-->
+    <!--核心开立+融信状态为待签收+融资企业   判断内部，平台，审批中不可进入
+              -->
+    <el-button class="zap-button-primary" size="mini" type="text" @click="handleAddInformation(scope.row)" v-hasPermi="['credit:credit:addInfor']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus=='01' || scope.row.zfiStatus=='06')">签收</el-button>
+    <!--融资申请+融信状态待签收+融资企业
+              判断是否内部通过 审批中不可进入
+              -->
+    <el-button class="zap-button-primary" size="mini" type="text" @click="handleSignFor(scope.row)" v-hasPermi="['credit:credit:signFor']" v-show="scope.row.zfiCreateType == '0' && scope.row.zfiStatus=='01' && scope.row.companyType == '02'">签收</el-button>
+    <!--(融资申请+融信状态待签收+融资审批状态不是审批中并且不是审批通过)||
+                  (核心开立+融信状态为待签收+(融资审批状态不是审批中并且不是审批通过)或者(平台审批状态不是审批中并且不是审批通过))
+              -->
+    <!--生效-->
+    <el-button class="zap-button-primary" size="mini" type="text" @click="handleGoFinance(scope.row)" v-hasPermi="['finance:record:add']" v-show="(scope.row.zfiCreateType == '1' ||scope.row.zfiCreateType == '0' || scope.row.zfiCreateType == '2') && scope.row.zfiStatus == '02'">去融资</el-button>
+    <!--(核心)核心开立:核心审批通过+其他状态为空||
+                (融资方)补充资料：融资方通过+核心通过+平台通过+待签收||
+                (融资方)融资开立:融资方通过+平台通过+其他为空||
+                (核心)确权:融资方通过+核心通过+平台通过+待确权
+            -->
+    <!--核心开立
+                类型为核心开立，状态为空，并且核心企业
+              -->
+    <el-button class="zap-button-primary" size="mini" type="text" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">开立融信</el-button>
+    <el-button class="zap-button-info" size="mini" type="text" @click="refuse(scope.row)" v-show="(scope.row.companyType == '01' || scope.row.companyType == '02')
+                        && (scope.row.zfiCreateType == '1' || scope.row.zfiCreateType == '2')
+                        && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">作废</el-button>
+    <!--供应商开立
+                类型为供应商开立，状态为空，并且融资企业
+              -->
+    <el-button class="zap-button-primary" size="mini" type="text" @click="seal(scope.row)" v-hasPermi="['credit:credit:seal']" v-show="scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiStatus == '' || scope.row.zfiStatus == 'null' ||  scope.row.zfiStatus == null)">融信开立</el-button>
+    <el-button class="zap-button-primary" size="mini" type="text" @click="handleDelete(scope.row)" v-hasPermi="['credit:credit:del']" v-show="(scope.row.companyType == '01' && scope.row.zfiCreateType == '1' && (scope.row.zfiCoreStatus == '02' || scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))||
+                        (scope.row.companyType == '02' && scope.row.zfiCreateType == '0' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02') && scope.row.zfiStatus != '01')||
+                        (scope.row.companyType == '02' && scope.row.zfiCreateType == '2' && (scope.row.zfiSupplierStatus == '02' || scope.row.zfiPlatformStatus == '02'))">删除</el-button>
+    <el-button class="zap-button-primary" size="mini" type="text" @click="handleFlowable(scope.row)">查看流程</el-button>
+</div>
+</template>
+
+<script>
+export default {
+    name: "ButtonsGroup",
+    props: ['scope'],
+    methods: {
+        handleDetail(row) {
+            this.$emit("handleDetail", row)
+        },
+        handleUpdate(row) {
+            this.$emit("handleUpdate", row)
+        },
+        handleApprove(row) {
+            this.$emit("handleApprove", row)
+        },
+        handleAddInformation(row) {
+            this.$emit("handleAddInformation", row)
+        },
+        handleSignFor (row) {
+            this.$emit("handleSignFor", row)
+        },
+        handleGoFinance (row) {
+            this.$emit("handleGoFinance", row)
+        },
+        seal (row) {
+            this.$emit("seal", row)
+        },
+        refuse (row) {
+            this.$emit("refuse", row)
+        },
+        handleDelete (row) {
+            this.$emit('handleDelete', row)
+        },
+        handleFlowable (row) {
+            this.$emit("handleFlowable", row)
+        }
+    }
+}
+</script>
+
+<style>
+
+</style>

front-vue/src/views/forgetUser.vue

@@ -10,12 +10,12 @@
                     <el-tab-pane label="找回密码" name="login_shortMessage">
                         <el-form-item prop="phone" v-if="!passwordUpdate">
                             <el-input v-model="loginForm.phone" type="text" auto-complete="off" placeholder="手机号" maxlength="11">
-                                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/register/icon_mobile.png" alt="">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="shortMessageCode" v-if="!passwordUpdate">
                             <el-input v-model="loginForm.shortMessageCode" type="text"  maxlength="" auto-complete="off" placeholder="请输入验证码" class="login-code-msg" id="" onkeydown="enterHandler(event)">
-                                <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/register/icon_verify.png" alt="">
                                 <el-button class="zap-code-button" slot="suffix" @click="sendMessage" :disabled="sendShortMessageBtn">{{codeBtnWord}}</el-button>
                             </el-input>
                         </el-form-item>

front-vue/src/views/login.vue

@@ -13,12 +13,12 @@
                     <el-tab-pane label="验证码登录" name="login_shortMessage">
                         <el-form-item prop="phone">
                             <el-input v-model="loginForm.phone" type="text" auto-complete="off" placeholder="手机号">
-                                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/register/icon_mobile.png" alt="">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="cade">
                             <el-input v-model="loginForm.shortMessageCode" type="text"  maxlength="" auto-complete="off" placeholder="请输入验证码" class="login-code-msg" id="">
-                                <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/register/icon_verify.png" alt="">
                                 <el-button class="zap-code-button" slot="suffix" @click="sendMessage" :disabled="sendShortMessageBtn">{{codeBtnWord}}</el-button>
                             </el-input>
                         </el-form-item>
@@ -41,17 +41,17 @@
                     <el-tab-pane label="密码登录" name="login_password">
                         <el-form-item prop="username">
                             <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
-                                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/login/icon_account.png" alt="">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="password">
                             <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
-                                <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/login/icon_pwd.png" alt="">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="code">
                             <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" @keyup.enter.native="handleLogin">
-                                <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/login/icon_verify.png" alt="">
                             </el-input>
                             <div class="login-code">
                                 <img :src="codeUrl" @click="getCode" class="login-code-img" />
@@ -60,7 +60,7 @@
                         <el-form-item style="width:100%;margin-bottom: 0;" >
                             <el-row type="flex" justify="space-between" style="width: 100%;">
                                 <el-checkbox v-model="loginForm.rememberMe">自动登录</el-checkbox>
-                                <el-link href="/forgetUser" style="color: #389cf4;">忘记密码？</el-link>
+                                <el-link href="/forgetUser" style="color: #4280F2;">忘记密码？</el-link>
                             </el-row>
                         </el-form-item>
                         <el-form-item style="width:100%;">
@@ -69,7 +69,7 @@
                                 <span v-else>登 录 中...</span>
                             </el-button>
                         </el-form-item>
-                        <el-link style="margin-right:50px; font-size: 16px;margin-bottom: 30px;color: #389cf4;" href="/registerUser">还没账号？立即注册</el-link>
+                        <el-link style="margin-right:50px; font-size: 16px;margin-bottom: 30px;color: #4280F2;" href="/registerUser">还没账号？立即注册</el-link>
                         <el-form-item>
                             <div class="zap-agreement">
                                 <span class="zap-agreement__text">登录视为同意并遵守</span>

front-vue/src/views/register.vue

@@ -517,7 +517,7 @@ export default {
         display: flex;
         flex-direction: column;
         align-items: flex-start;
-        color: #389cf4;
+        color: #4280F2;
         cursor: pointer;
     }
     .zap-code-button{

front-vue/src/views/registerUser.vue

@@ -6,33 +6,33 @@
                     <el-tab-pane label="账号注册" name="login_shortMessage">
                         <el-form-item prop="company">
                             <el-input v-model="loginForm.company" type="text" auto-complete="off" placeholder="企业名称" maxlength="15">
-                                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/register/icon_business.png" alt="">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="username">
                             <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="联系人" maxlength="15">
-                                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/register/icon_account.png" alt="">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="phone">
                             <el-input v-model="loginForm.phone" type="text" auto-complete="off" placeholder="手机号" maxlength="11">
-                                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/register/icon_mobile.png" alt="">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="shortMessageCode">
                             <el-input v-model="loginForm.shortMessageCode" type="text"  maxlength="" auto-complete="off" placeholder="请输入验证码" id="" class="login-code-msg"  onkeydown="enterHandler(event)">
-                                <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/register/icon_verify.png" alt="">
                                 <el-button class="zap-code-button" slot="suffix" @click="sendMessage" :disabled="sendShortMessageBtn">{{codeBtnWord}}</el-button>
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="password">
                             <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" maxlength="12">
-                                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/register/icon_pwd.png" alt="">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="again">
                             <el-input v-model="loginForm.again" type="password" auto-complete="off" placeholder="确认密码" maxlength="12">
-                                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+                                <img slot="prefix" class="zap-login__icon" src="../assets/images/register/icon_pwd.png" alt="">
                             </el-input>
                         </el-form-item>
                         <el-form-item>

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

@@ -418,7 +418,19 @@
                             <el-table-column label="融信状态" :formatter="stateFormat" align="center" prop="zfiStatus" :show-overflow-tooltip="true" />
                             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width='400' fixed="right">
                                 <template slot-scope="scope">
-                                    
+                                    <buttons-group 
+                                    :scope="scope" 
+                                    @handleDetail="handleDetail(scope.row)"
+                                    @handleUpdate="handleUpdate(scope.row)"
+                                    @handleApprove="handleApprove(scope.row)"
+                                    @handleAddInformation="handleAddInformation(scope.row)"
+                                    @handleSignFor="handleSignFor(scope.row)"
+                                    @handleGoFinance="handleGoFinance(scope.row)"
+                                    @seal="seal(scope.row)"
+                                    @refuse="refuse(scope.row)"
+                                    @handleDelete="handleDelete(scope.row)"
+                                    @handleFlowable="handleFlowable(scope.row)"
+                                ></buttons-group>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -1214,13 +1226,15 @@ import {
 } from "@/api/service/credit/approvalRelatedCredit";
 import SearchBar from '@/components/SearchBar/index.vue'
 import StatisticalData from '@/components/StatisticalData/index.vue'
+import ButtonsGroup from '@/components/Table/ButtonsGroup.vue'
 export default {
     name: "invoice",
     components: {
         Editor,
         FlowDetail,
         SearchBar,
-        StatisticalData
+        StatisticalData,
+        ButtonsGroup
     },
     data() {
         return {