xinyilu/NurseStationOperateUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

护理站人员加姓名，订单查看加滚动条，删掉查看标签信息

Browse Source
This commit is contained in:
闫晓茹 2022-11-08 14:36:56 +08:00
parent 91a3f508b4
commit 7138c98d56
3 changed files with 121 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/system/order/index.vue
View File

@ -132,7 +132,7 @@
:visible.sync="innerVisible4" :visible.sync="innerVisible4"
append-to-body append-to-body
width="1048px" width="1048px"
class="orderInfo"
> >
<el-form <el-form
:inline="true" :inline="true"
@ -140,6 +140,7 @@
:model="form" :model="form"
:rules="rules" :rules="rules"
label-width="120px" label-width="120px"
class="orderInfo"
> >
<div v-for="(item, index) in query" :key="index"> <div v-for="(item, index) in query" :key="index">
<el-form-item label="订单编号" prop="orderNo"> <el-form-item label="订单编号" prop="orderNo">
@ -715,8 +716,8 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
/* ::v-deep .el-dialog__body { ::v-deep .orderInfo{
height: 500px; height: 350px;
overflow-y: scroll; overflow-y: scroll;
} */ }
</style> </style>

153
src/views/system/person/index.vue
View File

@ -59,7 +59,7 @@
<el-form-item label="姓名" prop="nursePersonName"> <el-form-item label="姓名" prop="nursePersonName">
<el-input <el-input
v-model="queryParams.nursePersonName" v-model="queryParams.nursePersonName"
placeholder="请输入姓名" placeholder="请输入居住地址"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -397,6 +397,7 @@
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 新增护理站名称弹框 --> <!-- 新增护理站名称弹框 -->
<el-dialog <el-dialog
:title="title2" :title="title2"
@ -406,7 +407,7 @@
> >
<el-form <el-form
ref="queryForm" ref="queryForm"
:model="nurseStationqueryParams" :model="queryParams2"
:rules="rules" :rules="rules"
label-width="80px" label-width="80px"
:inline="true" :inline="true"
@ -425,7 +426,7 @@
label-width="120" label-width="120"
> >
<el-input <el-input
v-model="nurseStationqueryParams.nurseStationCode" v-model="queryParams2.nurseStationCode"
placeholder="请输入护理站编码" placeholder="请输入护理站编码"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -437,7 +438,7 @@
label-width="120" label-width="120"
> >
<el-input <el-input
v-model="nurseStationqueryParams.nurseStationName" v-model="queryParams2.nurseStationName"
placeholder="请输入护理站名称" placeholder="请输入护理站名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -456,8 +457,8 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="nurseStationlist" @cell-dblclick="nurseclick"> <el-table :data="stationLists" @cell-dblclick="nurseclick">
<el-table-column label="请选择" width="100" align="center"> <el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -477,46 +478,54 @@
<el-table-column <el-table-column
property="nurseStationCode" property="nurseStationCode"
label="护理站编码" label="护理站编码"
width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
property="nurseStationName" property="nurseStationName"
label="护理站名称" label="护理站名称"
width="150"
align="center" align="center"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
label="护理站类型" label="护理站类型"
align="center" align="center"
prop="nurseStationType" prop="nurseStationType"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ {{
scope.row.nurseStationType == "LX202211070001" ? "生活护理" : "" scope.row.nurseStationType == "LX202209140018" ? "生活护理" : ""
}} }}
{{ {{
scope.row.nurseStationType == "LX202211070002" ? "医疗护理" : "" scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
}} }}
</template> </template>
</el-table-column> --> </el-table-column>
<el-table-column property="phone" label="联系电话" align="center"> <el-table-column
property="phone"
label="联系电话"
width="150"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
property="address" property="address"
label="护理站地址" label="护理地址"
width="150"
align="center" align="center"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total5 > 0" v-show="total2 > 0"
:total="total5" :total="total2"
:page.sync="nurseStationqueryParams.pageNum" :page.sync="queryParams2.pageNum"
:limit.sync="nurseStationqueryParams.pageSize" :limit.sync="queryParams2.pageSize"
@pagination="handleQuery2" @pagination="handleQuery2"
/> />
</el-dialog> </el-dialog>
@ -580,7 +589,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="stationLists" @cell-dblclick="nurseclick2"> <el-table :data="stationLists" @cell-dblclick="nurseclick2">
<el-table-column label="请选择" width="100" align="center"> <el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -600,16 +609,18 @@
<el-table-column <el-table-column
property="nurseStationCode" property="nurseStationCode"
label="护理站编码" label="护理站编码"
width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
property="nurseStationName" property="nurseStationName"
label="护理站名称" label="护理站名称"
width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
label="护理站类型" label="护理站类型"
align="center" align="center"
prop="nurseStationType" prop="nurseStationType"
@ -622,18 +633,28 @@
scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : "" scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
}} }}
</template> </template>
</el-table-column> -->
<el-table-column property="phone" label="联系电话" align="center">
</el-table-column> </el-table-column>
<el-table-column property="address" label="护理站地址" align="center">
<el-table-column
property="phone"
label="联系电话"
width="150"
align="center"
>
</el-table-column>
<el-table-column
property="address"
label="护理地址"
width="150"
align="center"
>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total5 > 0" v-show="total2 > 0"
:total="total5" :total="total2"
:page.sync="nurseStationqueryParams.pageNum" :page.sync="queryParams2.pageNum"
:limit.sync="nurseStationqueryParams.pageSize" :limit.sync="queryParams2.pageSize"
@pagination="handleQuery2" @pagination="handleQuery2"
/> />
</el-dialog> </el-dialog>
@ -684,7 +705,7 @@
:data="StationDepartmentLists" :data="StationDepartmentLists"
@cell-dblclick="StationDepartmentclick" @cell-dblclick="StationDepartmentclick"
> >
<el-table-column label="请选择" width="100" align="center"> <el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -704,12 +725,14 @@
<el-table-column <el-table-column
property="departmentCode" property="departmentCode"
label="科室编码" label="科室编码"
width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
property="departmentName" property="departmentName"
label="科室名称" label="科室名称"
width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
@ -717,10 +740,16 @@
<el-table-column <el-table-column
property="departmentPerson" property="departmentPerson"
label="科室负责人" label="科室负责人"
width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column property="phone" label="联系电话" align="center"> <el-table-column
property="phone"
label="联系电话"
width="150"
align="center"
>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
@ -786,7 +815,7 @@
:data="StationDepartmentLists" :data="StationDepartmentLists"
@cell-dblclick="StationDepartmentclick2" @cell-dblclick="StationDepartmentclick2"
> >
<el-table-column label="请选择" width="100" align="center"> <el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="primary" type="primary"
@ -806,12 +835,14 @@
<el-table-column <el-table-column
property="departmentCode" property="departmentCode"
label="科室编码" label="科室编码"
width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
property="departmentName" property="departmentName"
label="科室名称" label="科室名称"
width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
@ -819,12 +850,14 @@
<el-table-column <el-table-column
property="departmentPerson" property="departmentPerson"
label="科室负责人" label="科室负责人"
width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
property="phone" property="phone"
label="联系电话" label="联系电话"
width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
@ -837,6 +870,7 @@
@pagination="handleQuery3" @pagination="handleQuery3"
/> />
</el-dialog> </el-dialog>
<!-- 修改 --> <!-- 修改 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@ -849,6 +883,7 @@
<el-button <el-button
disabled disabled
type="" type=""
@click="clickinnerVisible2"
v-if="nurseStationName == '请选择护理站名称'" v-if="nurseStationName == '请选择护理站名称'"
style="width: 362px; text-align: left; height: 36px; color: #c0c4cc" style="width: 362px; text-align: left; height: 36px; color: #c0c4cc"
>{{ nurseStationName }}</el-button >{{ nurseStationName }}</el-button
@ -856,6 +891,7 @@
<el-button <el-button
disabled disabled
type="" type=""
@click="clickinnerVisible2"
v-else v-else
style=" style="
width: 362px; width: 362px;
@ -893,6 +929,13 @@
>{{ departmentName }}</el-button >{{ departmentName }}</el-button
> >
</el-form-item> </el-form-item>
<el-form-item label="姓名" prop="nursePersonName" >
<el-input
maxlength="15"
v-model="form.nursePersonName"
placeholder="请输入姓名"
/>
</el-form-item>
<el-form-item <el-form-item
label="护理人职称" label="护理人职称"
prop="nursePersonType" prop="nursePersonType"
@ -937,7 +980,6 @@
maxlength="11" maxlength="11"
/> />
</el-form-item> </el-form-item>
<el-form-item label="居住地址" prop="address"> <el-form-item label="居住地址" prop="address">
<el-input <el-input
v-model="form.address" v-model="form.address"
@ -1150,21 +1192,9 @@ export default {
index: "", index: "",
// 表单校验 // 表单校验
rules: { rules: {
nursePersonName: [ nursePersonName: [
{ { required: true, message: "姓名不能为空", trigger: "blur" },
required: true,
message: "护理站人员名称不能为空",
trigger: "blur",
},
],
departmentName: [
{ required: true, message: "所属科室不能为空", trigger: "blur" },
],
// nurseStationId: [
// { required: true, message: "所属护理站不能为空", trigger: "blur" },
// ],
nursePersonName: [
{ required: true, message: "护理人姓名不能为空", trigger: "blur" },
], ],
nursePersonType: [ nursePersonType: [
{ required: true, message: "护理人职称不能为空", trigger: "blur" }, { required: true, message: "护理人职称不能为空", trigger: "blur" },
@ -1254,10 +1284,23 @@ export default {
}, },
// 新增护理站按钮 // 新增护理站按钮
clickinnerVisible(item, index) { clickinnerVisible(item, index) {
// console.log(item);
this.stationid = item.nurseStationId; this.stationid = item.nurseStationId;
this.innerVisible = true; this.innerVisible = true;
this.index = index; this.index = index;
}, },
// 修改护理站按钮
clickinnerVisible2() {
stationList(this.queryParams2).then((res) => {
this.stationLists = res.rows;
this.total2 = res.total;
this.loading = false;
});
// console.log(item);
this.stationid2 = this.form.nurseStationId;
this.innerVisiblexg = true;
// this.index = index;
},
//xialakuang //xialakuang
// loadMore() { // loadMore() {
// console.log("1"); // console.log("1");
@ -1303,6 +1346,7 @@ export default {
address: "", address: "",
sex: "", sex: "",
nurseStationId: "", nurseStationId: "",
departmentName: "请选择所属科室", departmentName: "请选择所属科室",
// departname: "", // departname: "",
nurseStationName: "请选择护理站名称", nurseStationName: "请选择护理站名称",
@ -1332,6 +1376,7 @@ export default {
this.nurseStationName = row.nurseStationName; this.nurseStationName = row.nurseStationName;
this.stationid2 = row.id; this.stationid2 = row.id;
this.form.nurseStationId = row.id; this.form.nurseStationId = row.id;
console.log(this.form);
this.innerVisiblexg = false; this.innerVisiblexg = false;
this.form.nursename = row.nurseStationName; this.form.nursename = row.nurseStationName;
}, },
@ -1429,13 +1474,18 @@ export default {
}; };
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery2() { handleQuery2() {
getListByUser(this.nurseStationqueryParams).then((res) => { this.queryParams.pageNum = 1;
this.total5 = res.total; stationList(this.queryParams2).then((res) => {
this.nurseStationlist = res.rows; this.stationLists = res.rows;
this.total2 = res.total;
this.loading = false;
}); });
this.innerVisible = true;
}, },
handleQuery3() { handleQuery3() {
console.log(this.queryParams3); console.log(this.queryParams3);
StationDepartmentList(this.queryParams3).then((response) => { StationDepartmentList(this.queryParams3).then((response) => {
@ -1461,14 +1511,17 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery2() { resetQuery2() {
this.nurseStationqueryParams = { this.queryParams2 = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
nurseStationName: null, nurseStationName: null,
id: null, id: null,
nurseStationId: null, nurseStationId: null,
}; };
this.handleQuery2(); stationList(this.queryParams2).then((res) => {
this.stationLists = res.rows;
this.total2 = res.total;
});
}, },
resetQuery3() { resetQuery3() {
this.queryParams3 = { this.queryParams3 = {
@ -1502,6 +1555,7 @@ export default {
phone: null, phone: null,
address: null, address: null,
}; };
this.handleQuery(); this.handleQuery();
} else { } else {
console.log(1); console.log(1);
@ -1552,6 +1606,7 @@ export default {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
// this.form.nursename = null; // this.form.nursename = null;
// this.form.nurseStationId = null; // this.form.nurseStationId = null;
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updatePerson(this.form).then((response) => { updatePerson(this.form).then((response) => {

24
src/views/system/station/index.vue
View File

@ -250,13 +250,13 @@
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-search" icon="el-icon-search"
@click="looknurseStationLabelList(scope.row)" @click="looknurseStationLabelList(scope.row)"
>查看标签信息</el-button >查看标签信息</el-button
> > -->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -311,7 +311,7 @@
</el-dialog> </el-dialog>
<!-- 查看标签信息 --> <!-- 查看标签信息 -->
<el-dialog <!-- <el-dialog
title="标签信息" title="标签信息"
:visible.sync="nurseStationLabelopen" :visible.sync="nurseStationLabelopen"
width="700px" width="700px"
@ -335,7 +335,7 @@
>关闭窗口</el-button >关闭窗口</el-button
> >
</div> </div>
</el-dialog> </el-dialog> -->
<!-- 新增护理站信息对话框 --> <!-- 新增护理站信息对话框 -->
<el-dialog <el-dialog
@ -907,14 +907,14 @@ export default {
console.log(this.looknurseStationLabel); console.log(this.looknurseStationLabel);
}, },
//查看标签 //查看标签
looknurseStationLabelList(item) { // looknurseStationLabelList(item) {
console.log(item); // console.log(item);
nurseStationlabel(item.id).then((res) => { // nurseStationlabel(item.id).then((res) => {
this.looknurseStationLabel = res.rows; // this.looknurseStationLabel = res.rows;
this.nurseStationLabelopen = true; // this.nurseStationLabelopen = true;
console.log(this.looknurseStationLabel); // console.log(this.looknurseStationLabel);
}); // });
}, // },
//查看类型 //查看类型
looktype(item) { looktype(item) {
// console.log(item); // console.log(item);