feat: 优化代码
This commit is contained in:
@@ -428,13 +428,13 @@
|
||||
},
|
||||
// 是否显示底部按钮
|
||||
isShowBtn(){
|
||||
const {approveStatus,id} = this.dataForm
|
||||
const {approveStatus} = this.dataForm
|
||||
const {config,isProcess} = this
|
||||
if(config.current == 1 && approveStatus == 0) return false
|
||||
if(config.current == 2) return true
|
||||
if(config.current == 3 || config.current == 4) return false
|
||||
if(!isProcess) return true
|
||||
console.log(approveStatus,'approveStatus--')
|
||||
console.log(config.current,'config.current--')
|
||||
if(approveStatus == 3 &&config.current ==3 ) return false
|
||||
if(approveStatus !== 4 || !id || config.current && config.current == 2 ) return true
|
||||
if(isProcess) return false
|
||||
return false
|
||||
}
|
||||
},
|
||||
@@ -1274,7 +1274,8 @@
|
||||
if (component.$options.name === 'jnpf-organize-select') {
|
||||
return component;
|
||||
}
|
||||
for (let child of component.$children) {
|
||||
const children = component.$children || [];
|
||||
for (let child of children) {
|
||||
const res = findOrganizeSelect(child);
|
||||
if (res) return res;
|
||||
}
|
||||
|
||||
@@ -215,7 +215,7 @@
|
||||
if(options.code){
|
||||
this.exchangeToken(options)
|
||||
}else if(options.socialLogin){
|
||||
this.getLogin()
|
||||
this.getLogin('creat')
|
||||
}
|
||||
else{
|
||||
this.certifyLogin()
|
||||
@@ -523,7 +523,7 @@
|
||||
this.loading = true
|
||||
const password = md5Libs.md5(this.formData.password);
|
||||
const encryptPassword = this.jnpf.aesEncryption.encrypt(password);
|
||||
this.getLogin()
|
||||
this.getLogin('click')
|
||||
}
|
||||
});
|
||||
return
|
||||
@@ -531,7 +531,8 @@
|
||||
this.certifyLogin()
|
||||
},
|
||||
// 普通登录
|
||||
getLogin(){
|
||||
getLogin(type){
|
||||
if(type !== 'click') return
|
||||
const userStore = useUserStore()
|
||||
let query = {
|
||||
tenantName: this.formData.tenantName,
|
||||
|
||||
Reference in New Issue
Block a user