diff --git a/src/views/Home.vue b/src/views/Home.vue index ca2fcf4..338bc45 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -12,6 +12,18 @@ @click.native="$router.push({ path: '/organization-units' })" >组织架构 +<<<<<<< HEAD +======= + 角色管理 + 用户管理 + +>>>>>>> 99be594 (婚姻状况，标本容器,修改密码组织架构) 角色管理 + + + 取 消 @@ -521,6 +536,7 @@ export default { oldPassWord: "", newPassWord: "", }, + confirmpassword: "", rules: { oldPassWord: [ { required: true, message: "请输入旧密码", trigger: "blur" }, @@ -547,6 +563,8 @@ export default { if (valid) { if (this.form.oldPassWord != this.password) { this.$message.warning("旧密码输入错误"); + } else if (this.confirmpassword != this.form.newPassWord) { + this.$message.warning("二次输入的密码不一致"); } else { postapi("/api/identity/users/updatepassword", this.form).then( (res) => { diff --git a/src/views/basic-dictionary/CommonCharType.vue b/src/views/basic-dictionary/CommonCharType.vue index 561ac08..bad5555 100644 --- a/src/views/basic-dictionary/CommonCharType.vue +++ b/src/views/basic-dictionary/CommonCharType.vue @@ -332,7 +332,10 @@ export default { this.dialogVisible = false; }); } else if (this.title == 2) { - modifycharacters(this.form.id, { + if(this.form.displayName==''){ + this.$message.warning('请输入名称') + }else{ + modifycharacters(this.form.id, { displayName: this.form.displayName, }).then((res) => { this.$message.success("修改成功"); @@ -340,6 +343,8 @@ export default { this.dialogVisible = false; }); } + } + } }, //新增弹框 diff --git a/src/views/basic-dictionary/DeviceType.vue b/src/views/basic-dictionary/DeviceType.vue index 9ff1602..d85ae6c 100644 --- a/src/views/basic-dictionary/DeviceType.vue +++ b/src/views/basic-dictionary/DeviceType.vue @@ -88,7 +88,7 @@ > - + - + diff --git a/src/views/basic-dictionary/GuideType.vue b/src/views/basic-dictionary/GuideType.vue index 5e2b645..3c87136 100644 --- a/src/views/basic-dictionary/GuideType.vue +++ b/src/views/basic-dictionary/GuideType.vue @@ -180,7 +180,7 @@ @@ -375,7 +375,6 @@ export default { this.getlists(); }, mounted() { - window.onresize = () => { return (() => { // window.innerHeight:浏览器的可用高度 @@ -708,9 +707,13 @@ export default { type: "warning", }).then(() => { deletion(this.form.id).then((res) => { - console.log(res); - this.$message.success("删除成功"); - this.getlists(); + if (res.Code == -1) { + // this.$message.warning(res.Message); + } else { + console.log(res); + this.$message.success("删除成功"); + this.getlists(); + } }); }); // deletion(this.form.id).then((res) => { @@ -725,11 +728,10 @@ export default { this.dialogVisible = true; this.form = {}; this.title = 1; - this.$nextTick(()=>{ - this.$refs.refinput.focus() - }) + this.$nextTick(() => { + this.$refs.refinput.focus(); + }); // this.$refs.refinput.focus() - }, //编辑弹框 editandmofin(row) { diff --git a/src/views/basic-dictionary/MaritalStatus.vue b/src/views/basic-dictionary/MaritalStatus.vue index efb063b..5f1a04c 100644 --- a/src/views/basic-dictionary/MaritalStatus.vue +++ b/src/views/basic-dictionary/MaritalStatus.vue @@ -208,9 +208,11 @@ export default { //编辑修改弹框 editreport(row) { console.log(this.form); - if (this.form.displayName == "") { + if (this.form.id == "") { this.$message.warning("请选择"); } else { + let obj = Object.assign({}, this.form); + this.form = obj; this.dialogVisible = true; } @@ -219,14 +221,20 @@ export default { }, //确定修改 confirmmodification() { - modificationstatus(this.form.id, { - displayName: this.form.displayName, - simpleCode: this.form.simpleCode, - }).then((res) => { - this.$message.success("修改成功"); - this.getlist(); - this.dialogVisible = false; - }); + if (this.form.displayName == "") { + this.$message.warning("请输入名称"); + } else if (this.simpleCode == "") { + this.$message.warning("请输入快捷吗"); + } else { + modificationstatus(this.form.id, { + displayName: this.form.displayName, + simpleCode: this.form.simpleCode, + }).then((res) => { + this.$message.success("修改成功"); + this.getlist(); + this.dialogVisible = false; + }); + } }, // getlist() { diff --git a/src/views/basic-dictionary/SampleContainer.vue b/src/views/basic-dictionary/SampleContainer.vue index e063ee5..2b8c723 100644 --- a/src/views/basic-dictionary/SampleContainer.vue +++ b/src/views/basic-dictionary/SampleContainer.vue @@ -77,15 +77,26 @@ - + - - + + + - + @@ -219,6 +230,10 @@ export default { this.rowDrop(); }, methods: { + colorchange(v) { + this.form.containerColor = parseInt(v) + console.log(this.form.containerColor); + }, //取消排序 cancellation() { this.$message.info("取消操作"); @@ -370,9 +385,9 @@ export default { this.title = 1; this.dialogVisible = true; this.form = {}; - this.$nextTick(()=>{ - this.$refs.refinput.focus() - }) + this.$nextTick(() => { + this.$refs.refinput.focus(); + }); }, getlist() { containerlist(this.pages).then((res) => { diff --git a/src/views/basic-dictionary/SampleType.vue b/src/views/basic-dictionary/SampleType.vue index 472d4da..93ec9e2 100644 --- a/src/views/basic-dictionary/SampleType.vue +++ b/src/views/basic-dictionary/SampleType.vue @@ -81,6 +81,7 @@ + { this.$message.success("修改成功"); @@ -348,6 +352,8 @@ export default { this.form = {}; }); } + } + }, //新增弹框 add() { diff --git a/src/views/basic-dictionary/Sex.vue b/src/views/basic-dictionary/Sex.vue index dbf268c..6f6e4bb 100644 --- a/src/views/basic-dictionary/Sex.vue +++ b/src/views/basic-dictionary/Sex.vue @@ -39,7 +39,7 @@ - + - + @@ -367,13 +367,17 @@ export default { this.dialogVisible = false; }); } else if (this.title == 2) { - editunit(this.form.id, { displayName: this.form.displayName }).then( - (res) => { - this.$message.success("修改成功"); - this.getlist(); - this.dialogVisible = false; - } - ); + if (this.form.displayName == "") { + this.$message.warning("请输入名称"); + } else { + editunit(this.form.id, { displayName: this.form.displayName }).then( + (res) => { + this.$message.success("修改成功"); + this.getlist(); + this.dialogVisible = false; + } + ); + } } } }, @@ -382,9 +386,9 @@ export default { this.dialogVisible = true; this.title = 1; this.form = {}; - this.$nextTick(()=>{ - this.$refs.refinput.focus() - }) + this.$nextTick(() => { + this.$refs.refinput.focus(); + }); }, getlist() { unitlist(this.pages).then((res) => { diff --git a/src/views/fee-settings/MedicalPackage.vue b/src/views/fee-settings/MedicalPackage.vue index db0ed5b..4124cc9 100644 --- a/src/views/fee-settings/MedicalPackage.vue +++ b/src/views/fee-settings/MedicalPackage.vue @@ -663,9 +663,9 @@ export default { this.dialogVisible = true; this.title = 1; this.form = {}; - this.$nextTick(()=>{ - this.$refs.refinput.focus() - }) + this.$nextTick(() => { + this.$refs.refinput.focus(); + }); }, getlist() { getapi("/api/app/medical-package/in-filter", this.pages).then((res) => { diff --git a/src/views/fee-settings/PayMode.vue b/src/views/fee-settings/PayMode.vue index 19d0986..9f2411c 100644 --- a/src/views/fee-settings/PayMode.vue +++ b/src/views/fee-settings/PayMode.vue @@ -198,13 +198,17 @@ export default { }, // 确定修改编辑 addoredit() { - paymentediting(this.form.id, { - displayName: this.form.displayName, - }).then((res) => { - this.$message.success("修改成功"); - this.getlist(); - this.dialogVisible = false; - }); + if (this.form.displayName == "") { + this.$message.warning("请输入名称"); + } else { + paymentediting(this.form.id, { + displayName: this.form.displayName, + }).then((res) => { + this.$message.success("修改成功"); + this.getlist(); + this.dialogVisible = false; + }); + } }, //编辑弹框 editpopup() { @@ -212,6 +216,8 @@ export default { this.$message.warning("请点击选择操作的数据"); } else { this.dialogVisible = true; + let copy = Object.assign({}, this.form); + this.form = copy; // invoiceidquery(this.form.payModeId).then((res) => { // console.log(res); // this.form = res.data; diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index fb13417..9cefb23 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -106,6 +106,7 @@ export default { window.localStorage.setItem("user", this.form.Username); this.$message.success(msgs,+"登录成功"); this.$router.push({ path: "home" }); + this.$store.state.changepassword = this.form.Password; }) .catch((err) => {}); diff --git a/src/views/user-list/OrganizationUnits.vue b/src/views/user-list/OrganizationUnits.vue index b027744..d4efe26 100644 --- a/src/views/user-list/OrganizationUnits.vue +++ b/src/views/user-list/OrganizationUnits.vue @@ -147,7 +147,7 @@ export default { }).then((res) => { this.$message.success("新增成功"); this.dialogVisible = false; - // this.form = {}; + this.form.displayName='' this.getonorganization(); }); } @@ -211,7 +211,7 @@ export default { if (this.title == 3) { this.dialogVisible = true; this.form.parentId = data.id; - this.form.displayName = ""; + // this.form.displayName = ""; console.log(this.form.parentId); console.log(this.form); } diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue index 971c702..c8291fd 100644 --- a/src/views/user-list/UserList.vue +++ b/src/views/user-list/UserList.vue @@ -138,12 +138,14 @@ + - @@ -416,6 +418,11 @@ + + + + + 取 消