Browse Source

民族 结果状态

master
mch 2 years ago
parent
commit
6b6db300fe
  1. 6
      src/utlis/validate.js
  2. 8
      src/views/Home.vue
  3. 14
      src/views/basic-dictionary/Nation.vue
  4. 4
      src/views/basic-dictionary/ResultStatus.vue
  5. 4
      src/views/customerOrg/patientRegisterRecover.vue
  6. 33
      src/views/login/Login.vue
  7. 4
      src/views/user-list/AuditLog.vue
  8. 44
      src/views/user-list/UserList.vue

6
src/utlis/validate.js

@ -33,7 +33,7 @@ export const yzstr = (value) => {
if (!reg.test(s1)) {
isyz = false;
} else {
isyz = true;
isyz = true;
}
} else {
//失败
@ -43,3 +43,7 @@ export const yzstr = (value) => {
return isyz;
};
//正则校验密码
const regex = /^.{6,15}$/;
export const isValid = regex.test();
console.log(isValid);

8
src/views/Home.vue

@ -566,8 +566,10 @@ export default {
logout() {
// localStorage.removeItem("tokentype");
// localStorage.removeItem("token");
// localStorage.removeItem(['expires_in','tokentype','refresh_token','user','token'])
localStorage.clear();
this.$router.push({ path: "/login" });
},
aa(aa) {
console.log(aa);
@ -577,10 +579,16 @@ export default {
};
</script>
<style scoped>
.el-dropdown-item{
text-align: center;
}
.el-dropdown-menu {
text-align: center;
overflow: scroll;
max-height: 500px;
width: 150px;
overflow-x: hidden;
/* margin-left: 5%; */
}
.el-header {
position: fixed;

14
src/views/basic-dictionary/Nation.vue

@ -19,13 +19,13 @@
<el-table
:data="tableData"
style="width: 100%; height: 500px"
row-key="id"
row-key="nationId"
:height="tableHeight"
class="el-table__body-wrapper tbody"
@row-click="rowick"
highlight-current-row
>
<el-table-column prop="id" label="编号" width="300">
<el-table-column prop="nationId" label="编号" width="300">
</el-table-column>
<el-table-column prop="displayName" label="名称" width="">
</el-table-column>
@ -314,7 +314,7 @@ export default {
const currentDisplayOrder = this.initTableData[index].displayOrder;
if (item.displayOrder != currentDisplayOrder) {
// displayOrder
result.push({ id: item.id, displayOrder: currentDisplayOrder });
result.push({ nationId: item.nationId, displayOrder: currentDisplayOrder });
}
});
// console.log('assertion', result);
@ -353,10 +353,10 @@ export default {
},
//
topping() {
if (this.form.id == undefined) {
if (this.form.nationId == undefined) {
this.$message.warning("请选择操作的数据");
} else {
opBottomtheFamousclan(this.form.id, 1).then((res) => {
opBottomtheFamousclan(this.form.nationId, 1).then((res) => {
this.$message.success("操作成功");
this.getlist();
});
@ -436,8 +436,8 @@ export default {
getlist() {
console.log(this.pages);
ethniclist(this.pages).then((res) => {
this.initTableData = [...res.data.items];
this.tableData = res.data.items;
this.initTableData = [...res.data];
this.tableData = res.data;
this.totalCount = res.data.totalCount;
console.log(res);
});

4
src/views/basic-dictionary/ResultStatus.vue

@ -196,7 +196,7 @@ export default {
pages: {
// currentPage: 0,
SkipCount: 0,
MaxResultCount: 5,
MaxResultCount: 100,
Sorting: "displayOrder desc",
// totalCount: 0,
},
@ -342,7 +342,7 @@ export default {
),
dataInputFontColor: Number(this.form.dataInputFontColor),
};
statusmodification(this.form.resultStatusId, obj).then((res) => {
statusmodification(this.form.id, obj).then((res) => {
this.$message.success("修改成功");
this.getlist();
this.dialogVisible = false;

4
src/views/customerOrg/patientRegisterRecover.vue

@ -117,7 +117,9 @@ export default {
//
getapi("/api/app/nation/in-filter").then((res) => {
if (res.code == 1) {
this.dict.nation = res.data.items;
// this.dict.nation = res.data.items;
this.dict.nation = res.data;
console.log(res,'名族');
}
});

33
src/views/login/Login.vue

@ -60,7 +60,7 @@ export default {
};
},
methods: {
onSubmit() {
async onSubmit() {
this.$refs.form.validate((valid) => {
if (valid) {
// lognis({
@ -98,17 +98,26 @@ export default {
}
)
.then((res) => {
//console.log(res.data)
writetoken(res.data.expires_in);
window.localStorage.setItem("token", res.data.access_token);
window.localStorage.setItem("refresh_token",res.data.refresh_token);
// window.localStorage.setItem("expires_in", res.data.expires_in);
window.localStorage.setItem("tokentype", res.data.token_type);
window.localStorage.setItem("user", this.form.Username);
this.$message.success("登录成功");
this.$router.push({ path: "home" });
// this.$store.dispatch('changepassword',this.form.Password)
this.$store.state.changepassword=this.form.Password
console.log(res, "222222");
if (res.status == 200) {
//console.log(res.data)
writetoken(res.data.expires_in);
window.localStorage.setItem("token", res.data.access_token);
window.localStorage.setItem(
"refresh_token",
res.data.refresh_token
);
// window.localStorage.setItem("expires_in", res.data.expires_in);
window.localStorage.setItem("tokentype", res.data.token_type);
window.localStorage.setItem("user", this.form.Username);
this.$message.success("登录成功");
this.$router.push({ path: "home" });
// this.$store.dispatch('changepassword',this.form.Password)
this.$store.state.changepassword = this.form.Password;
} else {
this.$message.warning("用户名或密码错误");
}
});
}
});

4
src/views/user-list/AuditLog.vue

@ -24,7 +24,7 @@
{{ scope.row.executionTime | dateFormat }}
</template>
</el-table-column>
<el-table-column prop="browserInfo" label="浏览器信息" width="180">
<el-table-column prop="browserInfo" label="浏览器信息" width="">
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
@ -60,7 +60,7 @@
{{ scope.row.executionTime | dateFormat }}
</template>
</el-table-column>
<el-table-column prop="browserInfo" label="浏览器信息" width="180">
<el-table-column prop="browserInfo" label="浏览器信息" width="">
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">

44
src/views/user-list/UserList.vue

@ -205,7 +205,6 @@
label: 'displayName',
children: 'treeChildren',
}"
:default-checked-keys="defaultchekedKeys"
:default-expand-all="true"
show-checkbox
@ -408,13 +407,13 @@
</el-dialog>
<!-- 修改密码弹框 -->
<el-dialog
title="修改密码"
:title="'修改密码' + '当前用户' + usersName"
:visible.sync="editpassworddialogVisible"
width="30%"
>
<el-form ref="form" :model="form" label-width="80px">
<el-form-item label="新密码">
<el-input v-model="newPassWord"></el-input>
<el-input v-model="newPassWord" max="16" min="6"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@ -445,6 +444,7 @@ import {
lognis,
} from "../../request/ruquset";
import { mapState } from "vuex";
import { isValid } from "@/utlis/validate";
import { getapi, postapi } from "@/api/api";
// let validatePassword = (rule, value, callback) => {
// var reg1 =
@ -458,11 +458,12 @@ import { getapi, postapi } from "@/api/api";
// callback();
// }
// };
let validatePassword = /^[a-zA-Z]\w{5,8}$/;
let validatePassword = /^[a-zA-Z0-9@\$\^\.\*\\?]\{6,15}$/;
export default {
data() {
return {
defaultchekedKeys:[],//
usersName: "", //
defaultchekedKeys: [], //
department: [], //
setupdepartments: [], //
newPassWord: "", //
@ -492,10 +493,16 @@ export default {
message: "密码不能为空",
},
{
required: true,
min: 6,
max: 15,
message: "长度在 6 到 15 个字符",
trigger: "blur",
validator: validatePassword,
},
// {
// required: true,
// trigger: "blur",
// validator: validatePassword,
// },
],
email: [
{
@ -539,7 +546,7 @@ export default {
checkList: [], //
pages: {
SkipCount: 0,
MaxResultCount: 5,
MaxResultCount: 100,
Filter: "",
// Filter:{
// userName:this.form.userName,
@ -595,6 +602,7 @@ export default {
editpassword(row) {
this.editpassworddialogVisible = true;
this.passwordid = row.id;
this.usersName = row.userName;
},
//
ischesc() {
@ -821,14 +829,20 @@ export default {
orgId: this.defaultKeys,
}).then((res) => {
console.log(res);
postapi(
`/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
this.department
).then((res) => {
// this.$message.success("");
});
// this.$message.success("");
});
postapi(
`/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
this.department
).then((res) => {
// this.$message.success("");
});
// postapi(
// `/api/app/abpuserdepartment/createmany?UserId=${this.form.id}`,
// this.department
// ).then((res) => {
// // this.$message.success("");
// });
console.log("aaaaaa");
}
});
@ -893,7 +907,7 @@ export default {
`/api/app/abpuserdepartment/getuserdepartment?UserId=${row.id}`
).then((res) => {
// default-checked-keys
this.defaultchekedKeys=res.data
this.defaultchekedKeys = res.data;
console.log(res, "科室");
});
}

Loading…
Cancel
Save