diff --git a/src/api/system/user.js b/src/api/system/user.js
index b5a1bbde..b52d2733 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -116,6 +116,15 @@ export function updateUserProfile(data) {
})
}
+
+// 检查是否初始密码
+export function checkIsInitPassword() {
+ return request({
+ url: '/system/user/profile/checkIsInitPassword',
+ method: 'put'
+ })
+}
+
// 用户密码重置
export function updateUserPwd(oldPassword, newPassword) {
const data = {
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 2d1c459e..77347395 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -4,7 +4,7 @@
-
+ 您当前密码不安全，请立即【修改密码】!
@@ -91,6 +91,10 @@
+
+
+
+
@@ -106,6 +110,8 @@ import TopTagsView from '../components/TopTagsView'
import TopNotice from '../components/TopNotice'
import Cookies from 'js-cookie'
import { getI18nMessages } from "@/api/common"
+import { checkIsInitPassword,getUserProfile } from "@/api/system/user"
+import resetPwd from "@/views/system/user/profile/resetPwd";
var qimoClientId = null;
@@ -118,11 +124,16 @@ export default {
SizeSelect,
Search,
TopTagsView,
- TopNotice
+ TopNotice,
+ resetPwd
},
data() {
return {
- openKfView:false
+ openKfView:false,
+ timer: undefined,
+ needRstPwd:false,
+ openRstPwd:false,
+ user:{},
}
},
computed: {
@@ -166,8 +177,15 @@ export default {
},
mounted() {
this.initKFClient();
+ this.checkIsNeedRstPwd();
},
methods: {
+ goToRstPwd(){
+ getUserProfile().then(response => {
+ this.user = response.data;
+ this.openRstPwd=true;
+ });
+ },
// 初始化客服
initKFClient(){
qimoClientId = {userId: this.empCode, nickName:this.empName,agent:'8001',customField: {}, priority: false}
@@ -177,6 +195,27 @@ export default {
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
+ // 检查弱密码
+ checkIsNeedRstPwd(){
+ checkIsInitPassword().then(res=>{
+ if(res.code==200){
+ if(res.data=="0"){
+ this.needRstPwd=false;
+ }else{
+ this.needRstPwd=true;
+ this.openRstPwd=true;
+ }
+ }
+ }).catch(error => {
+ });
+ },
+ onRstPwdSuccess(){
+ this.needRstPwd=false;
+ this.openRstPwd=false;
+ },
+ onRstPwdClose(){
+ this.openRstPwd=false;
+ },
async logout() {
this.$confirm('确定注销并退出系统吗？', '提示', {
confirmButtonText: '确定',
@@ -345,5 +384,37 @@ export default {
}
}
}
+
+ .user-restpwd-notice {
+ line-height: 50px;
+ font-size: 14px;
+ font-weight: 600;
+ color: red;
+ cursor: pointer;
+ position: absolute;
+ top: 0px;
+ background: white;
+ z-index: 9999;
+ width: 100%;
+ padding-left: 20px;
+ margin-left: 14px;
+ }
+
+ :deep .el-dialog{
+ display: flex;
+ flex-direction: column;
+ margin:0 !important;
+ position:absolute;
+ top:50%;
+ left:50%;
+ transform:translate(-50%,-50%);
+ max-height:calc(100% - 30px);
+ max-width:calc(100% - 30px);
+ }
+ :deep .el-dialog .el-dialog__body{
+ flex:1;
+ overflow: auto;
+ }
+
}
diff --git a/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue b/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
index 33336ee0..2b99f484 100644
--- a/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
+++ b/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
@@ -15,8 +15,6 @@
-
-
@@ -50,7 +48,9 @@
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
default-time = "00:00:00"
- placeholder="生效时间">
+ placeholder="生效时间"
+ @change="onStartDateChange"
+ >
@@ -88,10 +88,10 @@