部门:{{ deptName }}
+ style="margin: 10px;color: #2d8cf0;font-size: 14px;">部门 : {{ deptName }}
仓库:{{ inv }}
-
用户:{{ this.companyName }}
+ style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库 : {{ inv }}
+
用户 : 吴XX{{ this.companyName }}
({{
this.userName
@@ -40,6 +40,9 @@
切换仓库
+
+ 修改密码
+
退出登录
@@ -102,6 +105,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改密码
+ 取消
+
+
+
+
@@ -118,17 +193,35 @@ import RuoYiDoc from '@/components/RuoYi/Doc'
import store from "@/store";
import {filterAllByUser} from "@/api/system/invWarehouse";
import {filterSubByInv, findByDeptUser} from "@/api/system/invSubWarehouse";
-import {updateInv} from "@/api/auth/authAdmin";
+import {updateInv, modifyPasswd,filterByUser} from "@/api/auth/authAdmin";
import {isRelogin} from "@/utils/request";
import router from "@/router";
export default {
data() {
+ // let validatePass2 = (rule, value, callback) => {
+ // if (value === "") {
+ // callback(new Error("请再次输入密码"));
+ // } else if (value !== this.inputQuery.passWord) {
+ // callback(new Error("两次输入密码不一致!"));
+ // } else {
+ // callback();
+ // }
+ // };
return {
inv: store.getters.locInvName,
deptName: store.getters.locDeptName,
selInvVisible: false,
+ isVisible: false,
userInfo: {},
+ inputQuery: {
+ passWord: "",
+ newPassword: "",
+ confirmPassword: "",
+ userName: "",
+ locInvCode: "",
+
+ },
deptList: [],
invList: [],
formRules: {
@@ -138,6 +231,19 @@ export default {
locInvCode: [
{required: true, message: "请选择当前仓库", trigger: "blur"}
],
+ password: [{required: true, message: "请输入密码", trigger: "blur"}],
+ newPassword: [{required: true, message: "请输入密码", trigger: "blur"}],
+ confirmPassword: [
+ {required: true, message: "请确认密码", trigger: "blur"},
+ // {validator: validatePass2, trigger: "blur"},
+ ],
+ },
+ rules: {
+ password: [{required: true, message: "请输入密码", trigger: "blur"}],
+ confirmPassword: [
+ {required: true, message: "请确认密码", trigger: "blur"},
+ // {validator: validatePass2, trigger: "blur"},
+ ],
},
};
@@ -176,6 +282,41 @@ export default {
}
},
methods: {
+ onSubmit() {
+ if (this.inputQuery.newPassword != this.inputQuery.confirmPassword) {
+ this.$message.error("新密码与确认密码不一致！！！！");
+ return
+ }
+ if (this.inputQuery.passWord == this.inputQuery.newPassword) {
+ this.$message.error("旧密码与新密码不能相同！！！！");
+ return
+ }
+ this.$refs["dataForm"].validate((valid) => {
+ if (valid) {
+ this.loading = true;
+ modifyPasswd(this.inputQuery).then((response) => {
+ if (response.code === 20000) {
+ this.loading = false;
+ this.$confirm('密码重置成功，请点击确定重新登录', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.$store.dispatch('LogOut').then(() => {
+ location.href = process.env.VUE_APP_CONTEXT_PATH;
+ })
+ }).catch(() => {
+ });
+ } else {
+ this.$message.error(response.message);
+ }
+ });
+ } else {
+ return false;
+ }
+ });
+ },
+
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
@@ -186,7 +327,7 @@ export default {
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
- location.href = process.env.VUE_APP_CONTEXT_PATH ;
+ location.href = process.env.VUE_APP_CONTEXT_PATH;
})
}).catch(() => {
});
@@ -195,6 +336,9 @@ export default {
changeInv() {
this.selInvVisible = true;
},
+ modifyPassword() {
+ this.isVisible = true;
+ },
getDeptList() {
this.deptList = [];
@@ -206,10 +350,20 @@ export default {
.catch(() => {
});
},
+ getInputQuery() {
+ this.inputQuery = [];
+ filterByUser()
+ .then((response) => {
+ this.inputQuery = response.data || [];
+ // this.getInvList();
+ })
+ .catch(() => {
+ });
+ },
deptChange() {
this.getInvList();
- this.userInfo.locInvCode="";
+ this.userInfo.locInvCode = "";
},
getInvList() {
@@ -225,7 +379,7 @@ export default {
}
})
.catch(() => {
- this.selInvVisible=true;
+ this.selInvVisible = true;
});
},
@@ -261,6 +415,8 @@ export default {
closeDialog() {
this.selInvVisible = false;
+ this.isVisible = false;
+
this.getDeptList()
this.resetForm();
},
@@ -278,12 +434,15 @@ export default {
},
created() {
this.userName = this.$store.getters.name;
- this.userInfo = {
- id: store.getters.adminId,
- locInvCode: store.getters.locInvCode,
- locDeptCode: store.getters.locDeptCode,
- };
-
+ this.userInfo = {
+ id: store.getters.adminId,
+ locInvCode: store.getters.locInvCode,
+ locDeptCode: store.getters.locDeptCode,
+ };
+ this.inputQuery = {
+ userName: this.$store.getters.name,
+ };
+ this.getInputQuery();
this.getDeptList();
//this.getInvList()
diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index f1418213..c171f6e2 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -213,6 +213,7 @@ export default {
return {
query: {
key: "",
+ corpType: "2",
page: 1,
limit: 20,
},
@@ -303,6 +304,7 @@ export default {
});
this.query = {
key: "",
+ corpType: "2",
page: 1,
limit: 20,
};
diff --git a/src/views/basic/destiny/addDestinyProcess.vue b/src/views/basic/destiny/addDestinyProcess.vue
index f30db7a3..b7e92264 100644
--- a/src/views/basic/destiny/addDestinyProcess.vue
+++ b/src/views/basic/destiny/addDestinyProcess.vue
@@ -107,7 +107,7 @@
width="60%"
append-to-body
v-if="orderMutiVisible"
- @close='closeDialog'
+ @close='closedeStinyDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
>
@@ -250,6 +250,11 @@ export default {
this.filterQuery.page = val.page;
this.getList();
},
+ closedeStinyDialog(){
+ this.orderMutiVisible = false;
+ this.destinyProcessDelectShow = false;
+ this.destinyProcessCodeShow = false;
+ },
closeDialog(row) {
this.destinyId = row;
var query = {
diff --git a/src/views/basic/destiny/destiny.vue b/src/views/basic/destiny/destiny.vue
index efa933bd..58f290b6 100644
--- a/src/views/basic/destiny/destiny.vue
+++ b/src/views/basic/destiny/destiny.vue
@@ -3,12 +3,12 @@