This commit is contained in:
曹辉 2022-11-18 12:49:07 +08:00
parent cbc01aa0c8
commit 420543a6bf
11 changed files with 1282 additions and 1415 deletions

View File

@ -426,7 +426,11 @@
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table :data="nurseStationlist" @cell-dblclick="nurseclick" v-loading="loading2"> <el-table
:data="nurseStationlist"
@cell-dblclick="nurseclick"
v-loading="loading2"
>
<el-table-column label="请选择" width="100" align="center"> <el-table-column label="请选择" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -950,22 +954,11 @@ export default {
console.log(this.form); console.log(this.form);
this.goodsCategorylist = res.rows; this.goodsCategorylist = res.rows;
}); });
this.loading2 = true this.loading2 = true;
stationList(this.getListByUserquery).then((res) => { stationList(this.getListByUserquery).then((res) => {
this.nurseStationlist = res.rows; this.nurseStationlist = res.rows;
this.total2 = res.total; this.total2 = res.total;
console.log(res); this.loading2 = false;
// if (res.rows[0].isAdmin == "1") {
// 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.form.nurseStationId = res.rows[0].id;
// this.handleQuery();
// }
this.loading2 = false
}); });
}, },
infos() { infos() {
@ -974,7 +967,7 @@ export default {
pageSize: 9999, pageSize: 9999,
}; };
stationList(queryFor).then((res) => { stationList(queryFor).then((res) => {
console.log(res) console.log(res);
this.handstationlist = res.rows; this.handstationlist = res.rows;
}); });
}, },

View File

@ -19,7 +19,6 @@ import {
data() { data() {
return { return {
imgone: "", imgone: "",
imageUrl: "", //商品图片 imageUrl: "", //商品图片
value: "", value: "",
datas: null, datas: null,
@ -53,8 +52,7 @@ import {
// StationName: "请选择所属护理站", // StationName: "请选择所属护理站",
nursetotal: 0, nursetotal: 0,
nurseStationId: null, nurseStationId: null,
goods: [ goods: [{
{
value: "BUSINESS", value: "BUSINESS",
label: "买卖", label: "买卖",
}, },
@ -63,8 +61,7 @@ import {
label: "租赁", label: "租赁",
}, },
], ],
options: [ options: [{
{
value: 0, value: 0,
label: "否", label: "否",
}, },
@ -137,10 +134,8 @@ import {
}; };
}, },
created() { created() {
this.getList();
this.info(); this.info();
this.infos(); this.infos();
// this.getList2();
}, },
methods: { methods: {
upwhetherShelf(row) { upwhetherShelf(row) {
@ -237,19 +232,15 @@ import {
this.open = false; this.open = false;
this.reset(); this.reset();
this.StationName = "请选择所属护理站"; this.StationName = "请选择所属护理站";
this.goodDetailsLists = [ this.goodDetailsLists = [{
{
attributeName: "", attributeName: "",
goodAttributeDetailsLists: [ goodAttributeDetailsLists: [{
{
attributePitureUrl: "", attributePitureUrl: "",
goodsPrice: "", goodsPrice: "",
goodsStock: "", goodsStock: "",
sort: "", sort: "",
}, }, ],
], }, ];
},
];
}, },
// clickinnerVisible() { // clickinnerVisible() {
// this.innerVisible = true; // this.innerVisible = true;
@ -306,15 +297,13 @@ import {
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
}; };
this.goodDetailsLists = [ this.goodDetailsLists = [{
{
attributePitureUrl: "", attributePitureUrl: "",
goodsPrice: "", goodsPrice: "",
goodsStock: "", goodsStock: "",
sort: "", sort: "",
ids: 9999999, ids: 9999999,
}, }, ];
];
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
@ -351,15 +340,13 @@ import {
this.form.nurseStationId = this.nurseStationlist[0].id; this.form.nurseStationId = this.nurseStationlist[0].id;
this.title = "商品基本信息"; this.title = "商品基本信息";
this.StationName = "请选择所属护理站"; this.StationName = "请选择所属护理站";
this.goodDetailsLists = [ this.goodDetailsLists = [{
{
attributePitureUrl: "", attributePitureUrl: "",
goodsPrice: "", goodsPrice: "",
goodsStock: "", goodsStock: "",
sort: "", sort: "",
ids: 9999999, ids: 9999999,
}, }, ];
];
this.open = true; this.open = true;
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */

View File

@ -12,7 +12,6 @@
<el-select <el-select
v-model="queryParams.nurseStationId" v-model="queryParams.nurseStationId"
placeholder="请选择护理站" placeholder="请选择护理站"
> >
<el-option <el-option
v-for="item in handstationlist" v-for="item in handstationlist"
@ -212,14 +211,6 @@
label-width="120px" label-width="120px"
:inline="true" :inline="true"
> >
<el-form-item label="商品名称" prop="goodsName">
<el-input
v-model="form.goodsName"
placeholder="请输入商品名称"
maxlength="40"
style="width: 210px"
/>
</el-form-item>
<el-form-item label="护理站名称" prop="nurseStationName"> <el-form-item label="护理站名称" prop="nurseStationName">
<el-input <el-input
v-model="form.nurseStationName" v-model="form.nurseStationName"
@ -230,6 +221,14 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="商品名称" prop="goodsName">
<el-input
v-model="form.goodsName"
placeholder="请输入商品名称"
maxlength="40"
style="width: 210px"
/>
</el-form-item>
<el-form-item label="商品分类名称" prop="goodsCategoryId"> <el-form-item label="商品分类名称" prop="goodsCategoryId">
<el-select <el-select
style="width: 210px" style="width: 210px"
@ -295,6 +294,7 @@
<el-input <el-input
v-model="scope.row.goodsPrice" v-model="scope.row.goodsPrice"
type="number" type="number"
min="0"
oninput=" if(value.length>7){value=value.slice(0,7)}" oninput=" if(value.length>7){value=value.slice(0,7)}"
></el-input> ></el-input>
</template> </template>
@ -304,6 +304,7 @@
<el-input <el-input
v-model="scope.row.goodsStock" v-model="scope.row.goodsStock"
type="number" type="number"
min="0"
oninput="if(value.length>9){value=value.slice(0,9)}" oninput="if(value.length>9){value=value.slice(0,9)}"
></el-input> ></el-input>
</template> </template>
@ -464,8 +465,8 @@
</template> </template>
<script> <script>
import goodsInfojs from './goodsInfojs' import goodsInfojs from "./goodsInfojs";
export default goodsInfojs export default goodsInfojs;
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>

View File

@ -56,13 +56,6 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
<el-button
type="success"
icon="el-icon-refresh-right"
size="mini"
@click="resetQuery"
>刷新</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -180,15 +173,6 @@
v-hasPermi="['system:goodsOrder:editExpressNo']" v-hasPermi="['system:goodsOrder:editExpressNo']"
>录入物流单号</el-button >录入物流单号</el-button
> >
<!-- <el-button
v-if="scope.row.orderStatus != 'WAIT_RECEIVED_GOODS'"
size="mini"
type="text"
icon="el-icon-edit"
disabled
v-hasPermi="['system:goodsOrder:editExpressNo']"
>不可录入物流单号</el-button
> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

View File

@ -8,7 +8,6 @@
v-show="showSearch" v-show="showSearch"
label-width="100px" label-width="100px"
> >
<el-form-item label="护理类型编码" prop="nurseTypeCode"> <el-form-item label="护理类型编码" prop="nurseTypeCode">
<el-input <el-input
v-model="queryParams.nurseTypeCode" v-model="queryParams.nurseTypeCode"
@ -38,7 +37,6 @@
> >
</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 <el-button
@ -91,7 +89,6 @@
@queryTable="getList" @queryTable="getList"
></right-toolbar> ></right-toolbar>
</el-row> </el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="nurseTypeList" :data="nurseTypeList"
@ -111,16 +108,8 @@
prop="nurseTypeName" prop="nurseTypeName"
/> />
<el-table-column <el-table-column label="创建时间" align="center" prop="createTime" />
label="创建时间" <el-table-column label="创建人" align="center" prop="createBy" />
align="center"
prop="createTime"
/>
<el-table-column
label="创建人"
align="center"
prop="createBy"
/>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -156,16 +145,23 @@
/> />
<!-- 添加或修改护理类型信息对话框 --> <!-- 添加或修改护理类型信息对话框 -->
<el-dialog :title="title" :visible.sync="open2" width="450px" append-to-body> <el-dialog
:title="title"
:visible.sync="open2"
width="450px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<div <div
v-for="(item, index) in form.nurseTypeList" v-for="(item, index) in form.nurseTypeList"
:key="index" :key="index"
style="margin-top: 10px" style="margin-top: 10px"
> >
<el-form-item label="护理类型名称" <el-form-item
label="护理类型名称"
:rules="rules.nurseTypeList.nurseTypeName" :rules="rules.nurseTypeList.nurseTypeName"
:prop="`nurseTypeList.${index}.nurseTypeName`"> :prop="`nurseTypeList.${index}.nurseTypeName`"
>
<el-input <el-input
v-model="item.nurseTypeName" v-model="item.nurseTypeName"
placeholder="请输入护理类型名称" placeholder="请输入护理类型名称"
@ -179,7 +175,7 @@
icon="el-icon-circle-plus-outline" icon="el-icon-circle-plus-outline"
@click="adddisease" @click="adddisease"
v-if="index == 0" v-if="index == 0"
style="margin-top: 2px;margin-left: 10px;" style="margin-top: 2px; margin-left: 10px"
></el-button> ></el-button>
<el-button <el-button
@ -188,7 +184,7 @@
circle circle
plain plain
@click="deldisease(index)" @click="deldisease(index)"
style="margin-top: 2px;margin-left: 10px;" style="margin-top: 2px; margin-left: 10px"
v-if="index != 0" v-if="index != 0"
></el-button> ></el-button>
</el-form-item> </el-form-item>
@ -209,16 +205,13 @@
maxlength="50" maxlength="50"
style="width: 250px" style="width: 250px"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -262,7 +255,6 @@ export default {
userId: null, userId: null,
nurseTypeCode: null, nurseTypeCode: null,
nurseTypeName: null, nurseTypeName: null,
}, },
// //
form: {}, form: {},
@ -306,7 +298,6 @@ export default {
this.form.nurseTypeList.push(obj); this.form.nurseTypeList.push(obj);
} }
}, },
/** 查询护理类型信息列表 */ /** 查询护理类型信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
@ -325,13 +316,11 @@ export default {
// //
reset() { reset() {
this.form = { this.form = {
nurseTypeList: [ nurseTypeList: [
{ {
nurseTypeName: "", nurseTypeName: "",
} },
] ],
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -391,7 +380,7 @@ export default {
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal this.$modal
.confirm('是否确认删除护理类型信息的数据项?') .confirm("是否确认删除护理类型信息的数据项?")
.then(function () { .then(function () {
return delNurseType(ids); return delNurseType(ids);
}) })

View File

@ -21,7 +21,6 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="会员名称" prop="patientName"> <el-form-item label="会员名称" prop="patientName">
<el-input <el-input
@ -66,13 +65,6 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button >重置</el-button
> >
<el-button
type="success"
icon="el-icon-refresh-right"
size="mini"
@click="resetQuery"
>刷新</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
@ -124,7 +116,6 @@
<el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'" <el-button type="danger" v-if="scope.row.orderStatus == 'CANCEL'"
>已取消</el-button >已取消</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="下单时间" align="center" prop="createTime" /> <el-table-column label="下单时间" align="center" prop="createTime" />
@ -151,15 +142,6 @@
v-if="scope.row.orderStatus == 'WAIT_DISPATCH'" v-if="scope.row.orderStatus == 'WAIT_DISPATCH'"
>派单</el-button >派单</el-button
> >
<el-button
size="mini"
type="text"
disabled
icon="el-icon-s-promotion"
@click="dispatch(scope.row)"
v-else
>派单</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -169,15 +151,6 @@
v-hasPermi="['system:appointmentOrder:confirmCancel']" v-hasPermi="['system:appointmentOrder:confirmCancel']"
>取消预约</el-button >取消预约</el-button
> >
<el-button
size="mini"
type="text"
icon="el-icon-error"
v-else
disabled
v-hasPermi="['system:appointmentOrder:confirmCancel']"
>取消预约</el-button
>
<!-- <el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
@ -201,87 +174,74 @@
title="查看预约订单信息" title="查看预约订单信息"
:visible.sync="innerVisible4" :visible.sync="innerVisible4"
append-to-body append-to-body
width="1100px" width="1280px"
> >
<el-form <el-form
:inline="true" :inline="true"
ref="form" ref="form"
:model="query" :model="query"
:rules="rules" :rules="rules"
label-width="120px" label-width="130px"
class="orderInfo"
> >
<el-form-item label="订单编号" prop="orderNo"> <el-form-item label="订单编号" prop="orderNo">
<el-input <el-input v-model="query.orderNo" disabled style="width: 250px" />
v-model="query.orderNo"
:disabled="true"
style="width: 190px"
/>
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="orderStatus"> <el-form-item label="订单状态" prop="orderStatus">
<el-input <el-input
:value="switchOrderStatus(query.orderStatus)" :value="switchOrderStatus(query.orderStatus)"
style="width: 250px"
disabled disabled
style="width: 180px"
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="订单总金额" prop="totalPrice"> <el-form-item label="订单总金额" prop="totalPrice">
<el-input <el-input v-model="query.totalPrice" disabled style="width: 250px" />
v-model="query.totalPrice"
clearable
:disabled="true"
style="width: 240px"
/>
</el-form-item> </el-form-item>
<el-form-item label="订单数量" prop="orderCount"> <el-form-item label="订单数量" prop="orderCount">
<el-input <el-input v-model="query.orderCount" disabled style="width: 250px" />
v-model="query.orderCount"
clearable
:disabled="true"
style="width: 190px"
/>
</el-form-item> </el-form-item>
<el-form-item label="护理项目名称" prop="nurseItemName"> <el-form-item label="护理项目名称" prop="nurseItemName">
<el-input <el-input
v-model="query.nurseItemName" v-model="query.nurseItemName"
clearable disabled
:disabled="true" style="width: 250px"
style="width: 180px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="服务时间" prop="time"> <el-form-item label="服务时间" prop="time">
<el-input <el-input v-model="query.time" disabled style="width: 250px" />
v-model="query.time"
clearable
:disabled="true"
style="width: 240px"
/>
</el-form-item> </el-form-item>
<el-form-item label="护理项目时长" prop="itemServeDurationUnit"> <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
<el-input <el-input
v-model="query.itemServeDurationUnit" v-model="query.itemServeDurationUnit"
clearable disabled
:disabled="true" style="width: 250px"
style="width: 190px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="护理站名称" prop="nurseStationName"> <el-form-item label="护理站名称" prop="nurseStationName">
<el-input <el-input
v-model="query.nurseStationName" v-model="query.nurseStationName"
clearable disabled
:disabled="true" style="width: 250px"
style="width: 180px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="服务地址" prop="serviceAddress"> <el-form-item label="服务地址" prop="serviceAddress">
<el-input <el-input
v-model="query.serviceAddress" v-model="query.serviceAddress"
clearable disabled
:disabled="true" style="width: 250px"
style="width: 240px" />
</el-form-item>
<el-form-item label="服务到岗照片" prop="onDutyPictureUrl" v-if="query.orderStatus == 'COMPLETE'">
<img class="img" :src="baseurl + query.onDutyPictureUrl" alt="" />
</el-form-item>
<el-form-item label="服务结束照片" prop="serviceEndPictureUrl" v-if="query.orderStatus == 'COMPLETE'">
<img class="img" :src="baseurl + query.serviceEndPictureUrl" alt="" />
</el-form-item>
<el-form-item label="用户确认签名" prop="userSignaturePictureUrl" v-if="query.orderStatus == 'COMPLETE'">
<img
class="img"
:src="baseurl + query.userSignaturePictureUrl"
alt=""
/> />
</el-form-item> </el-form-item>
<el-table <el-table
@ -292,21 +252,18 @@
<el-table-column <el-table-column
prop="orderConsumableName" prop="orderConsumableName"
label="耗材包名称" label="耗材包名称"
width="200"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderConsumableCount" prop="orderConsumableCount"
label="耗材包数量" label="耗材包数量"
width="200"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderConsumablePrice" prop="orderConsumablePrice"
label="耗材包价格" label="耗材包价格"
width="200"
align="center" align="center"
> >
</el-table-column> </el-table-column>
@ -522,10 +479,12 @@ import {
appointmentOrderDetails, appointmentOrderDetails,
} from "@/api/system/order"; } from "@/api/system/order";
import { getListByUser } from "@/api/system/userlist.js"; import { getListByUser } from "@/api/system/userlist.js";
import baseurl from '@/api/baseurl.js'
export default { export default {
name: "order", name: "order",
data() { data() {
return { return {
baseurl:null,
orderStatuslist: [ orderStatuslist: [
{ {
value: "WAIT_PAY", value: "WAIT_PAY",
@ -626,6 +585,7 @@ export default {
}; };
}, },
created() { created() {
this.baseurl = baseurl
this.getList(); this.getList();
this.info(); this.info();
this.infos(); this.infos();
@ -798,9 +758,8 @@ export default {
this.total = res.total; this.total = res.total;
this.nurseStationlist = res.rows; this.nurseStationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id; this.queryParams.nurseStationId = res.rows[0].id;
this.getList() this.getList();
// this.handleQuery(); // this.handleQuery();
}); });
}, },
infos() { infos() {
@ -809,7 +768,7 @@ export default {
pageSize: 9999, pageSize: 9999,
}; };
getListByUser(queryFor).then((res) => { getListByUser(queryFor).then((res) => {
console.log(res) console.log(res);
this.handstationlist = res.rows; this.handstationlist = res.rows;
}); });
}, },
@ -854,9 +813,10 @@ export default {
</script> </script>
<style scoped> <style scoped>
::v-deep .orderInfo {
height: 350px; .img {
overflow-y: scroll; width: 250px;
height: 250px;
} }
</style> </style>

View File

@ -8,10 +8,7 @@
v-show="showSearch" v-show="showSearch"
label-width="68px" label-width="68px"
> >
<el-form-item <el-form-item label="护理站" prop="nurseStationId">
label="护理站"
prop="nurseStationId"
>
<el-select <el-select
v-model="queryParams.nurseStationId" v-model="queryParams.nurseStationId"
placeholder="请选择护理站" placeholder="请选择护理站"
@ -103,7 +100,7 @@
icon="el-icon-upload2" icon="el-icon-upload2"
size="mini" size="mini"
@click="handleImport" @click="handleImport"
v-hasPermi="['system:person:export']" v-hasPermi="['system:person:importStationPerson']"
>导入</el-button >导入</el-button
> >
</el-col> </el-col>
@ -901,7 +898,6 @@
</template> </template>
<script> <script>
import personjs from './personjs' import personjs from "./personjs";
export default personjs export default personjs;
</script> </script>

View File

@ -35,8 +35,7 @@ import {
}; };
return { return {
//男女选择 //男女选择
sexs: [ sexs: [{
{
label: "男", label: "男",
value: "MALE", value: "MALE",
}, },
@ -45,8 +44,7 @@ import {
value: "FEMALE", value: "FEMALE",
}, },
], ],
nursePersonTypes: [ nursePersonTypes: [{
{
label: "护士", label: "护士",
value: "NURSE", value: "NURSE",
}, },
@ -75,8 +73,7 @@ import {
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: { Authorization: "Bearer " + getToken() },
// 上传的地址 // 上传的地址
url: url: process.env.VUE_APP_BASE_API +
process.env.VUE_APP_BASE_API +
"/system/person/insertNurseStationPersonImportList", "/system/person/insertNurseStationPersonImportList",
}, },
// 选中数组 // 选中数组
@ -173,25 +170,21 @@ import {
{ required: true, message: "护理人职称不能为空", trigger: "blur" }, { required: true, message: "护理人职称不能为空", trigger: "blur" },
], ],
sex: [{ required: true, message: "性别不能为空", trigger: "blur" }], sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
phone: [ phone: [{
{
required: true, required: true,
validator: checkMobile2, validator: checkMobile2,
message: "", message: "",
trigger: "blur", trigger: "blur",
}, }, ],
],
address: [ address: [
{ required: true, message: "居住地址不能为空", trigger: "blur" }, { required: true, message: "居住地址不能为空", trigger: "blur" },
], ],
nurseStationPersonList: { nurseStationPersonList: {
nursePersonName: [ nursePersonName: [{
{
required: true, required: true,
message: "请选择所属护理站", message: "请选择所属护理站",
trigger: "blur", trigger: "blur",
}, }, ],
],
departmentCode: [ departmentCode: [
{ required: true, message: "所属科室不能为空", trigger: "blur" }, { required: true, message: "所属科室不能为空", trigger: "blur" },
], ],
@ -205,14 +198,12 @@ import {
{ required: true, message: "护理人职称不能为空", trigger: "blur" }, { required: true, message: "护理人职称不能为空", trigger: "blur" },
], ],
sex: [{ required: true, message: "性别不能为空", trigger: "blur" }], sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
phone: [ phone: [{
{
required: true, required: true,
validator: checkMobile, validator: checkMobile,
message: "", message: "",
trigger: "blur", trigger: "blur",
}, }, ],
],
address: [ address: [
{ required: true, message: "居住地址不能为空", trigger: "blur" }, { required: true, message: "居住地址不能为空", trigger: "blur" },
], ],
@ -277,13 +268,10 @@ import {
// 护理站名称 // 护理站名称
nurseclick(row) { nurseclick(row) {
console.log(row);
this.nursename = row.nurseStationName; this.nursename = row.nurseStationName;
this.stationid = row.id; this.stationid = row.id;
this.form.nurseStationId = row.id; this.form.nurseStationId = row.id;
this.queryParams3.nurseStationId = row.id; this.queryParams3.nurseStationId = row.id;
console.log(this.form.nurseStationId);
console.log(this.form);
this.innerVisible = false; this.innerVisible = false;
this.form.nursename = row.nurseStationName; this.form.nursename = row.nurseStationName;
this.form.nurseStationPersonList[this.index].nurseStationName = this.form.nurseStationPersonList[this.index].nurseStationName =
@ -363,8 +351,7 @@ import {
updateTime: null, updateTime: null,
nurseStationName: "请选择所属护理站", nurseStationName: "请选择所属护理站",
departmentName: "请选择所属科室", departmentName: "请选择所属科室",
nurseStationPersonList: [ nurseStationPersonList: [{
{
id: "", id: "",
nurseStationId: "", nurseStationId: "",
departmentCode: "", departmentCode: "",
@ -376,8 +363,7 @@ import {
address: "", address: "",
sex: "", sex: "",
departmentName: "请选择所属科室", departmentName: "请选择所属科室",
}, }, ],
],
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -523,8 +509,7 @@ import {
/** 下载模板操作 */ /** 下载模板操作 */
importTemplate() { importTemplate() {
this.download( this.download(
"/system/station/downloadTemplate?fileType=nurseStationPerson", "/system/station/downloadTemplate?fileType=nurseStationPerson", {},
{},
`护理站人员基本信息导入模板.xlsx` `护理站人员基本信息导入模板.xlsx`
); );
}, },
@ -542,8 +527,7 @@ import {
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
response.msg + response.msg +
"</div>", "</div>",
"导入结果", "导入结果", { dangerouslyUseHTMLString: true }
{ dangerouslyUseHTMLString: true }
); );
this.getList(); this.getList();
}, },
@ -555,8 +539,7 @@ import {
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download( this.download(
"system/person/export", "system/person/export", {
{
...this.queryParams, ...this.queryParams,
}, },
`person_${new Date().getTime()}.xlsx` `person_${new Date().getTime()}.xlsx`
@ -568,10 +551,6 @@ import {
getListByUser(this.nurseStationqueryParams).then((res) => { getListByUser(this.nurseStationqueryParams).then((res) => {
this.nursetotal = res.total; this.nursetotal = res.total;
this.nurseStationlist = res.rows; this.nurseStationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id;
this.queryParams3.nurseStationId = res.rows[0].id;
this.getList();
}); });
this.loading = false; this.loading = false;
}, },
@ -581,8 +560,10 @@ import {
pageSize: 999, pageSize: 999,
}; };
getListByUser(queryFor).then((res) => { getListByUser(queryFor).then((res) => {
console.log(res);
this.handstationlist = res.rows; this.handstationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id;
this.queryParams3.nurseStationId = res.rows[0].id;
this.getList();
}); });
}, },
}, },

View File

@ -8,14 +8,6 @@
v-show="showSearch" v-show="showSearch"
label-width="100px" label-width="100px"
> >
<el-form-item label="所属护理站" prop="nurseStationName">
<el-input
v-model="getListByUserquery.nurseStationName"
placeholder="请输入护理站"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="护理站编号" prop="nurseStationCode"> <el-form-item label="护理站编号" prop="nurseStationCode">
<el-input <el-input
v-model="getListByUserquery.nurseStationCode" v-model="getListByUserquery.nurseStationCode"
@ -24,6 +16,14 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="所属护理站" prop="nurseStationName">
<el-input
v-model="getListByUserquery.nurseStationName"
placeholder="请输入护理站"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
@ -40,7 +40,7 @@
</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 <el-button
type="primary" type="primary"
plain plain
@ -50,7 +50,7 @@
v-hasPermi="['system:station:add']" v-hasPermi="['system:station:add']"
>新增</el-button >新增</el-button
> >
</el-col> </el-col> -->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@ -71,7 +71,7 @@
icon="el-icon-upload2" icon="el-icon-upload2"
size="mini" size="mini"
@click="handledata" @click="handledata"
v-hasPermi="['system:station:importData']" v-hasPermi="['system:station:importStationInfo']"
>导入</el-button >导入</el-button
> >
</el-col> </el-col>
@ -116,7 +116,6 @@
prop="address" prop="address"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="护理站经度" align="center" prop="longitude" /> <el-table-column label="护理站经度" align="center" prop="longitude" />
<el-table-column label="护理站纬度" align="center" prop="latitude" /> <el-table-column label="护理站纬度" align="center" prop="latitude" />
<el-table-column label="联系电话" align="center" prop="phone" /> <el-table-column label="联系电话" align="center" prop="phone" />
@ -728,7 +727,7 @@ export default {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
liststationinfo() { liststationinfo() {
this.loading = true; this.loading = true;
this.info() this.info();
}, },
handleQuery() { handleQuery() {
this.loading = true; this.loading = true;
@ -758,7 +757,6 @@ export default {
}; };
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
@ -907,7 +905,7 @@ export default {
// / // /
this.nurseStationlist = res.rows; this.nurseStationlist = res.rows;
this.total2 = res.total; this.total2 = res.total;
this.loading=false this.loading = false;
}); });
}, },
infos() { infos() {
@ -916,7 +914,7 @@ export default {
pageSize: 9999, pageSize: 9999,
}; };
getListByUser(queryFor).then((res) => { getListByUser(queryFor).then((res) => {
console.log(res) console.log(res);
this.handstationlist = res.rows; this.handstationlist = res.rows;
}); });
}, },

View File

@ -8,27 +8,7 @@
v-show="showSearch" v-show="showSearch"
label-width="110px" label-width="110px"
> >
<el-form-item <el-form-item label="护理站名称" prop="">
label="护理站名称"
prop=""
v-if="nurseStationlist.find((e) => e.isAdmin == '1')"
>
<el-select
v-model="queryParams.nurseStationId"
clearable
placeholder="请选择护理站"
>
<el-option
v-for="item in handstationlist"
:key="item.id"
:label="item.nurseStationName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="护理站名称" prop="" v-else>
<el-select <el-select
v-model="queryParams.nurseStationId" v-model="queryParams.nurseStationId"
placeholder="请选择护理站" placeholder="请选择护理站"
@ -50,10 +30,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="耗材包详情" prop="consumableDetail"> <el-form-item label="耗材包名称" prop="consumableDetail">
<el-input <el-input
v-model="queryParams.consumableDetail" v-model="queryParams.consumableDetail"
placeholder="请输入服务项目耗材包详情" placeholder="请输入耗材包名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
@ -131,6 +111,7 @@
icon="el-icon-upload2" icon="el-icon-upload2"
size="mini" size="mini"
@click="handleport" @click="handleport"
v-hasPermi="['system:stationConsumable:importStationConsumable']"
>导入</el-button >导入</el-button
> >
</el-col> </el-col>
@ -158,7 +139,7 @@
prop="consumableCode" prop="consumableCode"
/> />
<el-table-column <el-table-column
label="耗材包详情" label="耗材包名称"
align="center" align="center"
prop="consumableDetail" prop="consumableDetail"
/> />
@ -234,10 +215,10 @@
{{ form.nurseStationName }} {{ form.nurseStationName }}
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item label="耗材包详情" prop="consumableDetail"> <el-form-item label="耗材包名称" prop="consumableDetail">
<el-input <el-input
v-model="form.consumableDetail" v-model="form.consumableDetail"
placeholder="请输入服务项目耗材包详情" placeholder="请输入耗材包名称"
maxlength="100" maxlength="100"
/> />
</el-form-item> </el-form-item>
@ -324,13 +305,13 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="耗材包详情" label="耗材包名称"
:rules="rules.nurseStationConsumables.consumableDetail" :rules="rules.nurseStationConsumables.consumableDetail"
:prop="`nurseStationConsumables.${index}.consumableDetail`" :prop="`nurseStationConsumables.${index}.consumableDetail`"
> >
<el-input <el-input
v-model="item.consumableDetail" v-model="item.consumableDetail"
placeholder="请输入服务项目耗材包详情" placeholder="请输入服务项目耗材包名称"
maxlength="50" maxlength="50"
/> />
</el-form-item> </el-form-item>
@ -743,7 +724,7 @@ export default {
consumableDetail: [ consumableDetail: [
{ {
required: true, required: true,
message: "请输入耗材包详情", message: "请输入耗材包名称",
trigger: "blur", trigger: "blur",
}, },
], ],
@ -772,7 +753,7 @@ export default {
consumableDetail: [ consumableDetail: [
{ {
required: true, required: true,
message: "请输入耗材包详情", message: "请输入耗材包名称",
trigger: "blur", trigger: "blur",
}, },
], ],
@ -809,7 +790,6 @@ export default {
}; };
}, },
created() { created() {
this.getList();
this.info(); this.info();
this.infos(); this.infos();
// this.listinfo(); // this.listinfo();
@ -966,28 +946,12 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
sresetQuery() { sresetQuery() {
if (this.nurseStationlist[0].isAdmin == "1") {
this.resetForm("queryForm");
this.queryParams = {
pageNum: 1,
pageSize: 10,
nurseStationId: "",
userId: null,
consumableCode: null,
consumableDetail: null,
consumableUnit: null,
consumablePrice: null,
sort: null,
};
this.handleQuery();
} else {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.queryParams.consumableCode = null; this.queryParams.consumableCode = null;
this.queryParams.consumableDetail = null; this.queryParams.consumableDetail = null;
this.queryParams.consumableUnit = null; this.queryParams.consumableUnit = null;
this.queryParams.consumablePrice = null; this.queryParams.consumablePrice = null;
this.handleQuery(); this.handleQuery();
}
}, },
// //
resetQuery() { resetQuery() {
@ -1074,8 +1038,6 @@ export default {
getListByUser(this.getListByUserquery).then((res) => { getListByUser(this.getListByUserquery).then((res) => {
this.nurseStationlist = res.rows; this.nurseStationlist = res.rows;
this.total3 = res.total; this.total3 = res.total;
this.queryParams.nurseStationId = res.rows[0].id;
this.getList();
}); });
}, },
infos() { infos() {
@ -1085,6 +1047,8 @@ export default {
}; };
getListByUser(queryFor).then((res) => { getListByUser(queryFor).then((res) => {
this.handstationlist = res.rows; this.handstationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id;
this.getList();
}); });
}, },
}, },

View File

@ -15,7 +15,6 @@
> >
<el-select <el-select
v-model="queryParams.nurseStationId" v-model="queryParams.nurseStationId"
clearable
placeholder="请选择护理站" placeholder="请选择护理站"
> >
<el-option <el-option
@ -99,6 +98,7 @@
icon="el-icon-upload2" icon="el-icon-upload2"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:stationItem:importStationItem']"
>导入</el-button >导入</el-button
> >
</el-col> </el-col>
@ -318,6 +318,7 @@
v-model="scope.row.price" v-model="scope.row.price"
placeholder="小数点后两位(元)" placeholder="小数点后两位(元)"
type="number" type="number"
min="0"
oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>6){value=value.slice(0,6)}" oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>6){value=value.slice(0,6)}"
></el-input> ></el-input>
</template> </template>
@ -381,6 +382,7 @@
<el-input <el-input
v-model="scope.row.consumableCount" v-model="scope.row.consumableCount"
placeholder="不可输入小数点" placeholder="不可输入小数点"
min="0"
oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}" oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
type="number" type="number"
></el-input> ></el-input>
@ -530,10 +532,10 @@
label-width="110px" label-width="110px"
:inline="true" :inline="true"
> >
<el-form-item label="耗材包详情" prop="nurseStationId"> <el-form-item label="耗材包名称" prop="nurseStationId">
<el-input <el-input
v-model="StationConsumablequeryParams.consumableDetail" v-model="StationConsumablequeryParams.consumableDetail"
placeholder="请输入耗材包详情" placeholder="请输入耗材包名称"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -590,7 +592,7 @@
prop="consumableCode" prop="consumableCode"
/> />
<el-table-column <el-table-column
label="服务项目耗材包详情" label="耗材包名称"
align="center" align="center"
prop="consumableDetail" prop="consumableDetail"
/> />
@ -800,7 +802,7 @@ export default {
created() { created() {
this.info(); this.info();
this.infos(); this.infos();
this.getList(); // this.getList();
}, },
methods: { methods: {
imgUrl(imgUrl) { imgUrl(imgUrl) {
@ -964,19 +966,21 @@ export default {
} }
}, },
delnurseStationItemPrices(item) { delnurseStationItemPrices(item) {
if (item.ids && !item.id) { if (item.ids && !item.nurseItemPriceId) {
if (this.form.nurseStationItemPrices.length == 1) { if (this.form.nurseStationItemPrices.length == 1) {
this.$message.error("最后一条不可删除"); this.$message.error("最后一条不可删除");
} else { } else {
this.form.nurseStationItemPrices = this.form.nurseStationItemPrices =
this.form.nurseStationItemPrices.filter((e) => e.ids != item.ids); this.form.nurseStationItemPrices.filter((e) => e.ids != item.ids);
} }
} else if (!item.ids && item.id) { } else if (!item.ids && item.nurseItemPriceId) {
if (this.form.nurseStationItemPrices.length == 1) { if (this.form.nurseStationItemPrices.length == 1) {
this.$message.error("最后一条不可删除"); this.$message.error("最后一条不可删除");
} else { } else {
this.form.nurseStationItemPrices = this.form.nurseStationItemPrices =
this.form.nurseStationItemPrices.filter((e) => e.id != item.id); this.form.nurseStationItemPrices.filter(
(e) => e.nurseItemPriceId != item.nurseItemPriceId
);
} }
} }
}, },
@ -994,19 +998,23 @@ export default {
sort: null, sort: null,
nurseStationName: "请选择所属护理站", nurseStationName: "请选择所属护理站",
}, },
nurseStationItemConsumables: [
// nurseStationItemConsumables: [],
// nurseStationItemPrices: [
// { // {
// serveDurationUnit: null, // nurseStationConsumableId: "",
// price: null, // consumableCount: "",
// description: null, // consumablePrice: "",
// ids: this.ids,
// }, // },
// ], ],
nurseStationItemPrices: [
{
serveDurationUnit: null,
price: null,
description: null,
ids: this.ids,
},
],
}; };
this.resetForm("form"); this.resetForm("form");
console.log(this.form);
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
@ -1042,6 +1050,13 @@ export default {
this.StationConsumablequeryParams.nurseStationId = null; this.StationConsumablequeryParams.nurseStationId = null;
const id = row.id || this.ids; const id = row.id || this.ids;
getNurseItem(id).then((response) => { getNurseItem(id).then((response) => {
if (response.data.nurseStationItemConsumables) {
response.data.nurseStationItemConsumables.forEach((e) => {
e.id = e.nurseStationConsumableId;
});
} else {
response.data.nurseStationItemConsumables = [];
}
this.form = response.data; this.form = response.data;
this.StationConsumablequeryParams.nurseStationId = this.StationConsumablequeryParams.nurseStationId =
response.data.nurseStationItem.nurseStationId; response.data.nurseStationItem.nurseStationId;
@ -1084,7 +1099,9 @@ export default {
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.nurseStationItem.id != null) { if (this.form.nurseStationItem.id != null) {
updateNurseItem(this.form).then((response) => { this.form.nurseStationItemPrices.forEach((e) => {
e.nurseStationItemId = this.form.nurseStationItem.id;
});
var obj = { pictureUrlList: [] }; var obj = { pictureUrlList: [] };
if (this.imgone != this.form.nurseStationItem.itemPictureUrl) { if (this.imgone != this.form.nurseStationItem.itemPictureUrl) {
obj.pictureUrlList.push(this.imgone); obj.pictureUrlList.push(this.imgone);
@ -1092,6 +1109,7 @@ export default {
if (obj.pictureUrlList.length > 0) { if (obj.pictureUrlList.length > 0) {
updatePicture(obj).then((res) => {}); updatePicture(obj).then((res) => {});
} }
updateNurseItem(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -1106,7 +1124,6 @@ export default {
} }
} }
}); });
totaln;
}, },
infos() { infos() {
var queryFor = { var queryFor = {
@ -1115,9 +1132,10 @@ export default {
}; };
getListByUser(queryFor).then((res) => { getListByUser(queryFor).then((res) => {
this.handstationlist = res.rows; this.handstationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id;
this.getList();
}); });
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
@ -1143,13 +1161,9 @@ export default {
// //
info() { info() {
//station /list //
//getListByUser //if // nurseStationlist --if
getListByUser(this.getListByUserquery).then((res) => { getListByUser(this.getListByUserquery).then((res) => {
this.total4 = res.total; this.total4 = res.total;
this.nurseStationlist = res.rows; this.nurseStationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id;
this.getList();
}); });
}, },
}, },