From 9cd7add1260daef1244c774ec6f38474009557fd Mon Sep 17 00:00:00 2001
From: 包包 <9126271+bb363430@user.noreply.gitee.comcd>
Date: 星期五, 05 五月 2023 16:58:49 +0800
Subject: [PATCH] bugover
---
src/utils/request.js | 2
src/views/login.vue | 88 ++++++++++++++++++++++----------------------
src/views/project/travelexpenseslist/index.vue | 14 +++++-
src/views/project/travelexpenseslistrecord/index.vue | 2
4 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 93e7229..6f55ce2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -100,7 +100,7 @@
type: 'error',
duration: 5 * 1000
})
- return Promise.reject(error)
+ return Promise.reject(error )
}
)
diff --git a/src/views/login.vue b/src/views/login.vue
index 113f8c7..43aeb9c 100644
--- a/src/views/login.vue
+++ b/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">
diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseslist/index.vue
index 941acb8..3735270 100644
--- a/src/views/project/travelexpenseslist/index.vue
+++ b/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);
- });
- });
+ })
+ })
}
}
});
diff --git a/src/views/project/travelexpenseslistrecord/index.vue b/src/views/project/travelexpenseslistrecord/index.vue
index 7d2eec7..a6990b9 100644
--- a/src/views/project/travelexpenseslistrecord/index.vue
+++ b/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
--
Gitblit v1.9.3