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

修改

Browse Source
This commit is contained in:
shidongli 2022-11-04 14:00:14 +08:00
parent a2c8b037a2
commit 348fa28843
13 changed files with 1011 additions and 509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/system/goodsInfo.js
View File

@ -70,9 +70,9 @@ export function editGoodsWhetherShelf(data) {
}) })
} }
// 删除商品基本信息 // 删除商品基本信息
export function delGoodsInfo(id) { export function delGoodsInfo(goodsInfoId) {
return request({ return request({
url: '/system/goodsInfo/' + id, url: '/system/goodsInfo/' + goodsInfoId,
method: 'delete' method: 'delete'
}) })
} }

28
src/api/system/order.js
View File

@ -24,3 +24,31 @@ export function deldetailed(appointmentOrderId) {
}) })
} }
// 派单
export function getPerson(query) {
return request({
url: '/system/appointmentOrder/getPerson',
method: 'get',
params: query
})
}
// 确认派单
export function dispatchsubmit(data) {
return request({
url: '/system/appointmentOrder/dispatch',
method: 'post',
data: data
})
}
// 确认取消订单
export function confirmCancel(data) {
return request({
url: '/system/appointmentOrder/confirmCancel',
method: 'post',
data: data
})
}

114
src/views/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container home"> <div class="app-container home">
<el-row :gutter="20"> <!-- <el-row :gutter="20">
<el-col :sm="24" :lg="12" style="padding-left: 20px"> <el-col :sm="24" :lg="12" style="padding-left: 20px">
<h2>新医路后台管理框架</h2> <h2>新医路后台管理框架</h2>
<p> <p>
@ -56,7 +56,7 @@
</el-row> </el-row>
</el-col> </el-col>
</el-row> </el-row>
<el-divider /> <el-divider /> -->
</div> </div>
</template> </template>
@ -79,65 +79,73 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.home { .home {
blockquote { // display: flex;
padding: 10px 20px; // justify-content: center;
margin: 0 0 20px; // align-items: center;
font-size: 17.5px; height: 100%;
border-left: 5px solid #eee; width: 100%;
} background-size: cover;
hr { // margin-top: 300px;
margin-top: 20px; background-image: url("../assets/images/mian.png");
margin-bottom: 20px; // blockquote {
border: 0; // padding: 10px 20px;
border-top: 1px solid #eee; // margin: 0 0 20px;
} // font-size: 17.5px;
.col-item { // border-left: 5px solid #eee;
margin-bottom: 20px; // }
} // hr {
// margin-top: 20px;
// margin-bottom: 20px;
// border: 0;
// border-top: 1px solid #eee;
// }
// .col-item {
// margin-bottom: 20px;
// }
ul { // ul {
padding: 0; // padding: 0;
margin: 0; // margin: 0;
} // }
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif; // font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px; // font-size: 13px;
color: #676a6c; // color: #676a6c;
overflow-x: hidden; // overflow-x: hidden;
ul { // ul {
list-style-type: none; // list-style-type: none;
} // }
h4 { // h4 {
margin-top: 0px; // margin-top: 0px;
} // }
h2 { // h2 {
margin-top: 10px; // margin-top: 10px;
font-size: 26px; // font-size: 26px;
font-weight: 100; // font-weight: 100;
} // }
p { // p {
margin-top: 10px; // margin-top: 10px;
b { // b {
font-weight: 700; // font-weight: 700;
} // }
} // }
.update-log { // .update-log {
ol { // ol {
display: block; // display: block;
list-style-type: decimal; // list-style-type: decimal;
margin-block-start: 1em; // margin-block-start: 1em;
margin-block-end: 1em; // margin-block-end: 1em;
margin-inline-start: 0; // margin-inline-start: 0;
margin-inline-end: 0; // margin-inline-end: 0;
padding-inline-start: 40px; // padding-inline-start: 40px;
} // }
} // }
} }
</style> </style>

2
src/views/register.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="register"> <div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form"> <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">全医通管理系统</h3> <h3 class="title">泉医到家护理站管理平台</h3>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号"> <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" /> <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

18
src/views/system/diseaseInfo/index.vue
View File

@ -75,7 +75,7 @@
> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <!-- <el-button
type="warning" type="warning"
plain plain
icon="el-icon-download" icon="el-icon-download"
@ -83,7 +83,7 @@
@click="handleExport" @click="handleExport"
v-hasPermi="['system:diseaseInfo:export']" v-hasPermi="['system:diseaseInfo:export']"
>导出</el-button >导出</el-button
> > -->
</el-col> </el-col>
<right-toolbar <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@ -98,9 +98,17 @@
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="疾病名称" align="center" prop="diseaseName" /> <el-table-column label="疾病名称" align="center" prop="diseaseName" />
<el-table-column label="疾病描述" align="center" prop="description" /> <el-table-column label="疾病编码" align="center" prop="diseaseCode" />
<el-table-column label="疾病唯一编码" align="center" prop="diseaseCode" /> <el-table-column
<el-table-column label="排序" align="center" prop="sort" /> label="创建时间"
align="center"
prop="createTime"
/>
<el-table-column
label="创建人"
align="center"
prop="createBy"
/>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"

190
src/views/system/goodsInfo/index.vue
View File

@ -8,77 +8,6 @@
v-show="showSearch" v-show="showSearch"
label-width="100px" label-width="100px"
> >
<!-- <el-form-item label="店铺表id" prop="storeInfoId">
<el-input
v-model="queryParams.storeInfoId"
placeholder="请输入店铺表id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item label="商品编码" prop="goodsCode">
<el-input
v-model="queryParams.goodsCode"
placeholder="请输入商品编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-input
v-model="queryParams.goodsPurpose"
placeholder="请输入商品用途，买卖：BUSINESS，租赁：LEASE"
clearable
@keyup.enter.native="handleQuery"
/> -->
<!-- <el-form-item label="是否上架，0：否，1：是" prop="whetherShelf">
<el-input
v-model="queryParams.whetherShelf"
placeholder="请输入是否上架，0：否，1：是"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="上架时间，yyyy-MM-dd HH:mm:ss" prop="shelfTime">
<el-date-picker clearable
v-model="queryParams.shelfTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择上架时间，yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
<el-form-item label="商品图片路径" prop="goodsPictureUrl">
<el-input
v-model="queryParams.goodsPictureUrl"
placeholder="请输入商品图片路径"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="商品概述" prop="goodsRemark">
<el-input
v-model="queryParams.goodsRemark"
placeholder="请输入商品概述"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="商品度量单位" prop="goodsUnit">
<el-input
v-model="queryParams.goodsUnit"
placeholder="请输入商品度量单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<!-- <el-form-item label="显示顺序" prop="sort">
<el-input
v-model="queryParams.sort"
placeholder="请输入显示顺序"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="商品名称" prop="goodsName"> <el-form-item label="商品名称" prop="goodsName">
<el-input <el-input
v-model="queryParams.goodsName" v-model="queryParams.goodsName"
@ -165,7 +94,7 @@
>修改</el-button >修改</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
plain plain
@ -176,7 +105,7 @@
v-hasPermi="['system:goodsInfo:remove']" v-hasPermi="['system:goodsInfo:remove']"
>删除</el-button >删除</el-button
> >
</el-col> </el-col> -->
<!-- <el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -199,6 +128,11 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column
label="所属护理站"
align="center"
prop="nurseStationName"
/>
<el-table-column label="商品编码" align="center" prop="goodsCode" /> <el-table-column label="商品编码" align="center" prop="goodsCode" />
<el-table-column <el-table-column
label="商品名称" label="商品名称"
@ -211,11 +145,7 @@
align="center" align="center"
prop="goodsCategoryName" prop="goodsCategoryName"
/> />
<el-table-column
label="护理站名称"
align="center"
prop="nurseStationName"
/>
<el-table-column label="商品用途" align="center" prop="goodsPurpose"> <el-table-column label="商品用途" align="center" prop="goodsPurpose">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.goodsPurpose == "BUSINESS" ? "买卖" : "" }} {{ scope.row.goodsPurpose == "BUSINESS" ? "买卖" : "" }}
@ -244,6 +174,17 @@
<div v-else></div> <div v-else></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
/>
<el-table-column
label="创建人"
align="center"
prop="createBy"
/>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -258,14 +199,22 @@
v-hasPermi="['system:goodsInfo:edit']" v-hasPermi="['system:goodsInfo:edit']"
>修改</el-button >修改</el-button
> >
<el-button <el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:goodsInfo:remove']"
>删除</el-button
>
<!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-search" icon="el-icon-search"
@click="reference(scope.row)" @click="reference(scope.row)"
v-hasPermi="['system:goodsInfo:remove']" v-hasPermi="['system:goodsInfo:remove']"
>查询商品信息</el-button >查询商品信息</el-button
> > -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -446,7 +395,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!-- 查看商品详情 --> <!-- 查看商品详情 -->
<el-dialog <!-- <el-dialog
:title="title" :title="title"
:visible.sync="open2" :visible.sync="open2"
width="1000px" width="1000px"
@ -501,11 +450,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-input
v-model="form.goodsCategoryName"
placeholder="请输入商品分类名称"
style="width: 210px"
/> -->
</el-form-item> </el-form-item>
<el-form-item label="商品用途" prop="goodsPurpose"> <el-form-item label="商品用途" prop="goodsPurpose">
<el-select <el-select
@ -585,19 +530,14 @@
rows="10" rows="10"
:disabled="true" :disabled="true"
></textarea> ></textarea>
<!-- <editor
:min-height="100"
style="width: 90%; margin: 0 auto"
v-model="form.goodsRemark"
:disabled="true"
></editor> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="open2 = false">确定</el-button> <el-button @click="open2 = false">确定</el-button>
</div> </div>
</el-dialog> </el-dialog> -->
</div> </div>
</template> </template>
@ -646,7 +586,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
open2: false, // open2: false,
goods: [ goods: [
{ {
value: "BUSINESS", value: "BUSINESS",
@ -905,18 +845,18 @@ export default {
this.title = "修改商品基本信息"; this.title = "修改商品基本信息";
}); });
}, },
reference(row) { // reference(row) {
getGoodsInfo(row.goodsInfoId).then((response) => { // getGoodsInfo(row.goodsInfoId).then((response) => {
response.data[0].goodsPictureUrl = // response.data[0].goodsPictureUrl =
baseurl + response.data[0].goodsPictureUrl; // baseurl + response.data[0].goodsPictureUrl;
this.form = response.data[0]; // this.form = response.data[0];
response.data[0].goodAttributeDetailsLists.forEach((e) => { // response.data[0].goodAttributeDetailsLists.forEach((e) => {
e.attributePitureUrl = baseurl + e.attributePitureUrl; // e.attributePitureUrl = baseurl + e.attributePitureUrl;
}); // });
this.goodDetailsLists = response.data[0].goodAttributeDetailsLists; // this.goodDetailsLists = response.data[0].goodAttributeDetailsLists;
this.open2 = true; // this.open2 = true;
}); // });
}, // },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
console.log(this.goodDetailsLists); console.log(this.goodDetailsLists);
@ -944,19 +884,39 @@ export default {
}); });
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; console.log('row :>> ', row);
this.$modal this.$confirm(
.confirm("是否确认删除？") '是否确认删除订单信息的数据项？',
.then(function () { "提示",
return delGoodsInfo(ids); {
}) confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(() => { .then(() => {
this.getList(); delGoodsInfo(row.goodsInfoId).then((res) => {
this.$modal.msgSuccess("删除成功"); this.$message.success("删除成功");
this.getList();
// console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
});
}) })
.catch(() => {}); .catch(() => {});
}, },
// handleDelete(row) {
// const ids = row.id || this.ids;
// this.$modal
// .confirm("是否确认删除？")
// .then(function () {
// return delGoodsInfo(ids);
// })
// .then(() => {
// this.getList();
// this.$modal.msgSuccess("删除成功");
// })
// .catch(() => {});
// },
// /** 导出按钮操作 */ // /** 导出按钮操作 */
// handleExport() { // handleExport() {
// this.download( // this.download(

592
src/views/system/goodsOrder/index.vue
View File

@ -24,7 +24,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="orderStatus"> <el-form-item label="订单状态" prop="orderStatusinfo">
<el-select <el-select
v-model="queryParams.orderStatus" v-model="queryParams.orderStatus"
placeholder="请选择订单状态" placeholder="请选择订单状态"
@ -58,17 +58,22 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="订单编号" align="center" prop="orderNo" /> <el-table-column
label="订单编号"
align="center"
prop="orderNo"
width="190"
/>
<el-table-column label="订单状态" align="center" prop="orderStatus"> <el-table-column label="订单状态" align="center" prop="orderStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button type="primary" v-if="scope.row.orderStatus=='WAIT_PAY'">待付款</el-button> --> <!-- <el-button type="primary" v-if="scope.row.orderStatus=='WAIT_PAY'" style="background-color:red;border:none">待付款</el-button> -->
{{ orderStatus(scope.row.orderStatus) }} {{ orderStatus(scope.row.orderStatus) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单总金额" align="center" prop="totalPrice" /> <el-table-column label="订单总金额" align="center" prop="totalPrice" />
<el-table-column label="收货人" align="center" prop="receiver" /> <!-- <el-table-column label="收货人" align="center" prop="receiver" />
<el-table-column label="收货地址" align="center" prop="receiveAddress" /> <el-table-column label="收货地址" align="center" prop="receiveAddress" />
<el-table-column label="联系电话" align="center" prop="phone" /> <el-table-column label="联系电话" align="center" prop="phone" /> -->
<el-table-column <el-table-column
label="下单时间" label="下单时间"
align="center" align="center"
@ -79,7 +84,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.orderChannel == "MOBILE_APP" ? "手机APP" : "" }} {{ scope.row.orderChannel == "MOBILE_APP" ? "手机APP" : "" }}
{{ scope.row.orderChannel == "WECHAT_APPLET" ? "微信小程序" : "" }} {{ scope.row.orderChannel == "WECHAT_APPLET" ? "微信小程序" : "" }}
{{ scope.row.orderChannel == "ALI_PAY_APPLET" ? "支付宝" : "" }} {{ scope.row.orderChannel == "ALI_PAY_APPLET" ? "支付宝小程序" : "" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注信息" align="center" prop="remark" /> <el-table-column label="备注信息" align="center" prop="remark" />
@ -165,9 +170,121 @@
title="查看订单信息" title="查看订单信息"
:visible.sync="innerorder" :visible.sync="innerorder"
append-to-body append-to-body
width="1048px" width="1200px"
> >
<el-table <el-form
:inline="true"
ref="orderList"
:model="orderList"
:rules="rules"
label-width="120px"
>
<el-form-item label="订单编号" prop="orderNo">
<el-input
v-model="orderList.orderNo"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="地址" prop="receiveAddress">
<el-input
v-model="orderList.receiveAddress"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="收货人" prop="receiveAddress">
<el-input
v-model="orderList.receiver"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="商品名称" prop="goodsName">
<el-input
v-model="orderList.goodsName"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="商品属性" prop="goodsAttributeName">
<el-input
v-model="orderList.goodsAttributeName"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="商品价格" prop="goodsPrice">
<el-input
v-model="orderList.goodsPrice"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="地址" prop="receiveAddress">
<el-input
v-model="orderList.receiveAddress"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input
v-model="orderList.phone"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="订单状态" prop="orderStatus">
<!-- <el-form-item label="退款类型" prop="refundType">
<el-input
:value="refundTypeStatus(refundlist.refundType)"
disabled
style="width: 205px"
/>
</el-form-item> -->
<el-input
:value="orderStatusinfo(orderList.orderStatus)"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="下单方式" prop="buySource">
<el-input
:value="buySourceinfo(orderList.buySource)"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<el-form-item label="购买来源" prop="orderChannel">
<el-input
:value="orderChannelinfo(orderList.orderChannel)"
clearable
@keyup.enter.native="handleQuery"
:disabled="true"
style="width: 240px"
/>
</el-form-item>
<!-- <el-table
:data="orderList" :data="orderList"
align="center" align="center"
style="margin: 10px 0 20px 0; padding-bottom: 20px" style="margin: 10px 0 20px 0; padding-bottom: 20px"
@ -216,7 +333,8 @@
align="center" align="center"
> >
</el-table-column> </el-table-column>
</el-table> </el-table> -->
</el-form>
</el-dialog> </el-dialog>
<!-- 查看物流信息弹框 --> <!-- 查看物流信息弹框 -->
@ -520,7 +638,7 @@ export default {
}, },
methods: { methods: {
// 退款类型 // 退款类型
// refundTypeStatus(refundlist.refundType)
refundTypeStatus(refundType) { refundTypeStatus(refundType) {
switch (refundType) { switch (refundType) {
case "REFUND_MONEY_GOODS": case "REFUND_MONEY_GOODS":
@ -531,209 +649,261 @@ export default {
break; break;
} }
}, },
/** 查询商品订单列表 */ // 订单状态
getList() { orderStatusinfo(orderStatus) {
this.loading = true; switch (orderStatus) {
listGoodsOrder(this.queryParams).then(response => { case "WAIT_PAY":
this.goodsOrderList = response.rows; return "待付款";
this.total = response.total; case "PAY":
this.loading = false; return "已付款";
}); case "CANCEL":
}, return "已取消";
// 查看商品信息 case "WAIT_RECEIVED_GOODS":
seeOrder(row) { return "待收货";
console.log(row); case "RECEIVED_GOODS":
this.innerorder = true return "已收货";
const id = row.orderNo; case "REFUNDED":
getGoodsOrderlist(id).then(res => { return "退款中";
this.orderList = [res.data] case "REFUNDED":
}) return "已退款";
}, case "WAIT_RETURNED_GOODS":
// 查看录入物流单号弹框 return "待退货";
seelogistics(id) { case "RETURNED_GOODS":
// console.log(id); return "已退货";
this.queryexpressNo.id = id default:
console.log(this.queryexpressNo) break;
this.innerlogistics = true }
},
}, // 下单方式
// 确定按钮 orderChannelinfo(orderChannel){
searchlogistics() { switch (orderChannel) {
console.log(this.queryexpressNo) case "MOBILE_APP":
editExpressNo(this.queryexpressNo).then(res => { return "手机APP";
this.queryexpressNo.expressNo = "" case "WECHAT_APPLET":
this.innerlogistics = false return "微信小程序";
console.log(res) case "ALI_PAY_APPLET":
return "支付宝小程序";
})
}, default:
// 取消按钮 break;
cencellogistics() { }
this.innerlogistics = false },
this.queryexpressNo.expressNo = "" // 购买来源
}, buySourceinfo(buySource){
// 确认退款 switch (buySource) {
refund(id) { case "NURSE_STATION":
console.log(id); return "护理站";
goodsOrderRefundinfo(id).then(res => { case "SHOPPING_MALL":
this.refundlist = res.data; return "商城";
// console.log(this.refundlist) default:
this.innerrefund = true break;
}) }
}, },
//确认退款 确定按钮 /** 查询商品订单列表 */
submitRefundOrder() { getList() {
console.log(this.refundlist) this.loading = true;
var obj = {} listGoodsOrder(this.queryParams).then(response => {
obj.orderNo = this.refundlist.goOrderNo this.goodsOrderList = response.rows;
this.total = response.total;
obj.refundPrice = this.refundlist.godTotalPrice this.loading = false;
});
weChatRefundOrderApply(obj).then(res => { },
// console.log(obj) // 查看商品信息
}) seeOrder(row) {
console.log(row);
}, const id = row.orderNo;
// refund(id){ getGoodsOrderlist(id).then(res => {
// console.log(id); this.orderList = res.data
// this.$confirm('是否确认退款?', '提示', { this.innerorder = true
// confirmButtonText: '确定', })
// cancelButtonText: '取消', },
// type: 'warning' // 查看录入物流单号弹框
// }).then(() => { seelogistics(id) {
// this.refundinfo.id=id // console.log(id);
// goodsOrderrefund(this.refundinfo).then((res) => { this.queryexpressNo.id = id
// this.$message({ console.log(this.queryexpressNo)
// type: 'success', this.innerlogistics = true
// message: '退款成功'
// }); },
// this.getList(); // 确定按钮
// }); searchlogistics() {
console.log(this.queryexpressNo)
// }).catch(() => { editExpressNo(this.queryexpressNo).then(res => {
// this.$message({ this.queryexpressNo.expressNo = ""
// type: 'info', this.innerlogistics = false
// message: '已取消退款' console.log(res)
// });
// }); })
},
// }, // 取消按钮
// 取消按钮 cencellogistics() {
cancel() { this.innerlogistics = false
this.open = false; this.queryexpressNo.expressNo = ""
this.reset(); },
}, // 确认退款
refund(id) {
//退款取消按钮 console.log(id);
refundcancel() { goodsOrderRefundinfo(id).then(res => {
this.innerrefund = false this.refundlist = res.data;
}, console.log(this.refundlist)
// 表单重置 this.innerrefund = true
reset() { })
this.form = { },
id: null, //确认退款 确定按钮
nurseStationId: null, submitRefundOrder() {
patientId: null, console.log(this.refundlist)
orderNo: null, var obj = {}
orderStatus: "0", obj.orderNo = this.refundlist.goOrderNo
totalPrice: null, obj.refundReason = this.refundlist.dictLabel
receiver: null, obj.refundPrice = this.refundlist.godTotalPrice
receiveAddress: null, obj.remark = this.refundlist.refundReasonRemark
phone: null, obj.goodsStatus = this.refundlist.orderStatus
orderTime: null, weChatRefundOrderApply(obj).then(res => {
orderChannel: null, // console.log(obj)
remark: null, this.innerrefund = false
delFlag: null, })
createBy: null,
createTime: null, },
updateBy: null, // refund(id){
updateTime: null // console.log(id);
}; // this.$confirm('是否确认退款?', '提示', {
this.resetForm("form"); // confirmButtonText: '确定',
}, // cancelButtonText: '取消',
/** 搜索按钮操作 */ // type: 'warning'
handleQuery() { // }).then(() => {
this.queryParams.pageNum = 1; // this.refundinfo.id=id
this.getList(); // goodsOrderrefund(this.refundinfo).then((res) => {
}, // this.$message({
/** 重置按钮操作 */ // type: 'success',
resetQuery() { // message: '退款成功'
this.resetForm("queryForm"); // });
this.handleQuery(); // this.getList();
// this.getList(); // });
},
// 多选框选中数据 // }).catch(() => {
handleSelectionChange(selection) { // this.$message({
this.ids = selection.map(item => item.id) // type: 'info',
this.single = selection.length !== 1 // message: '已取消退款'
this.multiple = !selection.length // });
}, // });
/** 新增按钮操作 */
handleAdd() { // },
this.reset(); // 取消按钮
this.open = true; cancel() {
this.title = "添加商品订单"; this.open = false;
}, this.reset();
/** 修改按钮操作 */ },
handleUpdate(row) {
this.reset(); //退款取消按钮
const id = row.id || this.ids refundcancel() {
getGoodsOrder(id).then(response => { this.innerrefund = false
this.form = response.data; },
this.open = true; // 表单重置
this.title = "修改商品订单"; reset() {
}); this.form = {
}, id: null,
/** 提交按钮 */ nurseStationId: null,
submitForm() { patientId: null,
this.$refs["form"].validate(valid => { orderNo: null,
if (valid) { orderStatus: "0",
if (this.form.id != null) { totalPrice: null,
updateGoodsOrder(this.form).then(response => { receiver: null,
this.$modal.msgSuccess("修改成功"); receiveAddress: null,
this.open = false; phone: null,
this.getList(); orderTime: null,
}); orderChannel: null,
} else { remark: null,
addGoodsOrder(this.form).then(response => { delFlag: null,
this.$modal.msgSuccess("新增成功"); createBy: null,
this.open = false; createTime: null,
this.getList(); updateBy: null,
}); updateTime: null
} };
} this.resetForm("form");
}); },
}, /** 搜索按钮操作 */
/** 删除按钮操作 */ handleQuery() {
handleDelete(row) { this.queryParams.pageNum = 1;
const ids = row.id || this.ids; this.getList();
this.$modal.confirm('是否确认删除商品订单编号为"' + ids + '"的数据项？').then(function () { },
return delGoodsOrder(ids); /** 重置按钮操作 */
}).then(() => { resetQuery() {
this.getList(); this.resetForm("queryForm");
this.$modal.msgSuccess("删除成功"); this.handleQuery();
}).catch(() => { }); // this.getList();
}, },
/** 导出按钮操作 */ // 多选框选中数据
handleExport() { handleSelectionChange(selection) {
this.download('system/goodsOrder/export', { this.ids = selection.map(item => item.id)
...this.queryParams this.single = selection.length !== 1
}, `goodsOrder_${new Date().getTime()}.xlsx`) this.multiple = !selection.length
}, },
orderStatus(code) { /** 新增按钮操作 */
var obj = { handleAdd() {
WAIT_PAY: '待付款', this.reset();
PAY: '已付款', this.open = true;
CANCEL: '已取消', this.title = "添加商品订单";
WAIT_RECEIVED_GOODS: '待收货', },
RECEIVED_GOODS: '已收货', /** 修改按钮操作 */
WAIT_REFUND: '退款中', handleUpdate(row) {
REFUNDED: '已退款', this.reset();
WAIT_RETURNED_GOODS: '待退货', const id = row.id || this.ids
RETURNED_GOODS: '已退货', getGoodsOrder(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改商品订单";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateGoodsOrder(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addGoodsOrder(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
} }
return obj[code]
} }
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除商品订单编号为"' + ids + '"的数据项？').then(function () {
return delGoodsOrder(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
this.download('system/goodsOrder/export', {
...this.queryParams
}, `goodsOrder_${new Date().getTime()}.xlsx`)
},
orderStatus(code) {
var obj = {
WAIT_PAY: '待付款',
PAY: '已付款',
CANCEL: '已取消',
WAIT_RECEIVED_GOODS: '待收货',
RECEIVED_GOODS: '已收货',
WAIT_REFUND: '退款中',
REFUNDED: '已退款',
WAIT_RETURNED_GOODS: '待退货',
RETURNED_GOODS: '已退货',
}
return obj[code]
}
} }
}; };
</script> </script>

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

@ -60,7 +60,7 @@
:data="OrderDetailsList" :data="OrderDetailsList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column label="客户" align="center" prop="patientName" /> <el-table-column label="会员名称" align="center" prop="patientName" />
<el-table-column label="订单编号" align="center" prop="orderNo" /> <el-table-column label="订单编号" align="center" prop="orderNo" />
<el-table-column label="订单状态" align="center" prop="orderStatus"> <el-table-column label="订单状态" align="center" prop="orderStatus">
<template slot-scope="scope"> <template slot-scope="scope">
@ -70,7 +70,7 @@
{{ scope.row.orderStatus == "COMPLETE" ? "服务完成" : "" }} {{ scope.row.orderStatus == "COMPLETE" ? "服务完成" : "" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" /> <el-table-column label="下单时间" align="center" prop="createTime" />
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -85,7 +85,22 @@
v-hasPermi="['system:nurseType:edit']" v-hasPermi="['system:nurseType:edit']"
>查看</el-button >查看</el-button
> >
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="dispatch(scope.row)"
v-hasPermi="['system:nurseType:edit']"
>派单</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="cencel(scope.row.appointmentOrderId)"
v-hasPermi="['system:nurseType:edit']"
>取消预约</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -107,12 +122,12 @@
<!-- 查看弹框 --> <!-- 查看弹框 -->
<el-dialog <el-dialog
title="查看订单信息" title="查看订单信息"
:visible.sync="innerVisible" :visible.sync="innerVisible4"
append-to-body append-to-body
width="1048px" width="1048px"
class="orderInfo"
> >
<el-form <el-form
:inline="true" :inline="true"
@ -235,6 +250,161 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<!-- 派单弹框 -->
<el-dialog
title="派单"
:visible.sync="innerdispatch"
append-to-body
width="500px"
height="100px"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="护理员姓名" prop="nursePersonName">
<el-button
type=""
v-if="nurseName == '请选择护理员'"
style="width: 200px; text-align: left; height: 36px; color: #c0c4cc"
@click="clicknursePersonName()"
>{{ nurseName }}</el-button
>
<el-button
type=""
@click="clicknursePersonName()"
v-else
style="
width: 362px;
text-align: left;
height: 36px;
padding-left: -10px;
"
>{{ nurseName }}</el-button
>
</el-form-item>
<!-- <el-button
type=""
@click="departclick(item, index)"
v-else
style="
width: 200px;
text-align: left;
height: 36px;
padding-left: -10px;
"
>{{ item.departmentName }}</el-button
> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<!-- <el-button @click="cancel">取 消</el-button> -->
</div>
</el-dialog>
<!-- 姓名弹框 -->
<el-dialog
:visible.sync="nursePersonNameinfo"
width="1000px"
append-to-body
>
<el-form
ref="queryForm"
:model="querynursePerson"
:rules="rules"
label-width="80px"
:inline="true"
>
<el-form-item label="姓名" prop="nursePersonName" label-width="120">
<el-input
v-model="querynursePerson.nursePersonName"
placeholder="请输入姓名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号" prop="phone" label-width="120">
<el-input
v-model="querynursePerson.phone"
placeholder="请输入手机号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery2"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table :data="dispatchlist">
<el-table-column label="请选择" width="70" align="center">
<template slot-scope="scope">
<el-button
type="primary"
style="width: 15px; height: 15px; overflow: hidden"
v-if="nursePersonid == scope.row.id"
circle
@click="nursePersonclick(scope.row)"
></el-button>
<el-button
v-else
style="width: 15px; height: 15px; overflow: hidden"
circle
@click="nursePersonclick(scope.row)"
></el-button>
</template>
</el-table-column>
<el-table-column
property="nursePersonCode"
label="护理员编号"
width="150"
align="center"
>
</el-table-column>
<el-table-column
property="nursePersonName"
label="会员姓名"
width="150"
align="center"
>
</el-table-column>
<el-table-column
property="nursePersonType"
label="护理站人员类型"
width="150"
align="center"
>
<template slot-scope="scope">
{{ scope.row.nursePersonType == "NURSE" ? "护士" : "" }}
{{ scope.row.nursePersonType == "NURSE_TEACHER" ? "护理师" : "" }}
</template>
</el-table-column>
<el-table-column
property="phone"
label="手机号"
width="150"
align="center"
>
</el-table-column>
<el-table-column label="性别" align="center" prop="sex">
<template slot-scope="scope">
{{ scope.row.sex == "MALE" ? "男" : "" }}
{{ scope.row.sex == "FEMALE" ? "女" : "" }}
</template>
</el-table-column>
</el-table>
<!-- <pagination
v-show="total2 > 0"
:total="total2"
:page.sync="querynursePerson.pageNum"
:limit.sync="querynursePerson.pageSize"
@pagination="handleQuery2"
/> -->
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
@ -242,6 +412,9 @@ import {
appointmentOrderDetailsList, appointmentOrderDetailsList,
Detailed, Detailed,
deldetailed, deldetailed,
getPerson,
dispatchsubmit,
confirmCancel
} from "@/api/system/order"; } from "@/api/system/order";
export default { export default {
name: "order", name: "order",
@ -268,8 +441,11 @@ export default {
value: "", value: "",
// 遮罩层 // 遮罩层
loading: true, loading: true,
innerVisible: false, innerVisible4: false,
innerVisibleA:false, // 派单弹框
innerdispatch: false,
// 姓名弹框
nursePersonNameinfo: false,
// 选中数组 // 选中数组
ids: [], ids: [],
// 非单个禁用 // 非单个禁用
@ -284,6 +460,13 @@ export default {
// 护理类型信息表格数据 // 护理类型信息表格数据
OrderDetailsList: [], OrderDetailsList: [],
OrderDetailsLists: [], OrderDetailsLists: [],
dispatchlist: [],
nurseName: "请选择护理员",
nursePersonid: "",
querynursecencel:{
appointmentOrderId:"",
},
// total2: 0,
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -298,6 +481,20 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
querynursePerson: {
nursePersonName: null,
phone: null,
pageNum: 1,
pageSize: 10,
},
querynursePersonname: {
detailsId: "",
nursePersonName: null,
nursePersonType: null,
departmentName: null,
},
query: [], query: [],
// 表单参数 // 表单参数
@ -324,6 +521,7 @@ export default {
break; break;
} }
}, },
// 查看
seeLook(row) { seeLook(row) {
this.innerVisible = true; this.innerVisible = true;
const id = row.orderNo; const id = row.orderNo;
@ -344,8 +542,78 @@ export default {
console.log(this.query); console.log(this.query);
}); });
}, },
leaflets(){
this.innerVisibleA = true; // 派单
dispatch(row) {
console.log(row)
this.querynursePersonname.detailsId = row.detailsId
console.log(this.querynursePersonname.detailsId);
// console.log(row)
this.nurseName = "请选择护理员";
this.innerdispatch = true;
},
// 姓名弹框
clicknursePersonName() {
// console.log(this.dispatchlist);
getPerson(this.querynursePersonname).then((res) => {
this.dispatchlist = res.rows;
// this.total2 = res.total;
console.log(this.dispatchlist);
this.nursePersonNameinfo = true;
});
},
// 姓名弹框确定按钮
submitForm() {
console.log(this.dispatchlist)
var obj = {}
obj.id = this.nursePersonid
obj.nurseStationPersonId = this.querynursePersonname.detailsId
dispatchsubmit(obj).then((res) => {
this.nurseName = "请选择护理员";
this.innerdispatch = false;
})
},
// 选择姓名按钮
nursePersonclick(row) {
this.nursePersonid = row.id
this.nurseName = row.nursePersonName
this.nursePersonNameinfo = false;
console.log(row)
},
// 确认取消预约
// cencel(appointmentOrderId) {
// confirmCancel(appointmentOrderId).then((res) => {
// // this.nurseName="请选择护理员";
// // this.innerdispatch = false;
// })
// console.log(appointmentOrderId)
// },
cencel(row) {
console.log('row :>> ', this.querynursecencel.appointmentOrderId);
this.querynursecencel.appointmentOrderId = row.appointmentOrderId
// obj.appointmentOrderId=row.appointmentOrderId
this.$confirm(
'是否确认取消订单',
"提示",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(() => {
confirmCancel(this.querynursecencel).then((res) => {
this.$message.success("取消成功");
this.getList();
// console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
});
})
.catch(() => { });
}, },
/** 查询护理类型信息列表 */ /** 查询护理类型信息列表 */
getList() { getList() {
@ -376,6 +644,13 @@ export default {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1;
this.getList(); this.getList();
}, },
handleQuery2() {
getPerson(this.querynursePerson).then((res) => {
this.dispatchlist = res.data;
console.log(this.dispatchlist);
this.innerdispatch = true;
});
},
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
@ -390,11 +665,15 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
// console.log('row :>> ', row); // console.log('row :>> ', row);
this.$confirm("是否确认删除订单信息的数据项？", "提示", { this.$confirm(
confirmButtonText: "确定", '是否确认删除订单信息的数据项？',
cancelButtonText: "取消", "提示",
type: "warning", {
}) confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(() => { .then(() => {
deldetailed(row.appointmentOrderId).then((res) => { deldetailed(row.appointmentOrderId).then((res) => {
this.$message.success("删除成功"); this.$message.success("删除成功");
@ -418,21 +697,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;
} } */
.clearfix:before,
.clearfix:after {
display: table;
content: "";
}
.clearfix:after {
clear: both
}
.box-card {
width: 1000px;
}
</style> </style>

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

@ -118,7 +118,7 @@
>导入</el-button >导入</el-button
> >
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
plain plain
@ -128,7 +128,7 @@
v-hasPermi="['system:person:export']" v-hasPermi="['system:person:export']"
>导出</el-button >导出</el-button
> >
</el-col> </el-col> -->
<right-toolbar <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@queryTable="getList" @queryTable="getList"
@ -141,20 +141,7 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<!-- <el-table-column label="护理站表id" align="center" prop="nurseStationId" /> -->
<!-- <el-table-column
label="所属科室编码"
align="center"
prop="departmentCode"
/> -->
<!-- <el-table-column label="创建人id" align="center" prop="userId" /> -->
<!-- <el-table-column
label="护理站人员编码"
align="center"
prop="nursePersonCode"
/> -->
<el-table-column <el-table-column
label="护理站名称" label="护理站名称"
align="center" align="center"
@ -162,7 +149,6 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="科室名称" align="center" prop="departmentName" /> <el-table-column label="科室名称" align="center" prop="departmentName" />
<el-table-column label="编码" align="center" prop="departmentCode" />
<el-table-column label="姓名" align="center" prop="nursePersonName" /> <el-table-column label="姓名" align="center" prop="nursePersonName" />
<el-table-column label="性别" align="center" prop="sex"> <el-table-column label="性别" align="center" prop="sex">
@ -171,12 +157,6 @@
{{ scope.row.sex == "FEMALE" ? "女" : "" }} {{ scope.row.sex == "FEMALE" ? "女" : "" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="护理人职称" align="center" prop="nursePersonType">
<template slot-scope="scope">
{{ scope.row.nursePersonType == "NURSE" ? "护士" : "" }}
{{ scope.row.nursePersonType == "NURSE_TEACHER" ? "护理师" : "" }}
</template>
</el-table-column>
<el-table-column label="联系电话" align="center" prop="phone" /> <el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="居住地址" align="center" prop="address" :show-overflow-tooltip="true"/> <el-table-column label="居住地址" align="center" prop="address" :show-overflow-tooltip="true"/>
@ -682,14 +662,6 @@
label-width="80px" label-width="80px"
:inline="true" :inline="true"
> >
<!-- <el-form
:model="queryParams2"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
> -->
<el-form-item label="科室编码" prop="departmentCode" label-width="120"> <el-form-item label="科室编码" prop="departmentCode" label-width="120">
<el-input <el-input
v-model="queryParams3.departmentCode" v-model="queryParams3.departmentCode"
@ -899,6 +871,7 @@
style="margin-left: -20px" style="margin-left: -20px"
> >
<el-button <el-button
disabled
type="" type=""
@click="clickinnerVisible2" @click="clickinnerVisible2"
v-if="nurseStationName == '请选择护理站名称'" v-if="nurseStationName == '请选择护理站名称'"
@ -906,6 +879,7 @@
>{{ nurseStationName }}</el-button >{{ nurseStationName }}</el-button
> >
<el-button <el-button
disabled
type="" type=""
@click="clickinnerVisible2" @click="clickinnerVisible2"
v-else v-else
@ -1671,7 +1645,7 @@ export default {
/** 导入按钮操作 */ /** 导入按钮操作 */
handleImport() { handleImport() {
this.upload.open = true; this.upload.open = true;
this.upload.title = "用户导入"; this.upload.title = "护理站人员导入";
}, },
/** 下载模板操作 */ /** 下载模板操作 */

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

@ -245,7 +245,8 @@
<el-table-column label="联系电话" align="center" prop="phone" /> <el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="负责人" align="center" prop="dutyPerson" /> <el-table-column label="负责人" align="center" prop="dutyPerson" />
<el-table-column label="负责人电话" align="center" prop="dutyPhone" /> <el-table-column label="负责人电话" align="center" prop="dutyPhone" />
<el-table-column label="排序" align="center" prop="sort" /> <el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -509,25 +510,39 @@
v-model="form.agencyIntroduce" v-model="form.agencyIntroduce"
></editor> ></editor>
</el-form-item> </el-form-item>
<el-form-item label="护理站头像" prop="stationPictureUrl" required> <el-form-item
label="护理站头像"
prop="stationPictureUrl"
required
style="margin-left: 10%"
>
<stationAcatar <stationAcatar
@imgUrl="imgUrl" @imgUrl="imgUrl"
:img="form.stationPictureUrl" :img="form.stationPictureUrl"
:type="'stationPictureUrl'" :type="'stationPictureUrl'"
/> />
</el-form-item> </el-form-item>
<el-form-item label="护理站简介头像" prop="stationIntroducePcitureUrl"> <el-form-item
label="护理站简介头像"
prop="stationIntroducePcitureUrl"
style="margin-left: 10%"
>
<stationAcatar <stationAcatar
@imgUrl="imgUrl2" @imgUrl="imgUrl2"
:img="form.stationIntroducePcitureUrl" :img="form.stationIntroducePcitureUrl"
:type="'stationIntroducePcitureUrl'" :type="'stationIntroducePcitureUrl'"
/> />
</el-form-item> </el-form-item>
<el-form-item label="护理站标签信息" required label-width="130px"> <el-form-item
label="护理站标签信息"
required
label-width="130px"
style="margin-left: 0px"
>
<el-table <el-table
ref="looknurseStationLabel" ref="looknurseStationLabel"
:data="looknurseStationLabel" :data="looknurseStationLabel"
style="margin-top: 20px" style="margin-top: 50px"
> >
<el-table-column label="标签名称" width="190" align="center"> <el-table-column label="标签名称" width="190" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -559,7 +574,7 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@click="delnurseStationLabelList(scope.row)" @click="delnurseStationLabelList(scope.$index,scope.row)"
>删除</el-button >删除</el-button
> >
</template> </template>
@ -729,7 +744,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
typeopen: false, typeopen: false,
nurseStationLabelopen: false, // nurseStationLabelopen: false,
//权限查询 //权限查询
getListByUserquery: { getListByUserquery: {
pageNum: 1, pageNum: 1,
@ -831,25 +846,52 @@ export default {
console.log(imgUrl); console.log(imgUrl);
this.form.stationIntroducePcitureUrl = imgUrl; this.form.stationIntroducePcitureUrl = imgUrl;
}, },
delnurseStationLabelList(item) { delnurseStationLabelList(index,item) {
console.log(item); console.log(index,item);
if (item.ids && !item.id) { console.log()
if (this.looknurseStationLabel.length == 1) { // this.looknurseStationLabel.splice(index,1)
this.$message.error("最后一条不可删除"); if(this.looknurseStationLabel.length===1){
} else { this.looknurseStationLabel = [
this.looknurseStationLabel = this.looknurseStationLabel.filter( {
(e) => e.ids != item.ids labelDescription: "",
); sort: "",
} ids: 1,
} else if (!item.ids && item.id) { },
if (this.looknurseStationLabel.length == 1) { ];
this.$message.error("最后一条不可删除"); }else{
} else { this.looknurseStationLabel.splice(index,1)
this.looknurseStationLabel = this.looknurseStationLabel.filter(
(e) => e.id != item.id
);
}
} }
// if (item.ids && !item.id) {
// if (this.looknurseStationLabel.length == 1) {
// // this.$message.error("最后一条不可删除");
// this.looknurseStationLabel = [
// {
// labelDescription: "",
// sort: "",
// ids: 1,
// },
// ];
// } else {
// this.looknurseStationLabel = this.looknurseStationLabel.filter(
// (e) => e.ids != item.ids
// );
// }
// } else if (!item.ids && item.id) {
// if (this.looknurseStationLabel.length == 1) {
// // this.$message.error("最后一条不可删除");
// this.nurseStationLabelList = [
// {
// labelDescription: "",
// sort: "",
// ids: 1,
// },
// ];
// } else {
// this.looknurseStationLabel = this.looknurseStationLabel.filter(
// (e) => e.id != item.id
// );
// }
// }
console.log(this.form.nurseStationLabelList); console.log(this.form.nurseStationLabelList);
}, },
addnurseStationLabelList() { addnurseStationLabelList() {
@ -867,14 +909,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);
@ -967,6 +1009,22 @@ export default {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
liststationinfo() { liststationinfo() {
listStation(this.queryParams).then((response) => { listStation(this.queryParams).then((response) => {
response.rows.forEach((e) => {
if (e.sysAreaVOList == []) {
} else if (e.sysAreaVOList == null) {
} else if (!e.sysAreaVOList) {
} else if (e.sysAreaVOList.length == 0) {
} else if (e.sysAreaVOList.length > 0) {
e.area =
e.sysAreaVOList[0].provinceName +
"-" +
e.sysAreaVOList[0].cityName +
"-" +
e.sysAreaVOList[0].regionName +
"-" +
e.sysAreaVOList[0].streetName;
}
});
this.stationList = response.rows; this.stationList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;

39
src/views/system/stationConsumable/index.vue
View File

@ -171,7 +171,7 @@
prop="consumableCode" prop="consumableCode"
/> />
<el-table-column <el-table-column
label="服务项目耗材包详情" label="耗材包详情"
align="center" align="center"
prop="consumableDetail" prop="consumableDetail"
/> />
@ -185,7 +185,9 @@
align="center" align="center"
prop="consumablePrice" prop="consumablePrice"
/> />
<el-table-column label="排序" align="center" prop="sort" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -230,6 +232,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="所属护理站" prop="nurseStationId"> <el-form-item label="所属护理站" prop="nurseStationId">
<el-button <el-button
disabled
style="width: 360px; text-align: left; height: 36px; color: #c0c4cc" style="width: 360px; text-align: left; height: 36px; color: #c0c4cc"
@click="open3 = true" @click="open3 = true"
v-if="form.nurseStationName == '请选择所属护理站'" v-if="form.nurseStationName == '请选择所属护理站'"
@ -237,6 +240,7 @@
{{ form.nurseStationName }} {{ form.nurseStationName }}
</el-button> </el-button>
<el-button <el-button
disabled
style="width: 360px; text-align: left; height: 36px" style="width: 360px; text-align: left; height: 36px"
@click="open3 = true" @click="open3 = true"
> >
@ -319,7 +323,12 @@
{{ item.nurseStationName }} {{ item.nurseStationName }}
</el-button> </el-button>
<el-button <el-button
style="width: 208px; text-align: left; height: 36px;overflow: hidden;" style="
width: 208px;
text-align: left;
height: 36px;
overflow: hidden;
"
@click="choicenurseStation(item, index)" @click="choicenurseStation(item, index)"
v-else v-else
> >
@ -334,7 +343,7 @@
<el-input <el-input
v-model="item.consumableDetail" v-model="item.consumableDetail"
placeholder="请输入服务项目耗材包详情" placeholder="请输入服务项目耗材包详情"
maxlength="50" maxlength="50"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -526,7 +535,12 @@
<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" />
<el-table-column label="护理站地址" align="center" prop="address" :show-overflow-tooltip="true"/> <el-table-column
label="护理站地址"
align="center"
prop="address"
:show-overflow-tooltip="true"
/>
<el-table-column label="负责人" align="center" prop="dutyPerson" /> <el-table-column label="负责人" align="center" prop="dutyPerson" />
<el-table-column label="负责人电话" align="center" prop="dutyPhone" /> <el-table-column label="负责人电话" align="center" prop="dutyPhone" />
</el-table> </el-table>
@ -625,7 +639,12 @@
<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" />
<el-table-column label="护理站地址" align="center" prop="address" :show-overflow-tooltip="true"/> <el-table-column
label="护理站地址"
align="center"
prop="address"
:show-overflow-tooltip="true"
/>
<el-table-column label="负责人" align="center" prop="dutyPerson" /> <el-table-column label="负责人" align="center" prop="dutyPerson" />
<el-table-column label="负责人电话" align="center" prop="dutyPhone" /> <el-table-column label="负责人电话" align="center" prop="dutyPhone" />
</el-table> </el-table>
@ -873,8 +892,8 @@ export default {
this.$refs.upload.clearFiles(); this.$refs.upload.clearFiles();
this.$alert( this.$alert(
"<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 }
); );
@ -1105,7 +1124,7 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}) })
.catch(() => {}); .catch(() => { });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -1119,7 +1138,7 @@ export default {
}, },
/** 导入按钮操作 */ /** 导入按钮操作 */
handleport() { handleport() {
this.upload.title = "用户导入"; this.upload.title = "护理站耗材导入";
this.upload.open = true; this.upload.open = true;
}, },

19
src/views/system/stationItem/index.vue
View File

@ -194,17 +194,28 @@
align="center" align="center"
prop="nurseItemName" prop="nurseItemName"
/> />
<el-table-column <!-- <el-table-column
label="护理项目内容简介" label="护理项目内容简介"
align="center" align="center"
prop="nurseItemContent" prop="nurseItemContent"
/> /> -->
<el-table-column <el-table-column
label="提前预约时长(h)" label="提前预约时长(h)"
align="center" align="center"
prop="advanceAppointDuration" prop="advanceAppointDuration"
/> />
<el-table-column label="排序" align="center" prop="sort" /> <el-table-column
label="创建时间"
align="center"
prop="createTime"
/>
<el-table-column
label="创建人"
align="center"
prop="createBy"
/>
<!-- <el-table-column label="排序" align="center" prop="sort" /> -->
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
@ -427,7 +438,7 @@
size="small" size="small"
plain plain
@click="listStationConsumableinfo" @click="listStationConsumableinfo"
>点击添加护理项目耗材</el-button >添加护理项目耗材</el-button
> >
<el-table <el-table
ref="singleTable" ref="singleTable"

2
vue.config.js
View File

@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin') const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || '全医通护理站管理平台' // 网页标题 const name = process.env.VUE_APP_TITLE || '泉医到家护理站管理平台' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口