diff --git a/.env.development b/.env.development
index b88adc2..5b271b6 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
# 页面标题
-VUE_APP_TITLE = 全医通护理站管理平台
+VUE_APP_TITLE = 泉医到家运营管理平台
# 开发环境配置
ENV = 'development'
-# 全医通护理站管理平台/开发环境
+# 泉医到家运营管理平台/开发环境
# VUE_APP_BASE_API = '/dev-api'
VUE_APP_BASE_API = 'http://192.168.16.30:8080'
diff --git a/.env.production b/.env.production
index efbafa1..6e694c4 100644
--- a/.env.production
+++ b/.env.production
@@ -1,8 +1,8 @@
# 页面标题
-VUE_APP_TITLE = 全医通护理站管理平台
+VUE_APP_TITLE = 泉医到家运营管理平台
# 生产环境配置
ENV = 'production'
-# 全医通护理站管理平台/生产环境
+# 泉医到家运营管理平台/生产环境
VUE_APP_BASE_API = '/prod-api'
diff --git a/.env.staging b/.env.staging
index af99706..ce50471 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,10 @@
# 页面标题
-VUE_APP_TITLE = 全医通护理站管理平台
+VUE_APP_TITLE = 泉医到家运营管理平台
NODE_ENV = production
# 测试环境配置
ENV = 'staging'
-# 全医通护理站管理平台/测试环境
+# 泉医到家运营管理平台/测试环境
VUE_APP_BASE_API = '/stage-api'
diff --git a/public/favicon.ico b/public/favicon.ico
index e263760..b48860d 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/api/baseurl.js b/src/api/baseurl.js
index 6dfdae9..c4f3e01 100644
--- a/src/api/baseurl.js
+++ b/src/api/baseurl.js
@@ -1,3 +1,3 @@
-var baseurl = "http://192.168.16.49:8080";
+var baseurl = "http://192.168.16.76:8080";
-export default baseurl
+export default baseurl
\ No newline at end of file
diff --git a/src/api/system/OperateGoodsInfo.js b/src/api/system/OperateGoodsInfo.js
new file mode 100644
index 0000000..9585cec
--- /dev/null
+++ b/src/api/system/OperateGoodsInfo.js
@@ -0,0 +1,76 @@
+import request from '@/utils/request'
+
+// 查询商品基本信息列表
+export function goodsInfoList(query) {
+ return request({
+ url: '/system/operateGoodInfo/goodsInfoList',
+ method: 'get',
+ params: query
+ })
+}
+//所属护理站
+export function stationList(query) {
+ return request({
+ url: '/system/station/list',
+ method: 'get',
+ params: query
+ })
+}
+// 查询商品基本信息详细
+export function getGoodsInfo(id) {
+ return request({
+ url: `/system/operateGoodInfo/goodsDetails?` + `goodsInfoId=${id}`,
+ method: 'get'
+ })
+}
+//取消
+export function updatePicture(data) {
+ return request({
+ url: '/system/patientArchives/updatePicture',
+ method: 'post',
+ data: data
+ })
+}
+
+// 新增商品基本信息
+export function addGoodsInfo(data) {
+ return request({
+ url: '/system/operateGoodInfo/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 查询商品分类列表
+export function goodsCategory(query) {
+ return request({
+ url: '/system/goodsCategory/list ',
+ method: 'get',
+ params: query
+ })
+}
+// 修改商品基本信息
+export function updateGoodsInfo(data) {
+ return request({
+ url: '/system/operateGoodInfo/edit',
+ method: 'POST',
+ data: data
+ })
+}
+// 修改上架下架状态
+// system/goodsInfo/editGoodsWhetherShelf
+export function editGoodsWhetherShelf(data) {
+ return request({
+ url: '/system/operateGoodInfo/editGoodsWhetherShelf',
+ method: 'post',
+ data: data
+
+ })
+}
+// 删除商品基本信息
+export function delGoodsInfo(goodsInfoId) {
+ return request({
+ url: '/system/operateGoodInfo/' + goodsInfoId,
+ method: 'delete'
+ })
+}
diff --git a/src/api/system/goodsCategory.js b/src/api/system/goodsCategory.js
new file mode 100644
index 0000000..e32248e
--- /dev/null
+++ b/src/api/system/goodsCategory.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询商品分类信息列表
+export function listGoodsCategory(query) {
+ return request({
+ url: '/system/goodsCategory/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询商品分类信息详细
+export function getGoodsCategory(id) {
+ return request({
+ url: '/system/goodsCategory/' + id,
+ method: 'get'
+ })
+}
+//取消
+export function updatePicture(data) {
+ return request({
+ url: '/system/patientArchives/updatePicture',
+ method: 'post',
+ data: data
+ })
+}
+
+// 新增商品分类信息
+export function addGoodsCategory(data) {
+ return request({
+ url: '/system/goodsCategory/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改商品分类信息
+export function updateGoodsCategory(data) {
+ return request({
+ url: '/system/goodsCategory/edit',
+ method: 'POST',
+ data: data
+ })
+}
+
+// 删除商品分类信息
+export function delGoodsCategory(id) {
+ return request({
+ url: '/system/goodsCategory/' + id,
+ method: 'POST'
+ })
+}
\ No newline at end of file
diff --git a/src/api/system/goodsInfo.js b/src/api/system/goodsInfo.js
index 8ebd782..8e823a2 100644
--- a/src/api/system/goodsInfo.js
+++ b/src/api/system/goodsInfo.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询商品基本信息列表
export function listGoodsInfo(query) {
return request({
- url: '/system/goodsInfo/list',
+ url: '/system/goodsCategory/getStationCategoryList',
method: 'get',
params: query
})
@@ -46,7 +46,7 @@ export function listStation(query) {
// 查询商品分类列表
export function goodsCategory(query) {
return request({
- url: '/system/goodsCategory/list ',
+ url: '/system/goodsCategory/getStationCategoryList ',
method: 'get',
params: query
})
@@ -76,3 +76,12 @@ export function delGoodsInfo(goodsInfoId) {
method: 'delete'
})
}
+//取消
+export function updatePicture(data) {
+ return request({
+ url: '/system/patientArchives/updatePicture',
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/src/api/system/goodsOrder.js b/src/api/system/goodsOrder.js
index 17ab35b..cd126aa 100644
--- a/src/api/system/goodsOrder.js
+++ b/src/api/system/goodsOrder.js
@@ -19,14 +19,14 @@ export function getGoodsOrder(id) {
// 查看商品详细信息
export function getGoodsOrderlist(id) {
return request({
- url: `/system/goodsOrder/goodsOrderByOrder`+`?orderNo=${id}`,
+ url: `/system/goodsOrder/goodsOrderByOrder` + `?orderNo=${id}`,
method: 'get'
})
}
// 退款
export function goodsOrderRefundinfo(id) {
return request({
- url: `/system/goodsOrder/goodsOrderRefund`+`?goodsOrderId=${id}`,
+ url: `/system/goodsOrder/goodsOrderRefund` + `?goodsOrderId=${id}`,
method: 'get',
})
}
@@ -41,7 +41,6 @@ export function editExpressNo(data) {
}
// 退款确定按钮
-
export function weChatRefundOrderApply(data) {
return request({
url: '/nurseApp/weChatPayment/weChatRefundOrderApply',
@@ -74,4 +73,4 @@ export function delGoodsOrder(id) {
url: '/system/goodsOrder/' + id,
method: 'delete'
})
-}
+}
\ No newline at end of file
diff --git a/src/api/system/nurseItem.js b/src/api/system/nurseItem.js
index 384f02e..49ad1da 100644
--- a/src/api/system/nurseItem.js
+++ b/src/api/system/nurseItem.js
@@ -59,4 +59,12 @@ export function delNurseItem(id) {
url: '/system/stationItem/' + id,
method: 'delete'
})
-}
\ No newline at end of file
+}
+// 删除图片
+export function updatePicture(data) {
+ return request({
+ url: '/system/patientArchives/updatePicture',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/api/system/order.js b/src/api/system/order.js
index 15a3e99..ff75b7f 100644
--- a/src/api/system/order.js
+++ b/src/api/system/order.js
@@ -11,15 +11,33 @@ export function appointmentOrderDetailsList(query) {
export function Detailed(id) {
return request({
- url: `/system/appointmentOrderDetails/Detailed`+`?orderNo=${id}`,
+ url: `/system/appointmentOrderDetails/getCancelOrderInfo` + `?orderNo=${id}`,
method: 'get',
})
}
+
+export function appointmentOrderDetails(id) {
+ return request({
+ url: `/system/appointmentOrderDetails/Detailed` + `?orderNo=${id}`,
+ method: 'get',
+
+ })
+}
+
+// 确定按钮
+export function xylWeChatRefundNotify(data) {
+ return request({
+
+ url: '/nurseApp/weChatPayment/weChatRefundOrderApply',
+ method: 'post',
+ data: data
+ })
+}
//删除
export function deldetailed(appointmentOrderId) {
return request({
- url: '/system/appointmentOrder/'+appointmentOrderId,
+ url: '/system/appointmentOrder/' + appointmentOrderId,
method: 'post',
})
@@ -45,10 +63,9 @@ export function dispatchsubmit(data) {
// 确认取消订单
-export function confirmCancel(data) {
+export function confirmCancel(appointmentOrderId) {
return request({
- url: '/system/appointmentOrder/confirmCancel',
- method: 'post',
- data: data
+ url: `/system/appointmentOrder/confirmCancel?appointmentOrderId=${appointmentOrderId}`,
+ method: 'post'
})
}
diff --git a/src/api/system/patientArchives.js b/src/api/system/patientArchives.js
index f984aa4..56a1dec 100644
--- a/src/api/system/patientArchives.js
+++ b/src/api/system/patientArchives.js
@@ -63,3 +63,11 @@ export function delPatientArchives(id) {
method: 'delete'
})
}
+// 重置密码
+export function updatePassword(params) {
+ return request({
+ url: '/system/patientArchives/updatePassword',
+ method: 'post',
+ params: params
+ })
+}
diff --git a/src/api/system/station.js b/src/api/system/station.js
index e881784..418a9ec 100644
--- a/src/api/system/station.js
+++ b/src/api/system/station.js
@@ -95,4 +95,12 @@ export function getLabelList(id) {
url: `/system/nurseStationlabel/getLabelList?nurseStationId=${id}`,
method: 'get'
})
-}
\ No newline at end of file
+}
+//取消
+export function updatePicture(data) {
+ return request({
+ url: '/system/patientArchives/updatePicture',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/assets/images/bg2.png b/src/assets/images/bg2.png
new file mode 100644
index 0000000..1875913
Binary files /dev/null and b/src/assets/images/bg2.png differ
diff --git a/src/assets/images/bg3.png b/src/assets/images/bg3.png
new file mode 100644
index 0000000..098718c
Binary files /dev/null and b/src/assets/images/bg3.png differ
diff --git a/src/assets/images/body.png b/src/assets/images/body.png
new file mode 100644
index 0000000..87b323e
Binary files /dev/null and b/src/assets/images/body.png differ
diff --git a/src/assets/logo/lg.png b/src/assets/logo/lg.png
new file mode 100644
index 0000000..b48860d
Binary files /dev/null and b/src/assets/logo/lg.png differ
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 46e0b3b..012267a 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -14,7 +14,7 @@
-
+
diff --git a/src/views/system/StationDepartment/index.vue b/src/views/system/StationDepartment/index.vue
index f45476b..47393f3 100644
--- a/src/views/system/StationDepartment/index.vue
+++ b/src/views/system/StationDepartment/index.vue
@@ -8,8 +8,11 @@
v-show="showSearch"
label-width="68px"
>
-
+
-
+
-
-
-
-
-
+
+
@@ -218,7 +190,34 @@
:rules="rules.nurseStationDepartmentList.nurseStationId"
:prop="`nurseStationDepartmentList.${index}.nurseStationId`"
>
- {{ item.nurseStationName }}
+
+ {{ item.nurseStationName }}
+
-
-
-
-
-
+
-
-
-
+ />
+
@@ -350,6 +334,107 @@
取 消
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/goodsInfo/index.vue b/src/views/system/goodsInfo/index.vue
index 482c0e3..7d077fa 100644
--- a/src/views/system/goodsInfo/index.vue
+++ b/src/views/system/goodsInfo/index.vue
@@ -8,6 +8,21 @@
v-show="showSearch"
label-width="100px"
>
+
+
+
+
+
+
-
-
-
+
-
+
修改
-
-
+
-
-
-
+
+
修改
- 删除
-
@@ -236,32 +206,27 @@
ref="form"
:model="form"
:rules="rules"
- label-width="100px"
+ label-width="120px"
:inline="true"
>
-
-
-
-
-
+
+
+
-
@@ -339,16 +300,17 @@
@@ -395,173 +357,132 @@
取 消
-
+
diff --git a/src/views/system/goodsOrder/index.vue b/src/views/system/goodsOrder/index.vue
index 7dc884f..18613a4 100644
--- a/src/views/system/goodsOrder/index.vue
+++ b/src/views/system/goodsOrder/index.vue
@@ -6,8 +6,23 @@
size="small"
:inline="true"
v-show="showSearch"
- label-width="68px"
+ label-width="90px"
>
+
+
+
+
+
+
-
-
-
-
+
+
重置
+ 刷新商品订单
@@ -58,22 +69,67 @@
@selection-change="handleSelectionChange"
>
+
-
+
+
+
+
-
- {{ orderStatus(scope.row.orderStatus) }}
+
+ 待付款
+ 已付款
+ 已取消
+ 待收货
+ 已收货
+ 退款中
+ 待退货
+ 退款成功
+ 已退货
-
-
+
+
+ 修改物流单号
+ 录入物流单号
+ 录入物流单号
+ 不可录入物流单号
+
+
查看商品信息订单详情
- 录入物流单号
-
+
确认退款
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
- 确认
- 取消
-
+
@@ -416,60 +503,29 @@
v-model="refundlist.dictLabel"
placeholder=""
clearable
- @keyup.enter.native="handleQuery"
disabled
/>
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
搜索
- 重置
-
+
@@ -368,7 +469,7 @@
@@ -398,13 +499,13 @@
-
+ />
@@ -415,8 +516,10 @@ import {
deldetailed,
getPerson,
dispatchsubmit,
- confirmCancel
+ xylWeChatRefundNotify,
+ appointmentOrderDetails,
} from "@/api/system/order";
+import { getListByUser } from "@/api/system/userlist.js";
export default {
name: "order",
data() {
@@ -426,23 +529,42 @@ export default {
value: "WAIT_PAY",
label: "待付款",
},
+ {
+ value: "PAY",
+ label: "已付款",
+ },
+ {
+ value: "CANCEL",
+ label: "已取消",
+ },
{
value: "WAIT_DISPATCH",
label: "待派单",
},
{
- value: "NOT_FINISH",
- label: "未完成",
+ value: "REFUNDED",
+ label: "已退款",
+ },
+
+ {
+ value: "WAIT_REFUND",
+ label: "退款中",
},
{
value: "COMPLETE",
label: "服务完成",
},
+
+ {
+ value: "NOT_FINISH",
+ label: "未完成",
+ },
],
value: "",
// 遮罩层
loading: true,
innerVisible4: false,
+ innerrefund: false,
// 派单弹框
innerdispatch: false,
// 姓名弹框
@@ -460,14 +582,16 @@ export default {
total: 0,
// 护理类型信息表格数据
OrderDetailsList: [],
- OrderDetailsLists: [],
dispatchlist: [],
nurseName: "请选择护理员",
nursePersonid: "",
- querynursecencel:{
- appointmentOrderId:"",
- },
- // total2: 0,
+ // querynursecencel:{
+ // appointmentOrderId:"",
+ // },
+ appointmentOrderId: "",
+ nurseStationPersonId: "",
+ total2: 0,
+ nurseStationlist: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -477,27 +601,21 @@ export default {
queryParams: {
patientName: null,
orderNo: null,
+ nurseStationId: null,
// orderStatus: null,
orderStatus: "",
pageNum: 1,
pageSize: 10,
},
- querynursePerson: {
- nursePersonName: null,
- phone: null,
- pageNum: 1,
- pageSize: 10,
- },
querynursePersonname: {
- detailsId: "",
+ orderNo: "",
nursePersonName: null,
nursePersonType: null,
departmentName: null,
-
+ pageNum: 1,
+ pageSize: 10,
},
-
query: [],
-
// 表单参数
form: {},
// 表单校验
@@ -506,8 +624,29 @@ export default {
},
created() {
this.getList();
+ this.info();
},
methods: {
+ //取消预约确定按钮
+ ordercacenl() {
+ var obj = {
+ orderNo: this.query.orderNo,
+ refundPrice: this.query.totalPrice,
+ refundReason: this.query.cancelAppointmentReason,
+ };
+ xylWeChatRefundNotify(obj).then((res) => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("退款有延迟，请耐心等待");
+ }
+ this.getList();
+ this.innerrefund = false;
+ console.log(res);
+ });
+ },
+ // 取消按钮
+ cencelbtn() {
+ this.innerrefund = false;
+ },
switchOrderStatus(orderStatus) {
switch (orderStatus) {
case "WAIT_PAY":
@@ -518,103 +657,77 @@ export default {
return "未完成";
case "COMPLETE":
return "服务完成";
+ case "PAY":
+ return "已付款";
+ case "WAIT_REFUND":
+ return "退款中";
+ case "CANCEL":
+ return "已取消";
+ case "REFUNDED":
+ return "已退款";
default:
break;
}
},
// 查看
seeLook(row) {
- this.innerVisible4 = true;
const id = row.orderNo;
- // console.log(row);
- Detailed(id).then((res) => {
+ appointmentOrderDetails(id).then((res) => {
res.data.forEach((e) => {
if (e.serviceDate) {
e.time =
- e.serviceDate +
- "-" +
- e.serviceStartTime +
- "-" +
- e.serviceEndTime
+ e.serviceDate + "-" + e.serviceStartTime + "-" + e.serviceEndTime;
}
- } );
- this.OrderDetailsLists = res.data;
- this.query = res.data;
+ });
+ this.query = res.data[0];
+ this.innerVisible4 = true;
console.log(this.query);
});
},
-
// 派单
dispatch(row) {
- console.log(row)
- this.querynursePersonname.detailsId = row.detailsId
- console.log(this.querynursePersonname.detailsId);
- // console.log(row)
+ console.log(row);
+ this.querynursePersonname.orderNo = row.orderNo;
this.nurseName = "请选择护理员";
this.innerdispatch = true;
+ this.nursePersonid = "";
},
// 姓名弹框
clicknursePersonName() {
- // console.log(this.dispatchlist);
getPerson(this.querynursePersonname).then((res) => {
this.dispatchlist = res.rows;
- // this.total2 = res.total;
- console.log(this.dispatchlist);
+ this.total2 = res.total;
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 = "请选择护理员";
+ let params = {
+ nurseStationPersonId: this.nursePersonid,
+ orderNo: this.querynursePersonname.orderNo,
+ };
+ dispatchsubmit(params).then((res) => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("派单成功");
+ }
this.innerdispatch = false;
-
- })
+ this.getList();
+ this.nurseName = "请选择护理员";
+ });
},
// 选择姓名按钮
nursePersonclick(row) {
- this.nursePersonid = row.id
- this.nurseName = row.nursePersonName
+ this.nursePersonid = row.nurseStationPersonId;
+ this.nurseName = row.nursePersonName;
this.nursePersonNameinfo = false;
- console.log(row)
-
+ 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(() => { });
+ Detailed(row.orderNo).then((res) => {
+ this.query = res.data;
+ this.innerrefund = true;
+ });
},
/** 查询护理类型信息列表 */
getList() {
@@ -646,17 +759,63 @@ export default {
this.getList();
},
handleQuery2() {
- getPerson(this.querynursePerson).then((res) => {
- this.dispatchlist = res.data;
- console.log(this.dispatchlist);
- this.innerdispatch = true;
+ getPerson(this.querynursePersonname).then((res) => {
+ this.dispatchlist = res.rows;
+ console.log(this.querynursePersonname);
+ // this.innerdispatch = true;
});
},
/** 重置按钮操作 */
resetQuery() {
- this.resetForm("queryForm");
+ if (this.nurseStationlist[0].isAdmin == "1") {
+ this.resetForm("queryForm");
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ };
+ } else {
+ this.queryParams.pageNum = 1;
+ this.queryParams.pageSize = 10;
+ this.queryParams.orderNo = null
+ this.queryParams.orderStatus = null
+ this.queryParams.patientName=null
+ }
this.handleQuery();
},
+ //权限列表
+ info() {
+ getListByUser(this.queryParams).then((res) => {
+ if (res.rows[0].isAdmin == "1") {
+ this.nurseStationlist = res.rows;
+ this.total = res.total;
+ } else {
+ this.total = res.total;
+ this.nurseStationlist = res.rows;
+ this.queryParams.nurseStationId = res.rows[0].id;
+ this.handleQuery();
+ }
+ });
+ },
+ //滑动下拉框
+ loadMore() {
+ var a = Math.ceil(this.total / 10);
+ if (this.nurseStationlist.length + 1 >= this.total) {
+ } else {
+ if (this.queryParams.pageNum >= a) {
+ } else {
+ this.queryParams.pageNum++;
+ getListByUser(this.queryParams).then((res) => {
+ res.rows.forEach((e) => {
+ this.nurseStationlist.push(e);
+ });
+ });
+ }
+ }
+ },
+ resetQuery2() {
+ this.resetForm("queryForm");
+ this.handleQuery2();
+ },
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
@@ -666,20 +825,15 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
// console.log('row :>> ', row);
- this.$confirm(
- '是否确认删除订单信息的数据项？',
- "提示",
- {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }
- )
+ this.$confirm("是否确认删除订单信息的数据项？", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
.then(() => {
deldetailed(row.appointmentOrderId).then((res) => {
this.$message.success("删除成功");
this.getList();
- // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
});
})
.catch(() => {});
@@ -697,9 +851,11 @@ export default {
},
};
+
+
diff --git a/src/views/system/patientArchives/index.vue b/src/views/system/patientArchives/index.vue
index 139e803..5162d49 100644
--- a/src/views/system/patientArchives/index.vue
+++ b/src/views/system/patientArchives/index.vue
@@ -71,18 +71,18 @@
-
+
+
@@ -158,18 +158,18 @@
@selection-change="handleSelectionChange"
>
-
+
-
+ /> -->
@@ -197,6 +197,14 @@
v-hasPermi="['system:patientArchives:remove']"
>删除
+ 重置密码
@@ -223,20 +231,16 @@
label-width="110px"
:inline="true"
>
-
+
-
+
-
-
-
-
-
-
+
- ![]()
+ ![]()
-
-
-
@@ -457,8 +436,8 @@
>
-
-
+
+
-
-
- {{
- scope.row.nurseStationType == "LX202209140018" ? "生活护理" : ""
- }}
- {{
- scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
- }}
-
-
-
+
@@ -535,32 +492,24 @@
:visible.sync="innerVisiblexg"
width="1000px"
append-to-body
+ :before-close="addcancel"
>
-
@@ -580,16 +528,16 @@
type="primary"
icon="el-icon-search"
size="mini"
- @click="handleQuery2"
+ @click="handleQuery4"
>搜索
- 重置
-
-
+
+
-
-
- {{
- scope.row.nurseStationType == "LX202209140018" ? "生活护理" : ""
- }}
- {{
- scope.row.nurseStationType == "LX202209140019" ? "医疗护理" : ""
- }}
-
+
-
-
-
-
+
@@ -664,6 +585,7 @@
:visible.sync="innerVisible2"
width="1000px"
append-to-body
+ :before-close="departcancel"
>
@@ -685,7 +606,6 @@
v-model="queryParams3.departmentName"
placeholder="请输入科室名称"
clearable
- @keyup.enter.native="handleQuery"
/>
@@ -705,7 +625,7 @@
:data="StationDepartmentLists"
@cell-dblclick="StationDepartmentclick"
>
-
+
+
+
@@ -740,24 +664,18 @@
-
+
@@ -766,6 +684,7 @@
:visible.sync="innerVisiblexg2"
width="1000px"
append-to-body
+ :before-close="departcancel"
>
-
@@ -795,7 +705,6 @@
v-model="queryParams3.departmentName"
placeholder="请输入科室名称"
clearable
- @keyup.enter.native="handleQuery"
/>
@@ -815,7 +724,7 @@
:data="StationDepartmentLists"
@cell-dblclick="StationDepartmentclick2"
>
-
+
+
+
@@ -850,27 +763,20 @@
-
+
-
@@ -881,17 +787,15 @@
style="margin-left: -20px"
>
{{ nurseStationName }}
+
-
+
{
- this.StationDepartmentLists = res.rows;
- this.total3 = res.total;
- this.loading = false;
- });
- // console.log(item);
- this.departid2 = this.form.departmentCode;
- this.innerVisiblexg2 = true;
- // this.index = index;
+ console.log(this.form.nurseStationId)
+ if (this.form.nurseStationId != null) {
+ this.getList3();
+ this.departid2 = this.form.departmentCode;
+ this.innerVisiblexg2 = true;
+
+ } else {
+ // this.innerVisible2 = false;
+ this.$message.error('请先选择所属护理站');
+ }
},
- // 新增护理站按钮
- clickinnerVisible(item, index) {
- // console.log(item);
- this.stationid = item.nurseStationId;
- this.innerVisible = true;
- this.index = index;
- },
- // 修改护理站按钮
- clickinnerVisible2() {
- stationList(this.queryParams2).then((res) => {
- this.stationLists = res.rows;
- this.total2 = res.total;
- this.loading = false;
- });
- // console.log(item);
+ //修改护理站按钮
+ departclickxg() {
+ this.info();
this.stationid2 = this.form.nurseStationId;
this.innerVisiblexg = true;
// this.index = index;
},
- //xialakuang
- // loadMore() {
- // console.log("1");
- // var a = Math.ceil(this.total4 / 10);
- // console.log(this.nurseStationlist.length);
- // if (this.nurseStationlist.length + 1 >= this.total4) {
- // } else {
- // if (this.nurseStationqueryParams.pageNum >= a) {
- // } else {
- // this.nurseStationqueryParams.pageNum++;
- // stationList(this.nurseStationqueryParams).then((res) => {
- // console.log(res);
- // res.rows.forEach((e) => {
- // this.nurseStationlist.push(e);
- // });
- // });
- // }
- // }
- // },
- nurselist() {
- stationList(this.nurseStationqueryParams).then((res) => {
- console.log(res);
- this.nurseStationlist = res.rows;
- this.total4 = res.total;
- console.log(this.nurseStationlist);
- });
- },
- //删除deldisease
- deldisease(index) {
- this.form.nurseStationPersonList.splice(index, 1);
- console.log(this.form.nurseStationPersonList);
- },
-
- adddisease() {
- // this.nurseStationName = "请选择护理站名称";
- // this.departmentName=""
- var obj = {
- nursePersonCode: "",
- nursePersonCode: "",
- nursePersonName: "",
- nursePersonType: "",
- phone: "",
- address: "",
- sex: "",
- nurseStationId: "",
-
- departmentName: "请选择所属科室",
- // departname: "",
- nurseStationName: "请选择护理站名称",
- };
- if (this.form.nurseStationPersonList.length == 5) {
- this.$message.error("最多只能5条");
- } else {
- this.form.nurseStationPersonList.push(obj);
- }
- },
- // 护理站名称
- nurseclick(row) {
- console.log(row);
- this.nursename = row.nurseStationName;
- this.stationid = row.id;
- this.form.nurseStationId = row.id;
- console.log(this.form);
- this.innerVisible = false;
- this.form.nursename = row.nurseStationName;
- this.form.nurseStationPersonList[this.index].nurseStationName =
- row.nurseStationName;
- this.form.nurseStationPersonList[this.index].nurseStationId = row.id;
+ // 新增护理站按钮
+ clickinnerVisible(item, index) {
+ this.info();
+ this.stationid = item.nurseStationId;
+ this.innerVisible = true;
+ this.index = index;
},
// 修改护理站
nurseclick2(row) {
@@ -1376,10 +1207,53 @@ export default {
this.nurseStationName = row.nurseStationName;
this.stationid2 = row.id;
this.form.nurseStationId = row.id;
- console.log(this.form);
+ this.queryParams3.nurseStationId = row.id;
this.innerVisiblexg = false;
this.form.nursename = row.nurseStationName;
},
+ //删除deldisease
+ // deldisease(index) {
+ // this.form.nurseStationPersonList.splice(index, 1);
+ // console.log(this.form.nurseStationPersonList);
+ // },
+
+ // adddisease() {
+ // this.form.nurseStationId = null
+ // var obj = {
+ // nursePersonCode: "",
+ // nursePersonCode: "",
+ // nursePersonName: "",
+ // nursePersonType: "",
+ // phone: "",
+ // address: "",
+ // sex: "",
+ // nurseStationId: "",
+ // departmentName: "请选择所属科室",
+ // // departname: "",
+ // nurseStationName: "请选择所属护理站",
+ // };
+ // if (this.form.nurseStationPersonList.length == 5) {
+ // this.$message.error("最多只能5条");
+ // } else {
+ // this.form.nurseStationPersonList.push(obj);
+ // }
+ // },
+ // 护理站名称
+ nurseclick(row) {
+ console.log(row);
+ this.nursename = row.nurseStationName;
+ this.stationid = row.id;
+ this.form.nurseStationId = row.id;
+ this.queryParams3.nurseStationId = row.id;
+ console.log(this.form.nurseStationId);
+ console.log(this.form);
+ this.innerVisible = false;
+ this.form.nursename = row.nurseStationName;
+ this.form.nurseStationPersonList[this.index].nurseStationName =
+ row.nurseStationName;
+ this.form.nurseStationPersonList[this.index].nurseStationId = row.id;
+ },
+
// 所属科室
StationDepartmentclick(row) {
console.log(row);
@@ -1415,25 +1289,28 @@ export default {
this.loading = false;
});
},
- getList2() {
- // 护理站名称
+ // getList2() {
+ // this.loading = true;
+ // getListByUser(this.StationqueryParams).then((res) => {
+ // this.nursetotal = res.total;
+ // this.nurseStationlist = res.rows;
+ // this.loading = false;
+ // });
+ // },
+ getList3() {
this.loading = true;
- stationList(this.queryParams2).then((res) => {
- this.stationLists = res.rows;
- this.total2 = res.total;
- this.loading = false;
- });
StationDepartmentList(this.queryParams3).then((res) => {
this.StationDepartmentLists = res.rows;
- this.total3 = res.total;
+ this.departtotal = res.total;
this.loading = false;
});
+
},
// 取消按钮
cancel() {
this.open = false;
this.open2 = false;
- this.nurseStationName = "请选择护理站名称";
+ this.nurseStationName = "请选择所属护理站";
this.departmentName = "请选择所属科室";
// this.upload.open=false;
this.reset();
@@ -1454,7 +1331,7 @@ export default {
createTime: null,
updateBy: null,
updateTime: null,
- nurseStationName: "请选择护理站名称",
+ nurseStationName: "请选择所属护理站",
departmentName: "请选择所属科室",
nurseStationPersonList: [
{
@@ -1464,7 +1341,7 @@ export default {
nursePersonCode: "",
nursePersonName: "",
nursePersonType: "",
- nurseStationName: "请选择护理站名称",
+ nurseStationName: "请选择所属护理站",
phone: "",
address: "",
sex: "",
@@ -1474,72 +1351,59 @@ export default {
};
this.resetForm("form");
},
-
/** 搜索按钮操作 */
handleQuery2() {
- this.queryParams.pageNum = 1;
- stationList(this.queryParams2).then((res) => {
- this.stationLists = res.rows;
- this.total2 = res.total;
- this.loading = false;
- });
- this.innerVisible = true;
+ this.nurseStationqueryParams.pageNum = 1;
+ this.info();
},
-
+ // 修改护理站弹框的搜索
+ handleQuery4() {
+ this.nurseStationqueryParams.pageNum = 1;
+ this.info();
+ },
+ //修改所属科室
handleQuery3() {
- console.log(this.queryParams3);
- StationDepartmentList(this.queryParams3).then((response) => {
- this.StationDepartmentLists = response.rows;
- this.total3 = response.total;
- this.loading = false;
- });
- this.queryParams.pageNum = 1;
- this.getList();
+ this.queryParams3.pageNum = 1;
+ this.getList3();
},
handleQuery() {
- // stationList(this.nurseStationqueryParams).then((res) => {
- // console.log(res);
- // this.nurseStationlist = res.rows;
- // this.total4 = res.total;
- // console.log(this.nurseStationlist);
- // });
this.queryParams.pageNum = 1;
this.getList();
- // this.nurselist()
- // this.stationList();
- // this.nurseStationlist()
},
/** 重置按钮操作 */
+ addcancel() {
+ this.innerVisible = false;
+ this.innerVisiblexg = false;
+ this.resetQuery2();
+ },
+ departcancel() {
+ this.innerVisible2 = false;
+ this.innerVisiblexg2 = false;
+ // this.resetQuery3();
+ },
resetQuery2() {
- this.queryParams2 = {
+ this.resetForm("queryForm");
+ this.nurseStationqueryParams = {
pageNum: 1,
pageSize: 10,
- nurseStationName: null,
- id: null,
- nurseStationId: null,
};
- stationList(this.queryParams2).then((res) => {
- this.stationLists = res.rows;
- this.total2 = res.total;
- });
+ this.handleQuery2();
+ },
+ resetQuery4() {
+ this.resetForm("queryForm");
+ this.nurseStationqueryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ };
+ this.handleQuery4();
},
resetQuery3() {
- this.queryParams3 = {
- pageNum: 1,
- pageSize: 10,
- nurseStationName: null,
- id: null,
- departmentCode: null,
- departmentName: null,
- nurseStationId: null,
- };
- StationDepartmentList(this.queryParams3).then((response) => {
- this.StationDepartmentLists = response.rows;
- this.total3 = response.total;
- this.loading = false;
- });
+ this.queryParams3.pageNum = 1;
+ this.queryParams3.pageSize = 10;
+ this.queryParams3.departmentName = null;
+ this.queryParams3.departmentCode = null;
+ this.handleQuery3();
},
-
resetQuery() {
if (this.nurseStationlist[0].isAdmin == "1") {
this.resetForm("queryForm");
@@ -1555,7 +1419,6 @@ export default {
phone: null,
address: null,
};
-
this.handleQuery();
} else {
console.log(1);
@@ -1575,22 +1438,22 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
+ this.queryParams3.nurseStationId=null
this.reset();
this.open2 = true;
this.title = "添加护理站人员信息";
- this.title2 = "请选择护理站";
+ this.title2 = "请选择所属护理站";
this.title3 = "请选择科室";
},
/** 修改按钮操作 */
handleUpdate(row) {
- // this.reset();
const id = row.id || this.ids;
getPerson(id).then((response) => {
console.log(response);
- // this.departmentName="请选择科室"
this.departmentName = response.data.departmentName;
this.nurseStationName = response.data.nurseStationName;
this.form = response.data;
+ this.queryParams3.nurseStationId=response.data.nurseStationId
this.open = true;
this.title = "修改护理站人员信息";
if (this.departmentName == null && this.departmentName == undefined) {
@@ -1604,9 +1467,6 @@ export default {
submitForm() {
console.log(this.form);
this.$refs["form"].validate((valid) => {
- // this.form.nursename = null;
- // this.form.nurseStationId = null;
-
if (valid) {
if (this.form.id != null) {
updatePerson(this.form).then((response) => {
@@ -1619,7 +1479,7 @@ export default {
this.$modal.msgSuccess("新增成功");
this.open2 = false;
this.getList();
- this.nurseStationName = "请选择护理站名称";
+ this.nurseStationName = "请选择所属护理站";
this.departmentName = "请选择所属科室";
});
}
@@ -1638,7 +1498,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 导入按钮操作 */
handleImport() {
@@ -1666,8 +1526,8 @@ export default {
this.$refs.upload.clearFiles();
this.$alert(
"" +
- response.msg +
- "
",
+ response.msg +
+ "",
"导入结果",
{ dangerouslyUseHTMLString: true }
);
@@ -1695,19 +1555,20 @@ export default {
if (res.rows[0].isAdmin == "1") {
console.log(true);
this.nurseStationlist = res.rows;
- this.total5 = res.total;
+ this.nursetotal = res.total;
} else {
- this.total5 = res.total;
+ this.nursetotal = res.total;
this.nurseStationlist = res.rows;
this.queryParams.nurseStationId = res.rows[0].id;
+ this.queryParams3.nurseStationId = res.rows[0].id;
this.handleQuery();
}
});
},
//滑动下拉框
loadMore() {
- var a = Math.ceil(this.total5 / 10);
- if (this.nurseStationlist.length + 1 >= this.total5) {
+ var a = Math.ceil(this.nursetotal / 10);
+ if (this.nurseStationlist.length + 1 >= this.nursetotal) {
} else {
if (this.nurseStationqueryParams.pageNum >= a) {
} else {
@@ -1722,24 +1583,6 @@ export default {
}
}
},
- // loadMore() {
- // console.log("1");
- // var a = Math.ceil(this.total4 / 10);
- // console.log(this.nurseStationlist.length);
- // if (this.nurseStationlist.length + 1 >= this.total4) {
- // } else {
- // if (this.nurseStationqueryParams.pageNum >= a) {
- // } else {
- // this.nurseStationqueryParams.pageNum++;
- // stationList(this.nurseStationqueryParams).then((res) => {
- // console.log(res);
- // res.rows.forEach((e) => {
- // this.nurseStationlist.push(e);
- // });
- // });
- // }
- // }
- // },
},
};
diff --git a/src/views/system/station/index.vue b/src/views/system/station/index.vue
index e19bbbd..554b991 100644
--- a/src/views/system/station/index.vue
+++ b/src/views/system/station/index.vue
@@ -8,14 +8,6 @@
v-show="showSearch"
label-width="100px"
>
-
-
-
-
-
-
-
-
-
-
+
修改
-
- 删除
-
+
导入
-
+
-
+
{{
@@ -225,18 +149,7 @@
prop="address"
:show-overflow-tooltip="true"
/>
-
+
@@ -250,7 +163,6 @@
class-name="small-padding fixed-width"
>
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
-
-
-
删除
@@ -578,7 +446,6 @@
取 消
-
{
- // this.looknurseStationLabel = res.rows;
- // this.nurseStationLabelopen = true;
- // console.log(this.looknurseStationLabel);
- // });
- // },
//查看类型
looktype(item) {
// console.log(item);
@@ -890,34 +740,33 @@ export default {
},
//点击街道
clickstreet(item) {
+ this.form.streetCode = item.areaCode;
this.form.areaCode = item.areaCode;
- this.value3 = item.areaCode;
- console.log(this.form);
+ console.log(item, this.form);
},
//点击区县城
clickarea(item) {
- this.value3 = "";
- console.log(item);
+ this.form.areaCode = "";
+ this.form.streetName = "";
getSecondaryLevelInfo(item.id).then((res) => {
- console.log(res);
this.streetlist = res.data;
});
},
//点击市
clickcity(item) {
- this.value2 = "";
- this.value3 = "";
- console.log(item);
+ this.form.regionName = "";
+ this.form.areaCode = "";
+ this.form.streetName = "";
getSecondaryLevelInfo(item.id).then((res) => {
- console.log(res);
this.arealist = res.data;
});
},
//点击省
province(item) {
- this.value1 = "";
- this.value2 = "";
- this.value3 = "";
+ this.form.cityName = "";
+ this.form.regionName = "";
+ this.form.areaCode = "";
+ this.form.streetName = "";
getSecondaryLevelInfo(item.id).then((res) => {
this.citylist = res.data;
});
@@ -935,12 +784,18 @@ export default {
},
// 取消按钮
cancel() {
+ var obj = { pictureUrlList: [] };
+ if (this.imgone != this.form.stationIntroducePcitureUrl) {
+ obj.pictureUrlList.push(this.form.stationIntroducePcitureUrl);
+ }
+ if (this.imgtwo != this.form.stationPictureUrl) {
+ obj.pictureUrlList.push(this.form.stationPictureUrl);
+ }
+ if (obj.pictureUrlList.length > 0) {
+ updatePicture(obj).then((res) => {});
+ }
this.open = false;
this.reset();
- this.value3 = "";
- this.value2 = "";
- this.value1 = "";
- this.value = "";
},
// 表单重置
reset() {
@@ -1005,11 +860,10 @@ export default {
this.resetForm("queryForm");
this.handleQuery();
} else {
- console.log(1);
- // this.queryParams.nurseStationCode = null;
+ // console.log(1);
this.queryParams.pageSize = 10;
this.queryParams.pageNum = 1;
- this.queryParams.nurseStationType = null;
+ this.queryParams.nurseStationCode = null;
this.handleQuery();
}
},
@@ -1022,15 +876,11 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
- this.value3 = "";
- this.value2 = "";
- this.value1 = "";
- this.value = "";
this.open = true;
this.looknurseStationLabel = [
{
labelDescription: "",
- labeSort:"",
+ sort: "",
ids: 1,
},
];
@@ -1038,19 +888,18 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
- console.log(row, "看一当前行数据");
this.reset();
this.loading = true;
const id = row.id || this.ids;
getStation(id).then((response) => {
- console.log(response);
this.form = response.data;
+ this.form.streetCode = this.form.streetName;
+ this.imgone = this.form.stationIntroducePcitureUrl;
+ this.imgtwo = this.form.stationPictureUrl;
this.looknurseStationLabel = response.data.nurseStationLabel;
- this.nurseStationType2 = this.form.nurseStationType.split(",");
- console.log(this.list);
this.open = true;
this.loading = false;
- console.log(this.form);
+ console.log(this.form)
});
},
/** 提交按钮 */
@@ -1062,7 +911,6 @@ export default {
if (valid) {
this.form.areaCode = Number(this.form.areaCode);
this.form.nurseStationType = this.nurseStationType2.join(",");
-
if (this.form.id != null) {
updateStation(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
diff --git a/src/views/system/stationConsumable/index.vue b/src/views/system/stationConsumable/index.vue
index 6b97ed5..0a0aa98 100644
--- a/src/views/system/stationConsumable/index.vue
+++ b/src/views/system/stationConsumable/index.vue
@@ -6,7 +6,7 @@
size="small"
:inline="true"
v-show="showSearch"
- label-width="100px"
+ label-width="110px"
>
-
+
删除
-
@@ -229,10 +218,10 @@
append-to-body
:before-close="cancel"
>
-
-
+
+
@@ -261,12 +250,12 @@
maxlength="10"
/>
-
+
@@ -285,6 +274,7 @@
取 消
+
@@ -367,7 +357,7 @@
placeholder="保留小数点后两位"
type="number"
min="0"
- oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>5){value=value.slice(0,5)}"
+ oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>7){value=value.slice(0,7)}"
/>
-
",
"导入结果",
{ dangerouslyUseHTMLString: true }
);
@@ -961,15 +906,10 @@ export default {
this.open2 = false;
this.open3 = false;
this.reset2();
- list(this.nurseStationqueryParams).then((res) => {
- console.log(res);
- this.nurseStationlist = res.rows;
- this.total2 = res.total;
- });
},
// 表单重置
reset2() {
- this.nurseStationqueryParams = {
+ this.getListByUserquery = {
pageNum: 1,
pageSize: 10,
areaCode: null,
@@ -1022,18 +962,20 @@ export default {
this.listStationConsumableinfo();
},
//护理站分页
- listinfo() {
- list(this.nurseStationqueryParams).then((res) => {
- this.nurseStationlist2 = res.rows;
- console.log(this.nurseStationlist2);
- this.total2 = res.total;
- });
- },
+ // listinfo() {
+ // list(this.nurseStationqueryParams).then((res) => {
+ // this.nurseStationlist2 = res.rows;
+ // console.log(this.nurseStationlist2);
+ // this.total2 = res.total;
+ // });
+ // },
//护理站搜索
handleQuery2() {
- console.log(this.nurseStationqueryParams);
- this.nurseStationqueryParams.pageNum = 1;
- this.listinfo();
+ this.getListByUserquery.pageNum = 1;
+ getListByUser(this.getListByUserquery).then((res) => {
+ this.nurseStationlist = res.rows;
+ this.total3 = res.total;
+ });
},
/** 重置按钮操作 */
sresetQuery() {
@@ -1124,7 +1066,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
@@ -1141,7 +1083,6 @@ export default {
this.upload.title = "护理站耗材导入";
this.upload.open = true;
},
-
//权限列表
info() {
getListByUser(this.getListByUserquery).then((res) => {
diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue
index f578129..21399a9 100644
--- a/src/views/system/stationItem/index.vue
+++ b/src/views/system/stationItem/index.vue
@@ -50,22 +50,7 @@
-
-
-
-
-
-
+
-
-
-
+
-
+
-
-
-
-
-
+
+
修改
删除
@@ -248,7 +216,6 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
-
-
-
-
-
-
-
+
+
+
-
-
+
-
+
-
+
-
-
-
-
+
+
-
+
-
+
@@ -546,7 +488,7 @@
@@ -568,37 +510,37 @@
-
+ >
+
+ >
+
+
+
-
-
-
-
+ :show-overflow-tooltip="true"
+ >
+
-
-
" +
- response.msg +
- "",
+ response.msg +
+ "",
"导入结果",
{ dangerouslyUseHTMLString: true }
);
@@ -987,7 +930,7 @@ export default {
},
//护理站重置
stationcancel() {
- this.nurseStationqueryParams = {
+ this.getListByUserquery = {
pageNum: 1,
pageSize: 10,
};
@@ -995,9 +938,9 @@ export default {
},
//下拉框
stationlist() {
- liststation(this.nurseStationqueryParams).then((res) => {
- this.nurseStationlist2 = res.rows;
- this.total2 = res.total;
+ getListByUser(this.getListByUserquery).then((res) => {
+ this.total4 = res.total;
+ this.nurseStationlist = res.rows;
});
},
//护理类型
@@ -1008,6 +951,7 @@ export default {
},
/** 耗材列表 */
listStationConsumable() {
+
listStationConsumable(this.StationConsumablequeryParams).then(
(response) => {
this.stationConsumableList = response.rows;
@@ -1046,7 +990,17 @@ export default {
},
// 取消按钮
cancel() {
- // this.$refs["form"].clearValidate();
+ console.log(this.form.nurseStationItem);
+ var obj = { pictureUrlList: [] };
+ if (this.imgone != this.form.nurseStationItem.itemPictureUrl) {
+ obj.pictureUrlList.push(this.form.nurseStationItem.itemPictureUrl);
+ }
+ if (obj.pictureUrlList.length > 0) {
+ updatePicture(obj).then((res) => {
+ console.log(res);
+ });
+ }
+
this.open = false;
this.reset();
},
@@ -1135,7 +1089,7 @@ export default {
};
this.handleQuery();
} else {
- this.queryParams.pageNu = 1;
+ this.queryParams.pageNum = 1;
this.queryParams.nurseTypeId = null;
this.queryParams.nurseItemCode = null;
this.queryParams.nurseItemName = null;
@@ -1152,15 +1106,19 @@ export default {
handleAdd() {
this.reset();
this.open = true;
+ this.StationConsumablequeryParams.nurseStationId = null;
this.title = "添加护理站护理项目";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
+ this.StationConsumablequeryParams.nurseStationId = null
const id = row.id || this.ids;
getNurseItem(id).then((response) => {
console.log(response);
this.form = response.data;
+ this.StationConsumablequeryParams.nurseStationId = response.data.nurseStationItem.nurseStationId
+ this.imgone = this.form.nurseStationItem.itemPictureUrl;
if (this.form.nurseStationItemPrices == []) {
var obj = {
serveDurationUnit: "",
@@ -1211,6 +1169,7 @@ export default {
} else {
addNurseItem(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
+ this.$forceUpdate()
this.open = false;
this.getList();
});
@@ -1230,7 +1189,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 导入按钮操作 */
handleExport() {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a3d6aef..e816e11 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -364,10 +364,10 @@
+
@@ -612,9 +612,9 @@ export default {
trigger: "blur",
},
],
- nurseStationIds: [
- { required: true, message: "护理站不能为空", trigger: "blur" },
- ],
+ // nurseStationIds: [
+ // { required: true, message: "护理站不能为空", trigger: "blur" },
+ // ],
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" },
],
@@ -797,17 +797,18 @@ export default {
const userId = row.userId || this.ids;
getUser(userId).then((response) => {
this.form = response.data;
- if (
- !this.form.nurseStationIds ||
- this.form.nurseStationIds == null ||
- this.form.nurseStationIds.length == 0
- ) {
- } else {
- this.form.nurseStationIds = this.form.nurseStationIds.split(",");
- this.form.nurseStationIds = this.form.nurseStationIds.map((e) => {
- return (e = Number(e));
- });
- }
+ this.form.nurseStationIds = Number(this.form.nurseStationIds);
+ // if (
+ // !this.form.nurseStationIds ||
+ // this.form.nurseStationIds == null ||
+ // this.form.nurseStationIds.length == 0
+ // ) {
+ // } else {
+ // this.form.nurseStationIds = this.form.nurseStationIds.split(",");
+ // this.form.nurseStationIds = this.form.nurseStationIds.map((e) => {
+ // return (e = Number(e));
+ // });
+ // }
console.log(this.form);
this.postOptions = response.posts;
@@ -821,6 +822,7 @@ export default {
},
/** 重置密码按钮操作 */
handleResetPwd(row) {
+
this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -845,7 +847,13 @@ export default {
console.log(this.form);
this.$refs["form"].validate((valid) => {
if (valid) {
- this.form.nurseStationIds = this.form.nurseStationIds.join(",");
+ // this.form.nurseStationIds = this.form.nurseStationIds.join(",");
+ // this.form.nurseStationIds = JSON.stringify(this.form.nurseStationIds);
+ // var obj = [];
+ // obj.push(this.form.nurseStationIds);
+ // console.log(obj)
+ // this.form.nurseStationIds = obj;
+ console.log(this.form);
if (this.form.userId != undefined) {
updateUser(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
@@ -923,4 +931,4 @@ export default {
},
},
};
-
\ No newline at end of file
+
diff --git a/vue.config.js b/vue.config.js
index a51c800..7b0f952 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,12 +2,12 @@
const path = require('path')
function resolve(dir) {
- return path.join(__dirname, dir)
+ return path.join(__dirname, dir)
}
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 || 82 // 端口
@@ -15,122 +15,121 @@ const port = process.env.port || process.env.npm_config_port || 82 // 端口
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
// 这里只列一部分，具体配置参考文档
module.exports = {
- // 部署生产环境和开发环境下的URL。
- // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
- // 例如 https://www.xinyilu.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.xinyilu.vip/admin/，则设置 baseUrl 为 /admin/。
- publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
- // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
- outputDir: 'dist',
- // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
- assetsDir: 'static',
- // 是否开启eslint保存检测，有效值：ture | false | 'error'
- lintOnSave: process.env.NODE_ENV === 'development',
- // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
- productionSourceMap: false,
- // webpack-dev-server 相关配置
- devServer: {
- host: '0.0.0.0',
- port: port,
- open: true,
- proxy: {
- // detail: https://cli.vuejs.org/config/#devserver-proxy
- [process.env.VUE_APP_BASE_API]: {
- target: `http://localhost:8080`,
- changeOrigin: true,
- pathRewrite: {
- ['^' + process.env.VUE_APP_BASE_API]: ''
- }
- }
- },
- disableHostCheck: true
- },
- css: {
- loaderOptions: {
- sass: {
- sassOptions: { outputStyle: "expanded" }
- }
- }
- },
- configureWebpack: {
- name: name,
- resolve: {
- alias: {
- '@': resolve('src')
- }
- },
- plugins: [
- // http://doc.xinyilu.vip/xinyilu-vue/other/faq.html#使用gzip解压缩静态文件
- new CompressionPlugin({
- cache: false, // 不启用文件缓存
- test: /\.(js|css|html)?$/i, // 压缩文件格式
- filename: '[path].gz[query]', // 压缩后的文件名
- algorithm: 'gzip', // 使用gzip压缩
- minRatio: 0.8 // 压缩率小于1才会压缩
- })
- ],
- },
- chainWebpack(config) {
- config.plugins.delete('preload') // TODO: need test
- config.plugins.delete('prefetch') // TODO: need test
-
- // set svg-sprite-loader
- config.module
- .rule('svg')
- .exclude.add(resolve('src/assets/icons'))
- .end()
- config.module
- .rule('icons')
- .test(/\.svg$/)
- .include.add(resolve('src/assets/icons'))
- .end()
- .use('svg-sprite-loader')
- .loader('svg-sprite-loader')
- .options({
- symbolId: 'icon-[name]'
- })
- .end()
-
- config
- .when(process.env.NODE_ENV !== 'development',
- config => {
- config
- .plugin('ScriptExtHtmlWebpackPlugin')
- .after('html')
- .use('script-ext-html-webpack-plugin', [{
- // `runtime` must same as runtimeChunk name. default is `runtime`
- inline: /runtime\..*\.js$/
- }])
- .end()
- config
- .optimization.splitChunks({
- chunks: 'all',
- cacheGroups: {
- libs: {
- name: 'chunk-libs',
- test: /[\\/]node_modules[\\/]/,
- priority: 10,
- chunks: 'initial' // only package third parties that are initially dependent
- },
- elementUI: {
- name: 'chunk-elementUI', // split elementUI into a single package
- priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
- test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
- },
- commons: {
- name: 'chunk-commons',
- test: resolve('src/components'), // can customize your rules
- minChunks: 3, // minimum common number
- priority: 5,
- reuseExistingChunk: true
+ // 部署生产环境和开发环境下的URL。
+ // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
+ // 例如 https://www.xinyilu.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.xinyilu.vip/admin/，则设置 baseUrl 为 /admin/。
+ publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+ // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
+ outputDir: 'dist',
+ // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
+ assetsDir: 'static',
+ // 是否开启eslint保存检测，有效值：ture | false | 'error'
+ lintOnSave: process.env.NODE_ENV === 'development',
+ // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
+ productionSourceMap: false,
+ // webpack-dev-server 相关配置
+ devServer: {
+ host: '0.0.0.0',
+ port: port,
+ open: true,
+ proxy: {
+ // detail: https://cli.vuejs.org/config/#devserver-proxy
+ [process.env.VUE_APP_BASE_API]: {
+ target: `http://localhost:8080`,
+ changeOrigin: true,
+ pathRewrite: {
+ ['^' + process.env.VUE_APP_BASE_API]: ''
}
- }
- })
- config.optimization.runtimeChunk('single'),
- {
- from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
- to: './' //到根目录下
- }
+ }
+ },
+ disableHostCheck: true
+ },
+ css: {
+ loaderOptions: {
+ sass: {
+ sassOptions: { outputStyle: "expanded" }
+ }
}
- )
- }
+ },
+ configureWebpack: {
+ name: name,
+ resolve: {
+ alias: {
+ '@': resolve('src')
+ }
+ },
+ plugins: [
+ // http://doc.xinyilu.vip/xinyilu-vue/other/faq.html#使用gzip解压缩静态文件
+ new CompressionPlugin({
+ cache: false, // 不启用文件缓存
+ test: /\.(js|css|html)?$/i, // 压缩文件格式
+ filename: '[path].gz[query]', // 压缩后的文件名
+ algorithm: 'gzip', // 使用gzip压缩
+ minRatio: 0.8 // 压缩率小于1才会压缩
+ })
+ ],
+ },
+ chainWebpack(config) {
+ config.plugins.delete('preload') // TODO: need test
+ config.plugins.delete('prefetch') // TODO: need test
+
+ // set svg-sprite-loader
+ config.module
+ .rule('svg')
+ .exclude.add(resolve('src/assets/icons'))
+ .end()
+ config.module
+ .rule('icons')
+ .test(/\.svg$/)
+ .include.add(resolve('src/assets/icons'))
+ .end()
+ .use('svg-sprite-loader')
+ .loader('svg-sprite-loader')
+ .options({
+ symbolId: 'icon-[name]'
+ })
+ .end()
+
+ config
+ .when(process.env.NODE_ENV !== 'development',
+ config => {
+ config
+ .plugin('ScriptExtHtmlWebpackPlugin')
+ .after('html')
+ .use('script-ext-html-webpack-plugin', [{
+ // `runtime` must same as runtimeChunk name. default is `runtime`
+ inline: /runtime\..*\.js$/
+ }])
+ .end()
+ config
+ .optimization.splitChunks({
+ chunks: 'all',
+ cacheGroups: {
+ libs: {
+ name: 'chunk-libs',
+ test: /[\\/]node_modules[\\/]/,
+ priority: 10,
+ chunks: 'initial' // only package third parties that are initially dependent
+ },
+ elementUI: {
+ name: 'chunk-elementUI', // split elementUI into a single package
+ priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+ test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+ },
+ commons: {
+ name: 'chunk-commons',
+ test: resolve('src/components'), // can customize your rules
+ minChunks: 3, // minimum common number
+ priority: 5,
+ reuseExistingChunk: true
+ }
+ }
+ })
+ config.optimization.runtimeChunk('single'), {
+ from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+ to: './' //到根目录下
+ }
+ }
+ )
+ }
}