包包
2023-05-05 9cd7add1260daef1244c774ec6f38474009557fd
bugover
已修改4个文件
106 ■■■■ 文件已修改
src/utils/request.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login.vue 88 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseslist/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseslistrecord/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/request.js
@@ -100,7 +100,7 @@
      type: 'error',
      duration: 5 * 1000
    })
    return Promise.reject(error)
    return Promise.reject(error )
  }
)
src/views/login.vue
@@ -11,16 +11,16 @@
        <el-input
          v-model="loginForm.password"
          type="password"
          auto-complete="off"
          @focus="tip"
          auto-complete="off"
          placeholder="密码"
          @focus="tip"
          @keyup.enter.native="handleLogin"
        >
          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
      <br>
      <el-form-item prop="code" v-if="captchaOnOff">
      <el-form-item v-if="captchaOnOff" prop="code">
        <el-input
          v-model="loginForm.code"
          auto-complete="off"
@@ -31,7 +31,7 @@
          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
        </el-input>
        <div class="login-code">
          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
          <img :src="codeUrl" class="login-code-img" @click="getCode">
        </div>
      </el-form-item>
      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
@@ -46,7 +46,7 @@
          <span v-if="!loading">登 录</span>
          <span v-else>登 录 中...</span>
        </el-button>
        <div style="float: right;" v-if="register">
        <div v-if="register" style="float: right;">
          <router-link class="link-type" :to="'/register'">立即注册</router-link>
        </div>
      </el-form-item>
@@ -59,30 +59,30 @@
</template>
<script>
import { getCodeImg } from "@/api/login";
import Cookies from "js-cookie";
import { getCodeImg } from '@/api/login'
import Cookies from 'js-cookie'
import { encrypt, decrypt } from '@/utils/jsencrypt'
export default {
  name: "Login",
  name: 'Login',
  data() {
    return {
      codeUrl: "",
      cookiePassword: "",
      codeUrl: '',
      cookiePassword: '',
      loginForm: {
        username: "",
        password: "",
        username: '',
        password: '',
        rememberMe: false,
        code: "",
        uuid: ""
        code: '',
        uuid: ''
      },
      loginRules: {
        username: [
          { required: true, trigger: "blur", message: "请输入您的账号" }
          { required: true, trigger: 'blur', message: '请输入您的账号' }
        ],
        password: [
          { required: true, trigger: "blur", message: "密码必须包含大小写字母、数字、特殊字符中的至少三种且长度大于等于8位" }
        ],
          { required: true, trigger: 'blur', message: '密码必须包含大小写字母、数字、特殊字符中的至少三种且长度大于等于8位' }
        ]
        // code: [{ required: true, trigger: "change", message: "请输入验证码" }]
      },
      loading: false,
@@ -91,69 +91,69 @@
      // 注册开关
      register: false,
      redirect: undefined
    };
    }
  },
  watch: {
    $route: {
      handler: function(route) {
        this.redirect = route.query && route.query.redirect;
        this.redirect = route.query && route.query.redirect
      },
      immediate: true
    }
  },
  created() {
    this.getCode();
    this.getCookie();
    this.getCode()
    this.getCookie()
  },
  methods: {
    tip(){
      //console.log('awdawd',聚焦);
    tip() {
      // console.log('awdawd',聚焦);
    },
    getCode() {
      getCodeImg().then(res => {
        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
        this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff
        if (this.captchaOnOff) {
          this.codeUrl = "data:image/gif;base64," + res.img;
          this.loginForm.uuid = res.uuid;
          this.codeUrl = 'data:image/gif;base64,' + res.img
          this.loginForm.uuid = res.uuid
        }
      });
      })
    },
    getCookie() {
      const username = Cookies.get("username");
      const password = Cookies.get("password");
      const username = Cookies.get('username')
      const password = Cookies.get('password')
      const rememberMe = Cookies.get('rememberMe')
      this.loginForm = {
        username: username === undefined ? this.loginForm.username : username,
        password: password === undefined ? this.loginForm.password : decrypt(password),
        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
      };
      }
    },
    handleLogin() {
      this.$refs.loginForm.validate(valid => {
        if (valid) {
          this.loading = true;
          this.loading = true
          if (this.loginForm.rememberMe) {
            Cookies.set("username", this.loginForm.username, { expires: 30 });
            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
            Cookies.set('username', this.loginForm.username, { expires: 30 })
            Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 })
            Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 })
          } else {
            Cookies.remove("username");
            Cookies.remove("password");
            Cookies.remove('rememberMe');
            Cookies.remove('username')
            Cookies.remove('password')
            Cookies.remove('rememberMe')
          }
          this.$store.dispatch("Login", this.loginForm).then(() => {
            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
          this.$store.dispatch('Login', this.loginForm).then(() => {
            this.$router.push({ path: this.redirect || '/' }).catch(() => {})
          }).catch(() => {
            this.loading = false;
            this.loading = false
            if (this.captchaOnOff) {
              this.getCode();
              this.getCode()
            }
          });
          })
        }
      });
      })
    }
  }
};
}
</script>
<style rel="stylesheet/scss" lang="scss">
src/views/project/travelexpenseslist/index.vue
@@ -642,6 +642,7 @@
    "sys_travelexpensebelong",
    "sys_traffictype",
    "sys_area_name",
    "sys_traffictype"
  ],
  data() {
    return {
@@ -807,6 +808,7 @@
      for (let i = 0; i < persontypeArr.length; i++) {
        this.tempArrr = [];
        listReportname(persontypeArr[i]).then((res) => {
          console.log(res);
          this.tempArrr = res.data;
          this.personList = this.personList.concat(this.tempArrr);
        });
@@ -876,6 +878,8 @@
    getUserList() {
      listUser().then((res) => {
        this.userlist = res.data;
      });
    },
    selectedTraveler() {
@@ -1122,6 +1126,7 @@
        this.reimbursementList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
    // 取消按钮
@@ -1248,6 +1253,7 @@
          if (res.data.length == 0) {
            return;
          }
          this.applicationDetailArr = res.data;
          for (let i = 0; i < this.applicationDetailArr.length; i++) {
            debugger;
@@ -1409,7 +1415,9 @@
                this.open = false;
                this.getList();
              });
            });
            }).catch(err=>{
              console.log(err);
            })
          } else {
            this.form.recordstatus = -1;
            const applicationDetailArr = [...this.applicationDetailArr]
@@ -1433,8 +1441,8 @@
                  applicationDetailArr2[i].rbid = id;
                }
                addOrUpdateRBpayee(applicationDetailArr2);
              });
            });
              })
            })
          }
        }
      });
src/views/project/travelexpenseslistrecord/index.vue
@@ -499,7 +499,7 @@
              prop="trafficexpense"
              label="交通费"
              align="center"
              width="100"
              width="100"
            >
              <template slot-scope="scope">
                <el-input