Browse Source

组织手机号负责人非必填

newMaster
1747191978@qq.com 4 months ago
parent
commit
e6895fff97
  1. 246
      acupuncture-后台/src/views/member/account.vue
  2. 255
      acupuncture-后台/src/views/member/index.vue

246
acupuncture-后台/src/views/member/account.vue

@ -1,37 +1,102 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" <el-form
label-width="80px"> :model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="80px"
>
<el-form-item label="组织名称" prop="tenantName"> <el-form-item label="组织名称" prop="tenantName">
<el-input v-model="queryParams.param.tenantName" placeholder="请输入" clearable <el-input
@keyup.enter.native="handleQuery" /> v-model="queryParams.param.tenantName"
placeholder="请输入"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" <el-button
@click="handleDelete">删除</el-button> type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="listData" @selection-change="handleSelectionChange" max-height="600"> <el-table
v-loading="loading"
:data="listData"
@selection-change="handleSelectionChange"
max-height="600"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="昵称" align="center" prop="nickName" min-width="100" /> <el-table-column
<el-table-column fixed label="用户名" align="center" prop="userName" show-overflow-tooltip min-width="100"> fixed
label="昵称"
align="center"
prop="nickName"
min-width="100"
/>
<el-table-column
fixed
label="用户名"
align="center"
prop="userName"
show-overflow-tooltip
min-width="100"
>
</el-table-column> </el-table-column>
<el-table-column fixed label="组织名称" align="center" prop="tenantName" show-overflow-tooltip min-width="80" /> <el-table-column
<el-table-column label="状态" align="center" show-overflow-tooltip min-width="100"> fixed
label="组织名称"
align="center"
prop="tenantName"
show-overflow-tooltip
min-width="80"
/>
<el-table-column
label="状态"
align="center"
show-overflow-tooltip
min-width="100"
>
<template slot-scope="scope" v-if="scope.row.status != null"> <template slot-scope="scope" v-if="scope.row.status != null">
<span v-if="scope.row.status == 0" style="color: #67C23A">启用</span> <span v-if="scope.row.status == 0" style="color: #67c23a">启用</span>
<span v-if="scope.row.status == 1" style="color: #F56C6C">禁用</span> <span v-if="scope.row.status == 1" style="color: #f56c6c">禁用</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人/创建时间" align="center" min-width="140"> <el-table-column label="创建人/创建时间" align="center" min-width="140">
@ -42,24 +107,62 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200"> <el-table-column
fixed="right"
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" <el-button
@click="handleUpdate(scope.row)">修改</el-button> size="mini"
<el-button size="mini" type="text" icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)">删除</el-button> icon="el-icon-edit"
<el-button size="mini" type="text" icon="el-icon-refresh" @click="handleUpdate(scope.row)"
@click="handleResetPwd(scope.row)">重置密码</el-button> >修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-refresh"
@click="handleResetPwd(scope.row)"
>重置密码</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination
:limit.sync="queryParams.pageSize" @pagination="getList" /> v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改公告对话框 --> <!-- 添加或修改公告对话框 -->
<el-dialog class="popup" :title="title" :visible.sync="open" width="780px" append-to-body> <el-dialog
<el-form ref="form" :model="form" :rules="rules" label-width="80px" class="formStep"> class="popup"
:title="title"
:visible.sync="open"
width="780px"
append-to-body
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="80px"
class="formStep"
>
<el-form-item label="昵称" prop="nickName"> <el-form-item label="昵称" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入" /> <el-input v-model="form.nickName" placeholder="请输入" />
</el-form-item> </el-form-item>
@ -70,9 +173,13 @@
<el-input v-model="form.password" placeholder="请输入" /> <el-input v-model="form.password" placeholder="请输入" />
</el-form-item> </el-form-item>
<el-form-item label="组织" prop="tenantId"> <el-form-item label="组织" prop="tenantId">
<el-select v-model="form.tenantId" placeholder="请选择"> <el-select v-model="form.tenantId" placeholder="请选择" filterable>
<el-option v-for="item in tenantsDataList" :key="item.id" :label="item.name" <el-option
:value="item.id"> v-for="item in tenantsDataList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -83,8 +190,20 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog class="popup" title="重置密码" :visible.sync="resetOpen" width="780px" append-to-body> <el-dialog
<el-form ref="pasForm" :model="form" :rules="rules" label-width="80px" class="formStep"> class="popup"
title="重置密码"
:visible.sync="resetOpen"
width="780px"
append-to-body
>
<el-form
ref="pasForm"
:model="form"
:rules="rules"
label-width="80px"
class="formStep"
>
<el-form-item label="新密码" prop="password"> <el-form-item label="新密码" prop="password">
<el-input v-model="form.password" placeholder="请输入" /> <el-input v-model="form.password" placeholder="请输入" />
</el-form-item> </el-form-item>
@ -105,11 +224,9 @@
tenantUsersUpd, tenantUsersUpd,
tenantUsersDel, tenantUsersDel,
dataSourcesList, dataSourcesList,
resetPwd resetPwd,
} from "@/api/member"; } from "@/api/member";
import { import { followupQuery } from "@/api/followupFile";
followupQuery
} from "@/api/followupFile";
export default { export default {
name: "Notice", name: "Notice",
dicts: ["sys_normal_disable", "sys_user_sex"], dicts: ["sys_normal_disable", "sys_user_sex"],
@ -119,10 +236,10 @@
queryParams: { queryParams: {
param: { param: {
tenantName: "", tenantName: "",
} },
}, },
listData: [], listData: [],
title: '', title: "",
resetOpen: false, resetOpen: false,
open: false, open: false,
total: 0, total: 0,
@ -132,30 +249,39 @@
multiple: false, multiple: false,
// //
rules: { rules: {
nickName: [{ nickName: [
{
required: true, required: true,
message: "昵称不能为空", message: "昵称不能为空",
trigger: "blur", trigger: "blur",
}], },
userName: [{ ],
userName: [
{
required: true, required: true,
message: "账户不能为空", message: "账户不能为空",
trigger: "blur", trigger: "blur",
}], },
tenantId: [{ ],
tenantId: [
{
required: true, required: true,
message: "所属组织不能为空", message: "所属组织不能为空",
trigger: "blur", trigger: "blur",
}], },
password: [{ ],
password: [
{
required: true, required: true,
message: "密码不能为空", message: "密码不能为空",
trigger: "blur", trigger: "blur",
}, { },
{
pattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z\s]).{8,20}$/, pattern: /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^\da-zA-Z\s]).{8,20}$/,
message: "必须包含数字、字母、特殊字符, 长度为8到20位", message: "必须包含数字、字母、特殊字符, 长度为8到20位",
trigger: "blur", trigger: "blur",
}], },
],
}, },
}; };
}, },
@ -190,11 +316,11 @@
// //
reset() { reset() {
this.form = { this.form = {
"tenantId": "", tenantId: "",
"userName": "", userName: "",
"nickName": "", nickName: "",
"userName": '', userName: "",
"status": "0", status: "0",
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -226,7 +352,7 @@
handleUpdate(row) { handleUpdate(row) {
this.open = true; this.open = true;
this.title = "修改用户"; this.title = "修改用户";
this.form = JSON.parse(JSON.stringify(row)) this.form = JSON.parse(JSON.stringify(row));
}, },
/** 诊疗档案 */ /** 诊疗档案 */
submitForm: function () { submitForm: function () {
@ -249,9 +375,9 @@
}); });
}, },
handleResetPwd(row) { handleResetPwd(row) {
this.resetOpen = true this.resetOpen = true;
this.form = JSON.parse(JSON.stringify(row)) this.form = JSON.parse(JSON.stringify(row));
this.form.password = '' this.form.password = "";
}, },
submitPasForm(row) { submitPasForm(row) {
this.$refs["pasForm"].validate((valid) => { this.$refs["pasForm"].validate((valid) => {
@ -283,7 +409,8 @@
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download1( this.download1(
"/treatment/exportTreatment", { "/treatment/exportTreatment",
{
...this.queryParams.params, ...this.queryParams.params,
}, },
`诊疗档案.xlsx` `诊疗档案.xlsx`
@ -355,7 +482,8 @@
margin-right: 0; margin-right: 0;
} }
.formStep1>>>.el-form-item__label {} .formStep1 >>> .el-form-item__label {
}
.form-item-zd { .form-item-zd {
width: 100%; width: 100%;

255
acupuncture-后台/src/views/member/index.vue

@ -1,39 +1,102 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" <el-form
label-width="80px"> :model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="80px"
>
<el-form-item label="组织名称" prop="name"> <el-form-item label="组织名称" prop="name">
<el-input v-model="queryParams.param.name" placeholder="请输入" clearable <el-input
@keyup.enter.native="handleQuery" /> v-model="queryParams.param.name"
placeholder="请输入"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" <el-button
@click="handleDelete">删除</el-button> type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="listData" @selection-change="handleSelectionChange" max-height="600"> <el-table
v-loading="loading"
:data="listData"
@selection-change="handleSelectionChange"
max-height="600"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="组织名称" align="center" prop="name" min-width="100" /> <el-table-column
<el-table-column fixed label="联系电话" align="center" prop="contactPhone" show-overflow-tooltip fixed
min-width="100"> label="组织名称"
align="center"
prop="name"
min-width="100"
/>
<el-table-column
fixed
label="联系电话"
align="center"
prop="contactPhone"
show-overflow-tooltip
min-width="100"
>
</el-table-column> </el-table-column>
<el-table-column fixed label="数据源" align="center" prop="dataSourceKey" show-overflow-tooltip <el-table-column
min-width="80" /> fixed
<el-table-column label="状态" align="center" show-overflow-tooltip min-width="100"> label="数据源"
align="center"
prop="dataSourceKey"
show-overflow-tooltip
min-width="80"
/>
<el-table-column
label="状态"
align="center"
show-overflow-tooltip
min-width="100"
>
<template slot-scope="scope" v-if="scope.row.status != null"> <template slot-scope="scope" v-if="scope.row.status != null">
<span v-if="scope.row.status == 0" style="color: #67C23A">启用</span> <span v-if="scope.row.status == 0" style="color: #67c23a">启用</span>
<span v-if="scope.row.status == 1" style="color: #F56C6C">禁用</span> <span v-if="scope.row.status == 1" style="color: #f56c6c">禁用</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人/创建时间" align="center" min-width="140"> <el-table-column label="创建人/创建时间" align="center" min-width="140">
@ -44,27 +107,67 @@
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200"> <el-table-column
fixed="right"
label="操作"
align="center"
class-name="small-padding fixed-width"
width="200"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <el-button
:disabled="scope.row.id == 1 || scope.row.id == 2">修改</el-button> size="mini"
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" type="text"
:disabled="scope.row.id == 1 || scope.row.id == 2">删除</el-button> icon="el-icon-edit"
@click="handleUpdate(scope.row)"
:disabled="scope.row.id == 1 || scope.row.id == 2"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
:disabled="scope.row.id == 1 || scope.row.id == 2"
>删除</el-button
>
<!-- 启用 禁用 --> <!-- 启用 禁用 -->
<el-button size="mini" type="text" icon="el-icon-connection" @click="handleStatusUpd(scope.row)" <el-button
:disabled="scope.row.id == 1 || scope.row.id == 2"> size="mini"
{{scope.row.status - 0 ? '启用' : '禁用'}} type="text"
icon="el-icon-connection"
@click="handleStatusUpd(scope.row)"
:disabled="scope.row.id == 1 || scope.row.id == 2"
>
{{ scope.row.status - 0 ? "启用" : "禁用" }}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination
:limit.sync="queryParams.pageSize" @pagination="getList" /> v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改公告对话框 --> <!-- 添加或修改公告对话框 -->
<el-dialog class="popup" :title="title" :visible.sync="open" width="780px" append-to-body> <el-dialog
<el-form ref="form" :model="form" :rules="rules" label-width="140px" class="formStep"> class="popup"
:title="title"
:visible.sync="open"
width="780px"
append-to-body
>
<el-form
ref="form"
:model="form"
:rules="rules"
label-width="140px"
class="formStep"
>
<el-form-item label="组织名称" prop="name"> <el-form-item label="组织名称" prop="name">
<el-input v-model="form.name" placeholder="请输入" /> <el-input v-model="form.name" placeholder="请输入" />
</el-form-item> </el-form-item>
@ -76,8 +179,12 @@
</el-form-item> </el-form-item>
<el-form-item label="数据源" prop="dataSourceId"> <el-form-item label="数据源" prop="dataSourceId">
<el-select v-model="form.dataSourceId" placeholder="请选择"> <el-select v-model="form.dataSourceId" placeholder="请选择">
<el-option v-for="item in dataSourceList" :key="item.id" :label="item.dataSourceKey" <el-option
:value="item.id"> v-for="item in dataSourceList"
:key="item.id"
:label="item.dataSourceKey"
:value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -102,11 +209,9 @@
tenantsAdd, tenantsAdd,
tenantsUpd, tenantsUpd,
tenantsDel, tenantsDel,
dataSourcesList dataSourcesList,
} from "@/api/member"; } from "@/api/member";
import { import { followupQuery } from "@/api/followupFile";
followupQuery
} from "@/api/followupFile";
export default { export default {
name: "Notice", name: "Notice",
dicts: ["sys_normal_disable", "sys_user_sex"], dicts: ["sys_normal_disable", "sys_user_sex"],
@ -116,10 +221,10 @@
queryParams: { queryParams: {
param: { param: {
name: "", name: "",
} },
}, },
listData: [], listData: [],
title: '', title: "",
open: false, open: false,
total: 0, total: 0,
form: {}, form: {},
@ -128,40 +233,53 @@
multiple: false, multiple: false,
// //
rules: { rules: {
code: [{ code: [
{
required: true, required: true,
message: "CODE不能为空", message: "CODE不能为空",
trigger: "blur", trigger: "blur",
}], },
name: [{ ],
name: [
{
required: true, required: true,
message: "组织名称不能为空", message: "组织名称不能为空",
trigger: "blur", trigger: "blur",
}], },
leader: [{ ],
required: true, leader: [
{
required: false,
message: "负责人不能为空", message: "负责人不能为空",
trigger: "blur", trigger: "blur",
}], },
contactPhone: [{ ],
required: true, contactPhone: [
{
required: false,
message: "手机号码不能为空", message: "手机号码不能为空",
trigger: "blur" trigger: "blur",
}, { },
{
pattern: /^1[3456789]\d{9}$/, pattern: /^1[3456789]\d{9}$/,
message: '手机号码格式不正确', message: "手机号码格式不正确",
trigger: 'blur' trigger: "blur",
}], },
dataSourceId: [{ ],
required: true, dataSourceId: [
{
required: false,
message: "数据源不能为空", message: "数据源不能为空",
trigger: "change", trigger: "change",
}], },
status: [{ ],
status: [
{
required: true, required: true,
message: "状态不能为空", message: "状态不能为空",
trigger: "blur", trigger: "blur",
}], },
],
}, },
}; };
}, },
@ -198,11 +316,11 @@
// //
reset() { reset() {
this.form = { this.form = {
"name": "", name: "",
"leader": "", leader: "",
"contactPhone": "", contactPhone: "",
"dataSourceId": '', dataSourceId: "",
"status": "0", status: "0",
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -234,7 +352,7 @@
handleUpdate(row) { handleUpdate(row) {
this.open = true; this.open = true;
this.title = "修改诊疗档案"; this.title = "修改诊疗档案";
this.form = JSON.parse(JSON.stringify(row)) this.form = JSON.parse(JSON.stringify(row));
}, },
/** 诊疗档案 */ /** 诊疗档案 */
submitForm: function () { submitForm: function () {
@ -275,9 +393,9 @@
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleStatusUpd(row) { handleStatusUpd(row) {
let form = JSON.parse(JSON.stringify(row)) let form = JSON.parse(JSON.stringify(row));
form.status = form.status == 1 ? 0 : 1 form.status = form.status == 1 ? 0 : 1;
let title = form.status ? '启用' : '禁用' let title = form.status ? "启用" : "禁用";
this.$modal this.$modal
.confirm(`是否确认 "${title}" 组织名称为 "${row.name}" 数据?`) .confirm(`是否确认 "${title}" 组织名称为 "${row.name}" 数据?`)
.then(function () { .then(function () {
@ -340,7 +458,8 @@
margin-right: 0; margin-right: 0;
} }
.formStep1>>>.el-form-item__label {} .formStep1 >>> .el-form-item__label {
}
.form-item-zd { .form-item-zd {
width: 100%; width: 100%;

Loading…
Cancel
Save