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

更改订单信息，护理站和部门

Browse Source
This commit is contained in:
闫晓茹 2022-09-23 11:16:03 +08:00
parent 6aff6b1b15
commit 8ec379cc35
3 changed files with 145 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/views/system/StationDepartment/index.vue
View File

@ -8,10 +8,27 @@
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item label="护理站" prop="nurseStationId"> <el-form-item label="护理站" prop="nurseStationId"
v-if="nurseStationlist.find((e) => e.isAdmin == '1')">
<el-select
v-model="queryParams.nurseStationId"
placeholder="请选择护理站"
v-loadmore="loadMore"
@keyup.enter.native="handleQuery"
>
<el-option
v-for="item in nurseStationlist"
:key="item.id"
:label="item.nurseStationName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="护理站" prop="nurseStationId"
v-else>
<el-select <el-select
v-model="queryParams.nurseStationId" v-model="queryParams.nurseStationId"
clearable
placeholder="请选择护理站" placeholder="请选择护理站"
v-loadmore="loadMore" v-loadmore="loadMore"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -195,6 +212,7 @@
<div <div
v-for="(item, index) in form.nurseStationDepartmentList" v-for="(item, index) in form.nurseStationDepartmentList"
:key="index" :key="index"
style="margin-top: 20px; border-bottom: 1px solid #f3f3f3"
> >
<el-form-item <el-form-item
label="护理站" label="护理站"
@ -341,6 +359,7 @@ import {
updateStationDepartment, updateStationDepartment,
list, list,
} from "@/api/system/StationDepartment"; } from "@/api/system/StationDepartment";
import { getListByUser } from "@/api/system/userlist.js";
export default { export default {
name: "StationDepartment", name: "StationDepartment",
@ -360,6 +379,7 @@ export default {
// 总条数 // 总条数
total: 0, total: 0,
total2: 0, total2: 0,
// 护理站部门信息表格数据 // 护理站部门信息表格数据
StationDepartmentList: [], StationDepartmentList: [],
// 弹出层标题 // 弹出层标题
@ -460,6 +480,7 @@ export default {
created() { created() {
this.getList(); this.getList();
this.listinfo(); this.listinfo();
this.info();
}, },
methods: { methods: {
//删除deldisease //删除deldisease
@ -493,16 +514,17 @@ export default {
nurseinfo() { nurseinfo() {
this.nurseStationId = row.nurseStationId; this.nurseStationId = row.nurseStationId;
}, },
loadMore() {
console.log("1"); //滑动下拉框
loadMore() {
var a = Math.ceil(this.total2 / 10); var a = Math.ceil(this.total2 / 10);
console.log(this.nurseStationlist.length);
if (this.nurseStationlist.length + 1 >= this.total2) { if (this.nurseStationlist.length + 1 >= this.total2) {
} else { } else {
if (this.nurseStationqueryParams.pageNum >= a) { if (this.nurseStationqueryParams.pageNum >= a) {
} else { } else {
this.nurseStationqueryParams.pageNum++; this.nurseStationqueryParams.pageNum++;
list(this.nurseStationqueryParams).then((res) => { console.log(this.nurseStationqueryParams.pageNum);
getListByUser(this.nurseStationqueryParams).then((res) => {
console.log(res); console.log(res);
res.rows.forEach((e) => { res.rows.forEach((e) => {
this.nurseStationlist.push(e); this.nurseStationlist.push(e);
@ -571,6 +593,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
if (this.nurseStationlist[0].isAdmin == "1") {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
@ -582,13 +605,31 @@ export default {
phone: null, phone: null,
nurseStationName: null, nurseStationName: null,
}; };
list(this.nurseStationqueryParams).then((res) => {
console.log(res);
this.nurseStationlist = res.rows;
this.total2 = res.total;
console.log(this.nurseStationlist);
});
this.handleQuery(); this.handleQuery();
}else {
console.log(1);
this.queryParams.departmentCode = null;
this.queryParams.pageSize = 10;
this.queryParams.pageNum = 1;
this.queryParams.departmentName = null;
this.handleQuery();
}
},
//权限列表
info() {
getListByUser(this.nurseStationqueryParams).then((res) => {
console.log(res);
if (res.rows[0].isAdmin == "1") {
console.log(true);
this.nurseStationlist = res.rows;
this.total2 = res.total;
} else {
this.total2 = res.total;
this.nurseStationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id;
this.handleQuery();
}
});
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {

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

@ -52,81 +52,83 @@
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-form>
<!-- <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar> -->
<right-toolbar <el-table
:showSearch.sync="showSearch" v-loading="loading"
@queryTable="getList" :data="OrderDetailsList"
></right-toolbar> @selection-change="handleSelectionChange"
>
<el-table <el-table-column label="客户" align="center" prop="patientName" />
v-loading="loading" <el-table-column label="订单编号" align="center" prop="orderNo" />
:data="OrderDetailsList" <el-table-column label="订单状态" align="center" prop="orderStatus">
@selection-change="handleSelectionChange" <template slot-scope="scope">
{{ scope.row.orderStatus == "WAIT_PAY" ? "待付款" : "" }}
{{ scope.row.orderStatus == "WAIT_DISPATCH" ? "待派单" : "" }}
{{ scope.row.orderStatus == "NOT_FINISH" ? "未完成" : "" }}
{{ scope.row.orderStatus == "COMPLETE" ? "服务完成" : "" }}
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
> >
<el-table-column label="客户" align="center" prop="patientName" /> <template slot-scope="scope">
<el-table-column label="订单编号" align="center" prop="orderNo" /> <el-button
<el-table-column label="订单状态" align="center" prop="orderStatus"> size="mini"
<template slot-scope="scope"> type="text"
{{ scope.row.orderStatus == "WAIT_PAY" ? "待付款" : "" }} icon="el-icon-edit"
{{ scope.row.orderStatus == "WAIT_DISPATCH" ? "待派单" : "" }} @click="seeLook(scope.row)"
{{ scope.row.orderStatus == "NOT_FINISH" ? "未完成" : "" }} v-hasPermi="['system:nurseType:edit']"
{{ scope.row.orderStatus == "COMPLETE" ? "服务完成" : "" }} >查看</el-button
</template> >
</el-table-column> <el-button
<el-table-column label="创建时间" align="center" prop="createTime" /> size="mini"
<el-table-column type="text"
label="操作" icon="el-icon-delete"
align="center" @click="handleDelete(scope.row)"
class-name="small-padding fixed-width" v-hasPermi="['system:nurseType:remove']"
> >删除</el-button
<template slot-scope="scope"> >
<el-button </template>
size="mini" </el-table-column>
type="text" </el-table>
icon="el-icon-edit" <pagination
@click="seeLook(scope.row)" v-show="total > 0"
v-hasPermi="['system:nurseType:edit']" :total="total"
>查看</el-button :page.sync="queryParams.pageNum"
> :limit.sync="queryParams.pageSize"
<el-button @pagination="getList"
size="mini" />
type="text" <!-- 查看弹框 -->
icon="el-icon-delete" <el-dialog
@click="handleDelete(scope.row)" title="查看订单信息"
v-hasPermi="['system:nurseType:remove']" :visible.sync="innerVisible4"
>删除</el-button append-to-body
> width="1048px"
</template> class="orderInfo"
</el-table-column> >
</el-table> <el-form
<pagination :inline="true"
v-show="total > 0" ref="form"
:total="total" :model="form"
:page.sync="queryParams.pageNum" :rules="rules"
:limit.sync="queryParams.pageSize" label-width="120px"
@pagination="getList"
/>
<!-- 查看弹框 -->
<!-- <el-scrollbar style="height:1048px; overflow-y: scroll;"> -->
<el-dialog
title="查看订单信息"
:visible.sync="innerVisible4"
append-to-body
width="1048px"
class="orderInfo"
> >
<div v-for="(item, index) in query" :key="index"> <div v-for="(item, index) in query" :key="index">
<el-row>
<el-col :span="8">
<el-form-item label="订单编号" prop="orderNo"> <el-form-item label="订单编号" prop="orderNo">
<el-input <el-input
v-model="item.orderNo" v-model="item.orderNo"
:disabled="true" :disabled="true"
style="width: 180px" style="width: 190px"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单状态" prop="orderStatus"> <el-form-item label="订单状态" prop="orderStatus">
<el-input <el-input
:value="switchOrderStatus(item.orderStatus)" :value="switchOrderStatus(item.orderStatus)"
@ -135,30 +137,24 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="护理站名称" prop="nurseStationName"> <el-form-item label="护理站名称" prop="nurseStationName">
<el-input <el-input
v-model="item.nurseStationName" v-model="item.nurseStationName"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
:disabled="true" :disabled="true"
style="width: 225px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单数量" prop="orderCount"> <el-form-item label="订单数量" prop="orderCount">
<el-input <el-input
v-model="item.orderCount" v-model="item.orderCount"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
:disabled="true" :disabled="true"
style="width: 180px" style="width: 190px"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="服务时间" prop="serviceDate"> <el-form-item label="服务时间" prop="serviceDate">
<el-input <el-input
v-model="item.serviceDate" v-model="item.serviceDate"
@ -168,30 +164,24 @@
style="width: 150px" style="width: 150px"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="服务地址" prop="serviceAddress"> <el-form-item label="服务地址" prop="serviceAddress">
<el-input <el-input
v-model="item.serviceAddress" v-model="item.serviceAddress"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
:disabled="true" :disabled="true"
style="width: 225px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="护理项目名称" prop="nurseItemName"> <el-form-item label="护理项目名称" prop="nurseItemName">
<el-input <el-input
v-model="item.nurseItemName" v-model="item.nurseItemName"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
:disabled="true" :disabled="true"
style="width: 180px" style="width: 190px"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="护理项目价格" prop="nurseItemPrice"> <el-form-item label="护理项目价格" prop="nurseItemPrice">
<el-input <el-input
v-model="item.nurseItemPrice" v-model="item.nurseItemPrice"
@ -201,19 +191,15 @@
style="width: 150px" style="width: 150px"
/> />
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="护理项目时长" prop="itemServeDurationUnit"> <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
<el-input <el-input
v-model="item.itemServeDurationUnit" v-model="item.itemServeDurationUnit"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
:disabled="true" :disabled="true"
style="width: 225px" style="width: 240px"
/> />
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-table <el-table
:data="item.appointmentOrderConsumableList" :data="item.appointmentOrderConsumableList"
align="center" align="center"
@ -242,9 +228,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</el-dialog> </el-form>
<!-- </el-scrollbar> --> </el-dialog>
</el-form>
</div> </div>
</template> </template>
<script> <script>
@ -308,6 +293,7 @@ export default {
pageSize: 10, pageSize: 10,
}, },
query: [], query: [],
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
@ -339,10 +325,8 @@ export default {
// console.log(row); // console.log(row);
Detailed(id).then((res) => { Detailed(id).then((res) => {
this.OrderDetailsLists = res.data; this.OrderDetailsLists = res.data;
// console.log(this.OrderDetailsLists)
this.query = res.data; this.query = res.data;
console.log(this.query); console.log(this.query);
// console.log(res);
}); });
}, },
/** 查询护理类型信息列表 */ /** 查询护理类型信息列表 */
@ -387,17 +371,22 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$confirm('是否确认删除订单编号为"' + row.orderNo + '"的数据项？', '提示', { this.$confirm(
confirmButtonText: '确定', '是否确认删除订单编号为"' + row.orderNo + '"的数据项？',
cancelButtonText: '取消', "提示",
type: 'warning' {
}).then(() => { confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(() => {
deldetailed(row.appointOrderDetailsId).then((res) => { deldetailed(row.appointOrderDetailsId).then((res) => {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.getList(); this.getList();
}) });
}) })
.catch(() => {}); .catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -413,9 +402,8 @@ export default {
}; };
</script> </script>
<style scoped> <style scoped>
::v-deep .el-dialog__body{ ::v-deep .el-dialog__body {
height: 500px;
height: 500px; overflow-y: scroll;
overflow-y: scroll; }
}
</style> </style>

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

@ -181,7 +181,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属区域" align="center" prop="areaCode" /> <el-table-column label="所属区域" align="center" prop="sysAreaVOList[0].streetName" />
<el-table-column label="护理站地址" align="center" prop="address" /> <el-table-column label="护理站地址" align="center" prop="address" />
<!-- <el-table-column <!-- <el-table-column
label="护理站简介" label="护理站简介"