Browse Source

样式优化

zhanglb 3 years ago
parent
commit
65d137ee5c

+ 74 - 45
front-vue/src/assets/styles/element-ui.scss

@@ -90,103 +90,132 @@
 .el-table .fixed-width .el-button--mini.zap-button-primary,
 .el-table .fixed-width .el-button--mini.zap-button-warning,
 .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;
+  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;
+  color: #333333;
+  border: 1px solid #EBEBEB;
 }
 
 .el-table .fixed-width .el-button--mini.zap-button-warning {
-    color: #ffffff;
-    background-color: #FFB700;
+  color: #ffffff;
+  background-color: #FFB700;
 }
 
 .el-table .fixed-width .el-button--mini.zap-button-primary {
-    color: #ffffff;
-    background-color: #4280F2;
+  color: #ffffff;
+  background-color: #4280F2;
 }
+
 .el-table .fixed-width .el-button--mini.zap-button-info {
-    color: #999999;
-    background-color: #EBEBEB;
+  color: #999999;
+  background-color: #EBEBEB;
 }
+
 // 确权、删除
-.el-table .fixed-width .el-button--mini.zap-button-confirmation{
-    color: #ffffff;
-    background-color: #FF2F2F;
+.el-table .fixed-width .el-button--mini.zap-button-confirmation {
+  color: #ffffff;
+  background-color: #FF2F2F;
 }
+
 // 修改
 .el-button--medium.zap-button-success {
-    width: 112px;
-    height: 36px;
-    line-height: 36px;
-    padding: 0;
-    text-align: center;
-    font-size: 14px;
-    color: #ffffff;
-    background: #00B53A;
-    border-radius: 4px;
+  width: 112px;
+  height: 36px;
+  line-height: 36px;
+  padding: 0;
+  text-align: center;
+  font-size: 14px;
+  color: #ffffff;
+  background: #00B53A;
+  border-radius: 4px;
 }
+
 // 修改
-.el-table .fixed-width .el-button--mini.zap-button-success{
-    color: #ffffff;
-    background: #00B53A;
+.el-table .fixed-width .el-button--mini.zap-button-success {
+  color: #ffffff;
+  background: #00B53A;
 }
-.el-button--medium.WIDTH64{
+
+.el-button--medium.WIDTH64 {
   min-width: 64px !important;
 }
 
 
-.el-menu-item .el-menu-item::hover{
+.el-menu-item .el-menu-item::hover {
   color: #ffffff !important;
   background-color: #4280F2 !important;
 }
-.zap-form-input--red.el-input--medium .el-input__inner{
+
+.zap-form-input--red.el-input--medium .el-input__inner {
   color: #FF2F2F !important;
 }
-.zap-flex-1{
+
+.zap-flex-1 {
   flex: 0 0 1;
 }
-.zap-form-search-wrap{
+
+.zap-form-search-wrap {
   width: 440px;
   height: 58px;
   line-height: 36px;
   vertical-align: top;
   font-size: 14px;
   color: #333333;
-  .label{
+
+  .label {
     display: inline-block;
     width: 176px;
     padding-right: 12px;
     text-align: right;
     box-sizing: border-box;
   }
-  .value{
 
-  }
+  .value {}
 }
-.zap-form-input--small{
+
+.zap-form-input--small {
   width: 200px !important;
-  &.date{
-    .el-range-input{
+
+  &.date {
+    .el-range-input {
       font-size: 12px !important;
     }
   }
 }
-.zap-form-input--medium{
+
+.zap-form-input--medium {
   width: 248px !important;
 }
-.zap-form-input--default{
+
+.zap-form-input--default {
   width: 256px !important;
 }
-.el-form-item__label{
+
+.el-form-item__label {
   font-weight: 500 !important;
 }
+
+.is-in-pagination {
+  margin-left: 8px;
+  margin-right: 8px;
+  .el-input__inner {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 48px;
+    height: 32px;
+    background: #FFFFFF;
+    border-radius: 2px;
+    border-color: rgba(0, 0, 0, 0.15) !important;
+  }
+}

+ 3 - 0
front-vue/src/assets/styles/huyi.scss

@@ -70,6 +70,9 @@
 .m20 {
   margin-left: 20px;
 }
+.mr24{
+  margin-right: 24px;
+}
 .ml24{
   margin-left: 24px;
 }

+ 3 - 1
front-vue/src/components/Attachments/index.vue

@@ -36,6 +36,7 @@ export default {
     background-color: #F7F7F7;
     box-sizing: border-box;
     cursor: pointer;
+    overflow: hidden;
 }
 
 .attachments__name {
@@ -47,13 +48,14 @@ export default {
     line-height: 40px;
     text-align: center;
     padding: 0 20px;
+    margin: 0;
     font-size: 16px;
     color: #ffffff;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
     border-radius: 0px 0px 4px 4px;
-    background-color: rgba(0, 0, 0, 0.4);
+    background-color: #949494;
     box-sizing: border-box;
 }
 .attachements__marker{

+ 391 - 294
front-vue/src/views/forgetUser.vue

@@ -1,324 +1,421 @@
 <template>
-    <login-content>
-        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-            <template v-if="!scanningLogin">
-                <div class="zap-2dcode">
-                    <!-- <img class="zap-2dcode__text" src="../assets/images/code1_1.png" alt=""> -->
-                    <!-- <img class="zap-2dcode__img" src="../assets/images/code1_2.gif" alt="" @click="scanningLogin=true"> -->
-                </div>
-                <el-tabs v-model="activeName" class="zap-tabs" @tab-click="changeLoginType">
-                    <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">
-                                <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)">
-                                <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 style="width:100%;" v-if="!passwordUpdate">
-                            <el-button :loading="loading"  class="zap-button" size="medium" type="primary" @click.native.prevent="handleLogin">
-                                <span v-if="!loading">下 一 步</span>
-                                <span v-else>请 稍 后...</span>
-                            </el-button>
-                        </el-form-item>
-                        <el-form-item prop="password" v-if="passwordUpdate">
-                            <el-input v-model="loginForm.password" type="text" auto-complete="off" placeholder="密码" maxlength="20">
-                                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item prop="again" v-if="passwordUpdate">
-                            <el-input v-model="loginForm.again" type="text" auto-complete="off" placeholder="确认密码" maxlength="20">
-                                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
-                            </el-input>
-                        </el-form-item>
-                        <el-form-item style="width:100%;" v-if="passwordUpdate">
-                            <el-button :loading="loading"  class="zap-button" size="medium" type="primary" @click.native.prevent="handleUpdate">
-                                <span v-if="!loading">下 一 步</span>
-                                <span v-else>请 稍 后...</span>
-                            </el-button>
-                        </el-form-item>
-                    </el-tab-pane>
-                </el-tabs>
-            </template>
-        </el-form>
-
-        <!-- 密码登录验证码 -->
-        <el-dialog
-            title="验证码"
-            :close-on-click-modal="false"
-            :visible.sync="codeDialogVisible"
-            width="30%">
-            <el-row type="flex" style="padding: 20px;">
-                <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 53%;" @keyup.enter.native="handleLogin">
-                    <img slot="prefix" class="zap-login__icon" src="../assets/images/login/icon_verify.png" alt="">
+  <login-content>
+    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
+      <template v-if="!scanningLogin">
+        <div class="zap-2dcode">
+          <!-- <img class="zap-2dcode__text" src="../assets/images/code1_1.png" alt=""> -->
+          <!-- <img class="zap-2dcode__img" src="../assets/images/code1_2.gif" alt="" @click="scanningLogin=true"> -->
+        </div>
+        <el-tabs v-model="activeName" class="zap-tabs" @tab-click="changeLoginType">
+          <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"
+              >
+                <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-row type="flex" align="center">
+                <el-input
+                  v-model="loginForm.shortMessageCode"
+                  type="text"
+                  maxlength
+                  auto-complete="off"
+                  placeholder="请输入验证码"
+                  class="login-code-msg"
+                  id
+                  onkeydown="enterHandler(event)"
+                >
+                  <img
+                    slot="prefix"
+                    class="zap-login__icon"
+                    src="../assets/images/register/icon_verify.png"
+                    alt
+                  />
                 </el-input>
-                <div class="login-code">
-                    <img :src="codeUrl" @click="getCode" class="login-code-img" />
-                </div>
-            </el-row>
-            <el-row slot="footer" class="zap-dialog-footer zap-dialog-footer--small">
-                <el-button type="primary" @click="handleImgCodeSubmit">确 定</el-button>
-            </el-row>
-        </el-dialog>
-    </login-content>
+                <el-button
+                  class="zap-code-button"
+                  @click="sendMessage"
+                  :disabled="sendShortMessageBtn"
+                >{{codeBtnWord}}</el-button>
+              </el-row>
+            </el-form-item>
+            <el-form-item style="width:100%;" v-if="!passwordUpdate">
+              <el-button
+                :loading="loading"
+                class="zap-button"
+                size="medium"
+                type="primary"
+                @click.native.prevent="handleLogin"
+              >
+                <span v-if="!loading">下 一 步</span>
+                <span v-else>请 稍 后...</span>
+              </el-button>
+            </el-form-item>
+            <el-form-item prop="password" v-if="passwordUpdate">
+              <el-input
+                v-model="loginForm.password"
+                type="text"
+                auto-complete="off"
+                placeholder="密码"
+                maxlength="20"
+              >
+                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+              </el-input>
+            </el-form-item>
+            <el-form-item prop="again" v-if="passwordUpdate">
+              <el-input
+                v-model="loginForm.again"
+                type="text"
+                auto-complete="off"
+                placeholder="确认密码"
+                maxlength="20"
+              >
+                <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+              </el-input>
+            </el-form-item>
+            <el-form-item style="width:100%;" v-if="passwordUpdate">
+              <el-button
+                :loading="loading"
+                class="zap-button"
+                size="medium"
+                type="primary"
+                @click.native.prevent="handleUpdate"
+              >
+                <span v-if="!loading">下 一 步</span>
+                <span v-else>请 稍 后...</span>
+              </el-button>
+            </el-form-item>
+          </el-tab-pane>
+        </el-tabs>
+      </template>
+    </el-form>
+
+    <!-- 密码登录验证码 -->
+    <el-dialog
+      title="验证码"
+      :close-on-click-modal="false"
+      :visible.sync="codeDialogVisible"
+      width="30%"
+    >
+      <el-row type="flex" style="padding: 20px;">
+        <el-input
+          v-model="loginForm.code"
+          auto-complete="off"
+          placeholder="验证码"
+          style="width: 53%;"
+          @keyup.enter.native="handleLogin"
+        >
+          <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" />
+        </div>
+      </el-row>
+      <el-row slot="footer" class="zap-dialog-footer zap-dialog-footer--small">
+        <el-button type="primary" @click="handleImgCodeSubmit">确 定</el-button>
+      </el-row>
+    </el-dialog>
+  </login-content>
 </template>
 <script>
-import { getCodeImg, sendShortMessage, chooseCompanyLogin, forgetUser, updateUser} from "@/api/login";
+import {
+  getCodeImg,
+  sendShortMessage,
+  chooseCompanyLogin,
+  forgetUser,
+  updateUser
+} from "@/api/login";
 import { wxImg } from "@/api/system/weChat";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from "@/utils/jsencrypt";
-import wxlogin from 'vue-wxlogin'
-import LoginContent from "@/components/LoginContent/index.vue"
+import wxlogin from "vue-wxlogin";
+import LoginContent from "@/components/LoginContent/index.vue";
 export default {
   components: {
-    wxlogin : wxlogin,
+    wxlogin: wxlogin,
     LoginContent: LoginContent
   },
-    name: "Login",
-    data() {
-        return {
-            //默认背景图
-            activeName: "login_shortMessage",
-            baseImg: require('../assets/images/login/login_illustration.png'),
-            BackgroundImg : require('../assets/images/login/login_illustration.png'),
-            scanningLogin: false, // 是否扫码登陆
-            logo: '',
-            // baseLogo: require('../assets/images/lgo.png'),
-            codeUrl: "",
-            cookiePassword: "",
-            loginForm: {
-                shortMessageCode: '',
-                username: "",
-                password: "",
-                rememberMe: false,
-                code: "",
-                uuid: "",
-                unionId : "",
-                type : "2"
-            },
-            codeBtnWord: '获取验证码', // 获取验证码按钮文字
-            waitTime:2, // 获取验证码按钮失效时间
-            loginRules: {
-                company: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        message: "企业名称不能为空",
-                    },
-                ],
-                username: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        message: "联系人不能为空",
-                    },
-                ],
-                phone: [
-                    {
-                        required: true,
-                        pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
-                        trigger: "blur",
-                        message: "请输入正确的手机号",
-                    },
-                ],
-                shortMessageCode: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        message: "验证码不能为空",
-                    },
-                ],
-                password: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        message: "密码不能为空",
-                    },
-                ],
-                again: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        message: "确认密码不能为空",
-                    },
-                ],
-            },
-            loading: false,
-            redirect: undefined,
-            wxSrc: require("../assets/images/wx1.png"),
-            sendShortMessageBtn : false,
-            dialogVisible : false,
-            companyList : [],
-            chooseCompanyId : '',
-            codeDialogVisible: false,
-            passwordUpdate: false
-        };
-    },
-    watch: {
-        $route: {
-            handler: function (route) {
-                this.redirect = route.query && route.query.redirect;
-            },
-            immediate: true,
-        },
-    },
-    created() {
-        this.getCode();
-        // this.getlistDomain();
-    },
-    methods: {
-      changeImg(){
-          this.wxSrc = require("../assets/images/wx.png")
-      },
-      returnImg(){
-          this.wxSrc = require("../assets/images/wx1.png")
+  name: "Login",
+  data() {
+    return {
+      //默认背景图
+      activeName: "login_shortMessage",
+      baseImg: require("../assets/images/login/login_illustration.png"),
+      BackgroundImg: require("../assets/images/login/login_illustration.png"),
+      scanningLogin: false, // 是否扫码登陆
+      logo: "",
+      // baseLogo: require('../assets/images/lgo.png'),
+      codeUrl: "",
+      cookiePassword: "",
+      loginForm: {
+        shortMessageCode: "",
+        username: "",
+        password: "",
+        rememberMe: false,
+        code: "",
+        uuid: "",
+        unionId: "",
+        type: "2"
       },
-      getCode() {
-          getCodeImg().then((res) => {
-              this.codeUrl = "data:image/gif;base64," + res.img;
-              this.loginForm.uuid = res.uuid;
-          });
-      },
-      handleImgCodeSubmit () {
-          if (this.activeName === 'login_password') {
-              this.handleLogin()
-          } else {
-              this.sendMessage()
+      codeBtnWord: "获取验证码", // 获取验证码按钮文字
+      waitTime: 2, // 获取验证码按钮失效时间
+      loginRules: {
+        company: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "企业名称不能为空"
+          }
+        ],
+        username: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "联系人不能为空"
+          }
+        ],
+        phone: [
+          {
+            required: true,
+            pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
+            trigger: "blur",
+            message: "请输入正确的手机号"
+          }
+        ],
+        shortMessageCode: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "验证码不能为空"
+          }
+        ],
+        password: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "密码不能为空"
+          }
+        ],
+        again: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "确认密码不能为空"
           }
+        ]
       },
-      handleLogin() {
-          this.$refs.loginForm.validate((valid) => {
-              if (valid) {
-                  this.loading = true;
-                  // 验证码不能为空
-                  if (this.loginForm.shortMessageCode == null || this.loginForm.shortMessageCode == "") {
-                    this.msgError("请输入短信验证码!");
-                    this.loading = false;
-                    return;
-                  }
-                  forgetUser(this.loginForm).then((res) => {
-                    this.loading = false;
-                    this.passwordUpdate = true
-                    if (res.data.code == "0") {
-                        console.log("未认证!")
-                        this.$router.push({ path: "/login" });
-                    }
-                  }).catch(() => {
-                    this.loading = false;
-                  });
-              }
-          });
+      loading: false,
+      redirect: undefined,
+      wxSrc: require("../assets/images/wx1.png"),
+      sendShortMessageBtn: false,
+      dialogVisible: false,
+      companyList: [],
+      chooseCompanyId: "",
+      codeDialogVisible: false,
+      passwordUpdate: false
+    };
+  },
+  watch: {
+    $route: {
+      handler: function(route) {
+        this.redirect = route.query && route.query.redirect;
       },
-      handleUpdate() {
-          this.$refs.loginForm.validate((valid) => {
-              if (valid) {
-                  this.loading = true;
-                  // 验证码不能为空
-                  if (this.loginForm.shortMessageCode == null || this.loginForm.shortMessageCode == "") {
-                    this.msgError("请输入短信验证码!");
-                    this.loading = false;
-                    return;
-                  }
-                  updateUser(this.loginForm).then((res) => {
-                    this.loading = false;
-                    this.msgSuccess("重置密码成功!");
-                    this.$router.push({ path: "/login" });
-                  }).catch(() => {
-                    this.loading = false;
-                  });
+      immediate: true
+    }
+  },
+  created() {
+    this.getCode();
+    // this.getlistDomain();
+  },
+  methods: {
+    changeImg() {
+      this.wxSrc = require("../assets/images/wx.png");
+    },
+    returnImg() {
+      this.wxSrc = require("../assets/images/wx1.png");
+    },
+    getCode() {
+      getCodeImg().then(res => {
+        this.codeUrl = "data:image/gif;base64," + res.img;
+        this.loginForm.uuid = res.uuid;
+      });
+    },
+    handleImgCodeSubmit() {
+      if (this.activeName === "login_password") {
+        this.handleLogin();
+      } else {
+        this.sendMessage();
+      }
+    },
+    handleLogin() {
+      this.$refs.loginForm.validate(valid => {
+        if (valid) {
+          this.loading = true;
+          // 验证码不能为空
+          if (
+            this.loginForm.shortMessageCode == null ||
+            this.loginForm.shortMessageCode == ""
+          ) {
+            this.msgError("请输入短信验证码!");
+            this.loading = false;
+            return;
+          }
+          forgetUser(this.loginForm)
+            .then(res => {
+              this.loading = false;
+              this.passwordUpdate = true;
+              if (res.data.code == "0") {
+                console.log("未认证!");
+                this.$router.push({ path: "/login" });
               }
-          });
-      },
-      getUrlKey(name) {
-          return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
-      },
-      changeLoginType(e){
-
-          if (this.activeName === 'login_password') {
-              this.loginRules.code = [
-                    {
-                        required: true,
-                        trigger: "change",
-                        message: "验证码不能为空",
-                    },
-                ]
-          } else {
-              delete this.loginRules.code
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        }
+      });
+    },
+    handleUpdate() {
+      this.$refs.loginForm.validate(valid => {
+        if (valid) {
+          this.loading = true;
+          // 验证码不能为空
+          if (
+            this.loginForm.shortMessageCode == null ||
+            this.loginForm.shortMessageCode == ""
+          ) {
+            this.msgError("请输入短信验证码!");
+            this.loading = false;
+            return;
           }
-        this.getCode();
-      },
-      sendMessage(){
-                  // 验证码不能为空
-                  if (this.loginForm.phone == null || this.loginForm.phone == "") {
-                    this.msgError("请输入手机号!");
-                    this.loading = false;
-                    return;
-                  }
-                  if (this.codeDialogVisible) {
-                    if (!this.loginForm.code) {
-                        this.loading = false
-                        return this.msgError("请输入验证码!");
-                    } else {
-                        this.codeDialogVisible = false
-                    }
-                  } else {
-                      return this.codeDialogVisible = true
-                  }
-                  // 调用获取短信验证码接口
-                  sendShortMessage(this.loginForm.phone, this.loginForm.code, this.loginForm.uuid).then(response => {
-                    this.sendShortMessageBtn = true;
-                    this.msgSuccess("发送成功!");
-
-                    // 因为下面用到了定时器,需要保存this指向
-                    let that = this
-                    that.waitTime = 60;
-                    this.codeBtnWord = `${this.waitTime}s 后重新获取`
-                    let timer = setInterval(function(){
-                        if(that.waitTime>1){
-                            that.waitTime--
-                            that.codeBtnWord = `${that.waitTime}s 后重新获取`
-                        }else{
-                            clearInterval(timer)
-                            that.codeBtnWord = '获取验证码'
-                            that.waitTime = 60
-                            that.getCode();
-                            that.sendShortMessageBtn = false;
-                        }
-                    },1000)
-
-                  }).catch((response)=>{
-                    this.getCode();
-                  });
+          updateUser(this.loginForm)
+            .then(res => {
+              this.loading = false;
+              this.msgSuccess("重置密码成功!");
+              this.$router.push({ path: "/login" });
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        }
+      });
+    },
+    getUrlKey(name) {
+      return (
+        decodeURIComponent(
+          (new RegExp("[?|&]" + name + "=" + "([^&;]+?)(&|#|;|$)").exec(
+            location.href
+          ) || [, ""])[1].replace(/\+/g, "%20")
+        ) || null
+      );
+    },
+    changeLoginType(e) {
+      if (this.activeName === "login_password") {
+        this.loginRules.code = [
+          {
+            required: true,
+            trigger: "change",
+            message: "验证码不能为空"
+          }
+        ];
+      } else {
+        delete this.loginRules.code;
+      }
+      this.getCode();
+    },
+    sendMessage() {
+      // 验证码不能为空
+      if (this.loginForm.phone == null || this.loginForm.phone == "") {
+        this.msgError("请输入手机号!");
+        this.loading = false;
+        return;
+      }
+      if (this.codeDialogVisible) {
+        if (!this.loginForm.code) {
+          this.loading = false;
+          return this.msgError("请输入验证码!");
+        } else {
+          this.codeDialogVisible = false;
+        }
+      } else {
+        return (this.codeDialogVisible = true);
+      }
+      // 调用获取短信验证码接口
+      sendShortMessage(
+        this.loginForm.phone,
+        this.loginForm.code,
+        this.loginForm.uuid
+      )
+        .then(response => {
+          this.sendShortMessageBtn = true;
+          this.msgSuccess("发送成功!");
 
-      },
-      chooseLogin(){
-        chooseCompanyLogin(this.chooseCompanyId).then(response => {
+          // 因为下面用到了定时器,需要保存this指向
+          let that = this;
+          that.waitTime = 60;
+          this.codeBtnWord = `${this.waitTime}s 后重新获取`;
+          let timer = setInterval(function() {
+            if (that.waitTime > 1) {
+              that.waitTime--;
+              that.codeBtnWord = `${that.waitTime}s 后重新获取`;
+            } else {
+              clearInterval(timer);
+              that.codeBtnWord = "获取验证码";
+              that.waitTime = 60;
+              that.getCode();
+              that.sendShortMessageBtn = false;
+            }
+          }, 1000);
+        })
+        .catch(response => {
+          this.getCode();
+        });
+    },
+    chooseLogin() {
+      chooseCompanyLogin(this.chooseCompanyId)
+        .then(response => {
           if (response.code == "200") {
             // 认证通过
             if (response.data.sysUser.companyStatus == "00") {
-                if(this.redirect == '/home'){
-                    this.$router.push({ path: "/homePage"+this.redirect || "/" });
-                }else{
-                    this.$router.push({ path: this.redirect || "/" });
-                }
-            //   this.$router.push({ path: this.redirect || "/" });
-            // 认证未通过
+              if (this.redirect == "/home") {
+                this.$router.push({ path: "/homePage" + this.redirect || "/" });
+              } else {
+                this.$router.push({ path: this.redirect || "/" });
+              }
+              //   this.$router.push({ path: this.redirect || "/" });
+              // 认证未通过
             } else {
-              console.log("未认证通过!")
+              console.log("未认证通过!");
               this.$router.push({ path: "/certification" });
             }
           }
-        }).catch((response)=>{
-
-        });
-      }
+        })
+        .catch(response => {});
     }
+  }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss">
-  @import "~@/assets/styles/login.scss";
+@import "~@/assets/styles/login.scss";
+</style>
+<style lang="scss" scoped>
+::v-deep .el-tabs__item{
+  width: auto;
+}
 </style>

+ 6 - 6
front-vue/src/views/service/bill/billDetail.vue

@@ -145,8 +145,8 @@
                 <el-button class="WIDTH64" type="success">上传</el-button>
             </content-title>
             <el-row class="zap-form" type="flex">
-                <attachments v-for="(item, index) in contractList" :key="index" :fileName="item.pfiFileName">
-                    <img class="" :src="item.url" />
+                <attachments v-for="(item, index) in contractList" :key="index" :fileName="item.name">
+                    <img style="width: 100%;" class="" :src="item.url" />
                     <div class="attachements__marker" slot="marker">
                         <el-button class="zap-button-primary" size="mini" @click="invoicePictureCardPreview(item)">预览</el-button>
                     </div>
@@ -160,8 +160,8 @@
                 <el-button class="WIDTH64" type="success">上传</el-button>
             </content-title>
             <el-row class="zap-form" type="flex">
-                <attachments v-for="(item, index) in logisticsList" :key="index" :fileName="item.pfiFileName">
-                    <img class="" :src="item.url" />
+                <attachments v-for="(item, index) in logisticsList" :key="index" :fileName="item.name">
+                    <img  style="width: 100%;" class="" :src="item.url" />
                     <div class="attachements__marker" slot="marker">
                         <el-button class="zap-button-primary" size="mini" @click="invoicePictureCardPreview(item)">预览</el-button>
                     </div>
@@ -175,8 +175,8 @@
                 <el-button class="WIDTH64" type="success">上传</el-button>
             </content-title>
             <el-row class="zap-form" type="flex">
-                <attachments v-for="(item, index) in otherList" :key="index" :fileName="item.pfiFileName">
-                    <img class="" :src="item.url" />
+                <attachments v-for="(item, index) in otherList" :key="index" :fileName="item.name">
+                    <img style="width: 100%;" :src="item.url" />
                     <div class="attachements__marker" slot="marker">
                         <el-button class="zap-button-primary" size="mini" @click="invoicePictureCardPreview(item)">预览</el-button>
                     </div>

+ 2 - 2
front-vue/src/views/service/credit/addCredit.vue

@@ -1,7 +1,7 @@
 <template>
 <div class="app-container zap-main">
     <el-row>
-        <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="176px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="176px">
             <div class="zap-title">开立融信</div>
             <el-row class="zap-form" type="flex" style="flex-wrap: wrap;">
                 <text-item class="zap-flex-1" label="开立方" :value="form.openName">
@@ -18,7 +18,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <div class="zap-form-search-wrap zap-flex-1">
+                <div class="zap-form-search-wrap zap-flex-1" style="padding-left: 44px;">
                   <span class="label">最小融资金额:</span>
                   <span class="value">{{zfpMinimumAmount}}</span>
                 </div>

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

@@ -3,7 +3,7 @@
     <search-bar v-if="activeIndex === '0'" :hiddenSetting="true" @query="handleQuery" @reset="resetQuery">
         <el-form :model="queryParams" ref="queryForm" v-if="showSearch" label-width="80px">
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" prop="zfiTypes" label="融信来源">
+                <el-form-item class="zap-flex-1 mr24" prop="zfiTypes" label="融信来源">
                     <el-select v-model="queryParams.zfiTypes" class="zap-form-input--small" clearable>
                         <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
@@ -18,7 +18,7 @@
                 </el-form-item>
             </el-row>
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" prop="finaceStatus" label="融信状态">
+                <el-form-item class="zap-flex-1 mr24" prop="finaceStatus" label="融信状态">
                     <el-select v-model="queryParams.finaceStatus" class="zap-form-input--small" clearable>
                         <el-option v-for="dict in stateOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
@@ -41,7 +41,7 @@
     <search-bar v-else-if="activeIndex === '1'" :hiddenSetting="true" @query="handleQueryOpening" @reset="resetQueryOpening">
         <el-form :model="queryParamsOpening" ref="queryFormOpening" v-if="showSearch" label-width="80px">
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" prop="zfiTypes" label="融信来源">
+                <el-form-item class="zap-flex-1 mr24" prop="zfiTypes" label="融信来源">
                     <el-select v-model="queryParamsOpening.zfiTypes" class="zap-form-input--small" clearable>
                         <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
@@ -74,7 +74,7 @@
     <search-bar v-else-if="activeIndex === '2'" :hiddenSetting="true" @query="handleQuerySign" @reset="resetQuerySign">
         <el-form :model="queryParamsSign" ref="queryFormSign" v-if="showSearch" label-width="80px">
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" prop="zfiTypes" label="融信来源">
+                <el-form-item class="zap-flex-1 mr24" prop="zfiTypes" label="融信来源">
                     <el-select v-model="queryParamsSign.zfiTypes" class="zap-form-input--small" clearable>
                         <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
@@ -107,7 +107,7 @@
     <search-bar v-else-if="activeIndex === '3'" :hiddenSetting="true" @query="handleQueryFinancing" @reset="resetQueryFinancing">
         <el-form :model="queryParamsFinancing" ref="queryFormFinancing" v-if="showSearch" label-width="80px">
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" prop="zfiTypes" label="融信来源">
+                <el-form-item class="zap-flex-1 mr24" prop="zfiTypes" label="融信来源">
                     <el-select v-model="queryParamsFinancing.zfiTypes" class="zap-form-input--small" clearable>
                         <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
@@ -140,7 +140,7 @@
     <search-bar v-else-if="activeIndex === '4'" :hiddenSetting="true" @query="handleQueryFinanced" @reset="resetQueryFinanced">
         <el-form :model="queryParamsFinanced" ref="queryFormFinanced" v-if="showSearch" label-width="80px">
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" prop="zfiTypes" label="融信来源">
+                <el-form-item class="zap-flex-1 mr24" prop="zfiTypes" label="融信来源">
                     <el-select v-model="queryParamsFinanced.zfiTypes" class="zap-form-input--small" clearable>
                         <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
@@ -174,7 +174,7 @@
     <search-bar v-else-if="activeIndex === '5'" :hiddenSetting="true" @query="handleQueryInvalid" @reset="resetQueryInvalid">
         <el-form :model="queryParamsInvalid" ref="queryFormInvalid" v-if="showSearch" label-width="80px">
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" prop="zfiTypes" label="融信来源">
+                <el-form-item class="zap-flex-1 mr24" prop="zfiTypes" label="融信来源">
                     <el-select class="zap-form-input--small" v-model="queryParamsInvalid.zfiTypes" clearable>
                         <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
@@ -208,7 +208,7 @@
     <search-bar v-else-if="activeIndex === '6'" :hiddenSetting="true" @query="handleQuerySettlement" @reset="resetQuerySettlement">
         <el-form :model="queryParamsSettlement" ref="queryFormSettlement" v-if="showSearch" label-width="80px">
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" prop="zfiTypes" label="融信来源">
+                <el-form-item class="zap-flex-1 mr24" prop="zfiTypes" label="融信来源">
                     <el-select class="zap-form-input--small" v-model="queryParamsSettlement.zfiTypes" clearable>
                         <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
@@ -242,7 +242,7 @@
     <search-bar v-else-if="activeIndex === '7'" :hiddenSetting="true" @query="handleQueryOverdue" @reset="resetQueryOverdue">
         <el-form :model="queryParamsOverdue" ref="queryFormOverdue" v-if="showSearch" label-width="80px">
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" prop="zfiTypes" label="融信来源">
+                <el-form-item class="zap-flex-1 mr24" prop="zfiTypes" label="融信来源">
                     <el-select class="zap-form-input--small" v-model="queryParamsOverdue.zfiTypes" clearable>
                         <el-option v-for="dict in typesOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>

File diff suppressed because it is too large
+ 855 - 762
front-vue/src/views/service/credit/creditApply.vue


File diff suppressed because it is too large
+ 1173 - 1055
front-vue/src/views/service/credit/financeOpen.vue


+ 2 - 2
front-vue/src/views/service/credit/goFinance.vue

@@ -8,13 +8,13 @@
         :model="form"
         :rules="rules"
         :inline="true"
-        label-width="172px">
+        label-width="176px">
         <el-row class="zap-form">
             <el-col :span="12">
                 <text-item label="选择融信" :value="financeInfList | pickerFilter(form.zfrFinanceId, 'zfiId', 'zfiNumber')"></text-item>
             </el-col>
             <el-col :span="12">
-                <el-form-item label="融资收款账户:" prop="zfrCollectionAccount">
+                <el-form-item label="融资收款账户" prop="zfrCollectionAccount">
                     <el-input
                         class="zap-form-input"
                         v-model="form.zfrCollectionAccount"

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

@@ -10,7 +10,7 @@
         @reset="resetQuery">
         <el-form :model="queryParams" ref="queryForm" v-show="showSearch" label-width="80px">
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" label="授信类型" prop="zfpType" v-if="companyType != '02'" size="medium">
+                <el-form-item class="zap-flex-1 mr24" label="授信类型" prop="zfpType" v-if="companyType != '02'" size="medium">
                     <el-select class="zap-form-input--small" v-model="queryParams.zfpType" placeholder="请选择类型" clearable>
                         <el-option v-for="dict in queryTypeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>
@@ -26,7 +26,7 @@
                 </el-form-item>
             </el-row>
             <el-row type="flex" style="flex-wrap:wrap;">
-                <el-form-item class="zap-flex-1" label="授信状态" prop="zfpcrStatus" size="medium">
+                <el-form-item class="zap-flex-1 mr24" label="授信状态" prop="zfpcrStatus" size="medium">
                     <el-select class="zap-form-input--small" v-model="queryParams.zfpcrStatus" placeholder="请选择状态" clearable>
                         <el-option v-for="dict in queryStatusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
                     </el-select>

+ 1 - 1
front-vue/src/views/service/creditLine/detailCreditLine.vue

@@ -31,7 +31,7 @@
                 <text-item label="有效期" :value="dateTypeOptions | pickerFilter(form.zfpcrDateType, 'dictValue', 'dictLabel')"></text-item>
             </el-col>
             <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="8">
-                <el-form-item label="有效期范围:" prop="dateTime" v-if="this.form.zfpcrDateType == '1'" label-width="176px">
+                <el-form-item label="有效期范围" prop="dateTime" v-if="this.form.zfpcrDateType == '1'" label-width="176px">
                     <el-date-picker style="width: 264px;" v-model="form.dateTime" clearable disabled unlink-panels value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
                     </el-date-picker>
                 </el-form-item>

+ 5 - 5
front-vue/src/views/service/financeRecord/financeRecord.vue

@@ -134,7 +134,7 @@
                                 <el-button class="zap-button-warning" size="mini" type="warning" @click="handleExport(scope.row)" v-hasPermi="['finance:record:export']">导出</el-button>
                                 <el-button class="zap-button-primary" size="mini" type="primary" @click="seal(scope.row)" v-hasPermi="['finance:record:seal']" v-if="scope.row.zfrApproveStt == '01' && scope.row.zfrStatus == '04'">融资</el-button>
                                 <el-button class="zap-button-info" size="mini" @click="cancelFtp(scope.row)" v-if="scope.row.zfrApproveStt == '01' && scope.row.zfrStatus == '04'">作废</el-button>
-                                <el-button class="zap-button-primary" size="mini" type="primary" @click="handleFlowable(scope.row)" v-if="scope.row.zfrApproveStt == '00' || scope.row.zfrApproveStt == '02'">查看流程</el-button>
+                                <el-button class="zap-button-primary" size="mini" type="primary" @click="handleFlowable(scope.row)" v-if="scope.row.zfrApproveStt == '00' || scope.row.zfrApproveStt == '02'">进度</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -168,7 +168,7 @@
                                 <el-button class="zap-button-plain" size="mini" @click="handleDetail(scope.row)" v-hasPermi="['finance:record:query']">详情</el-button>
                                 <el-button class="zap-button-primary" size="mini" @click="handleLoan(scope.row)" v-hasPermi="['finance:record:edit']" v-if="scope.row.zfrStatus == '00' &&(companyType =='00' || companyType =='03')">放款登记</el-button>
                                 <el-button class="zap-button-warning" size="mini" @click="handleExport(scope.row)" v-hasPermi="['finance:record:export']">导出</el-button>
-                                <el-button class="zap-button-primary" size="mini" @click="handleFlowable(scope.row)" v-if="scope.row.zfrApproveStt == '00' || scope.row.zfrApproveStt == '02'">查看流程</el-button>
+                                <el-button class="zap-button-primary" size="mini" @click="handleFlowable(scope.row)" v-if="scope.row.zfrApproveStt == '00' || scope.row.zfrApproveStt == '02'">进度</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -201,7 +201,7 @@
                             <template slot-scope="scope">
                                 <el-button class="zap-button-plain" size="mini" type="text" @click="handleDetail(scope.row)" v-hasPermi="['finance:record:query']">详情</el-button>
                                 <el-button class="zap-button-warning"  size="mini" type="text" @click="handleExport(scope.row)" v-hasPermi="['finance:record:export']">导出</el-button>
-                                <el-button class="zap-button-primary"  size="mini" type="text" @click="handleFlowable(scope.row)" v-if="scope.row.zfrApproveStt == '00' || scope.row.zfrApproveStt == '02'">查看流程</el-button>
+                                <el-button class="zap-button-primary"  size="mini" type="text" @click="handleFlowable(scope.row)" v-if="scope.row.zfrApproveStt == '00' || scope.row.zfrApproveStt == '02'">进度</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -233,7 +233,7 @@
                             <template slot-scope="scope">
                                 <el-button class="zap-button-plain" size="mini" @click="handleDetail(scope.row)" v-hasPermi="['finance:record:query']">详情</el-button>
                                 <el-button class="zap-button-warning" size="mini" @click="handleExport(scope.row)" v-hasPermi="['finance:record:export']">导出</el-button>
-                                <el-button class="zap-button-primary" size="mini" @click="handleFlowable(scope.row)" v-if="scope.row.zfrApproveStt == '00' || scope.row.zfrApproveStt == '02'">查看流程</el-button>
+                                <el-button class="zap-button-primary" size="mini" @click="handleFlowable(scope.row)" v-if="scope.row.zfrApproveStt == '00' || scope.row.zfrApproveStt == '02'">进度</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -1512,7 +1512,7 @@ export default {
                 this.columnQueryThree();
             }
         },
-        //查看流程
+        //进度
         handleFlowable(row) {
             const zfrId = row.zfrId
             this.hisTaskForm = true;

+ 4 - 4
front-vue/src/views/service/repayment/repayment.vue

@@ -370,7 +370,7 @@
             </span>
             <span class="label">待还款:¥{{dhkAmount}}</span>
             <span class="label">已还款:¥{{yhkAmount}}</span>
-            <span class="label">逾期:¥{{yyqAmount}}</span>
+            <span class="label">逾期:¥{{yyqAmount}}</span>
           </statistical-data>
           <pagination
             v-show="total>0"
@@ -782,7 +782,7 @@
             总合计:
             <span class="value">¥{{allAmount}}</span>
           </span>
-          <span class="label">逾期:¥{{yyqAmount}}</span>
+          <span class="label">逾期:¥{{yyqAmount}}</span>
         </statistical-data>
         <pagination
           v-show="total>0"
@@ -903,7 +903,7 @@ export default {
       unRepaymentList: [],
       //已还款列表
       repaymentList: [],
-      //逾期列表
+      //逾期列表
       overdueList: [],
       typeOptions: [],
       // 是否显示弹出层
@@ -1131,7 +1131,7 @@ export default {
           });
       });
     },
-    /** 查询逾期列表 */
+    /** 查询逾期列表 */
     getOverdueList() {
       this.loading = true;
       this.overdue.status = "02";