diff --git a/src/views/login.vue b/src/views/login.vue
index 4d8a59f..49bdccc 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -6,7 +6,7 @@
:rules="loginRules"
class="login-form"
>
- 欢迎登录
+ 泉医到家运营管理平台
-
+
+
{
+ if(res.code == 200){
+ this.$modal.msgSuccess("录入成功");
+ }
this.queryexpressNo.expressNo = ""
this.innerlogistics = false
console.log(res)
@@ -759,6 +762,9 @@ submitRefundOrder() {
obj.remark = this.refundlist.refundReasonRemark
obj.goodsStatus = this.refundlist.orderStatus
weChatRefundOrderApply(obj).then(res => {
+ if(res.code == 200){
+ this.$modal.msgSuccess("退款成功");
+ }
// console.log(obj)
this.innerrefund = false
})
@@ -800,12 +806,25 @@ refundcancel() {
},
// 表单重置
reset() {
+ this.queryParams={
+ pageNum: 1,
+ pageSize: 10,
+ nurseStationId: null,
+ patientId: null,
+ orderNo: null,
+ orderStatus: null,
+ totalPrice: null,
+ receiver: null,
+ receiveAddress: null,
+ phone: null,
+ orderTime: null,
+ orderChannel: null,
+ }
this.form = {
id: null,
nurseStationId: null,
patientId: null,
orderNo: null,
- orderStatus: "0",
totalPrice: null,
receiver: null,
receiveAddress: null,
@@ -817,9 +836,10 @@ reset() {
createBy: null,
createTime: null,
updateBy: null,
- updateTime: null
+ updateTime: null,
+ orderStatus: "",
};
- this.resetForm("form");
+ this.resetForm("queryParams");
},
/** 搜索按钮操作 */
handleQuery() {
@@ -828,10 +848,11 @@ handleQuery() {
},
/** 重置按钮操作 */
resetQuery() {
+ this.reset();
this.resetForm("queryForm");
this.handleQuery();
- // this.getList();
},
+
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index 20156ed..b14e1cc 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -60,8 +60,13 @@
:data="OrderDetailsList"
@selection-change="handleSelectionChange"
>
+
+
+
+
+
{{ scope.row.orderStatus == "WAIT_PAY" ? "待付款" : "" }}
@@ -80,7 +85,7 @@
查看派单
取消预约
-
+
-
+
搜索
- 重置
@@ -344,9 +350,9 @@
@@ -367,7 +373,7 @@
@@ -397,13 +403,13 @@
-
+ />
@@ -463,10 +469,12 @@ export default {
dispatchlist: [],
nurseName: "请选择护理员",
nursePersonid: "",
- querynursecencel:{
- appointmentOrderId:"",
- },
- // total2: 0,
+ // querynursecencel:{
+ // appointmentOrderId:"",
+ // },
+ appointmentOrderId:"",
+ nurseStationPersonId :"",
+ total2: 0,
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -481,17 +489,24 @@ export default {
pageNum: 1,
pageSize: 10,
},
- querynursePerson: {
- nursePersonName: null,
- phone: null,
- pageNum: 1,
- pageSize: 10,
- },
+ // querynursePerson: {
+ // nursePersonName: null,
+ // phone: null,
+ // pageNum: 1,
+ // pageSize: 10,
+ // },
querynursePersonname: {
- detailsId: "",
- nursePersonName: null,
+ orderNo:"",
+ nursePersonName:null,
nursePersonType: null,
departmentName: null,
+ pageNum: 1,
+ pageSize: 10,
+
+ // detailsId: "",
+ // nursePersonName: null,
+
+
},
@@ -523,7 +538,7 @@ export default {
},
// 查看
seeLook(row) {
- this.innerVisible = true;
+ this.innerVisible4 = true;
const id = row.orderNo;
// console.log(row);
Detailed(id).then((res) => {
@@ -546,43 +561,52 @@ export default {
// 派单
dispatch(row) {
console.log(row)
- this.querynursePersonname.detailsId = row.detailsId
- console.log(this.querynursePersonname.detailsId);
+ this.querynursePersonname.orderNo = row.orderNo
+ console.log(this.querynursePersonname.orderNo);
// console.log(row)
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;
+ 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) => {
+ // console.log(this.querynursePersonname)
+ // var obj = {}
+ // obj.nurseStationPersonId = nurseStationPersonId
+ // obj.orderNo = this.querynursePersonname.orderNo
+ let params={
+ nurseStationPersonId:this.nursePersonid,
+ orderNo:this.querynursePersonname.orderNo
+ }
+ dispatchsubmit(params).then((res) => {
+ if(res.code == 200){
+ this.$modal.msgSuccess("派单成功");
+ }
this.nurseName = "请选择护理员";
this.innerdispatch = false;
+ // this.nursePersonid =""
})
},
// 选择姓名按钮
nursePersonclick(row) {
- this.nursePersonid = row.id
+ this.nursePersonid = row.nurseStationPersonId
this.nurseName = row.nursePersonName
this.nursePersonNameinfo = false;
console.log(row)
},
- // 确认取消预约
+
// cencel(appointmentOrderId) {
// confirmCancel(appointmentOrderId).then((res) => {
// // this.nurseName="请选择护理员";
@@ -591,11 +615,14 @@ export default {
// })
// console.log(appointmentOrderId)
// },
-
- cencel(row) {
- console.log('row :>> ', this.querynursecencel.appointmentOrderId);
- this.querynursecencel.appointmentOrderId = row.appointmentOrderId
+ // console.log(row.appointmentOrderId)
+ // this.appointmentOrderId = row.appointmentOrderId
+ // console.log('row :>> ', this.querynursecencel.appointmentOrderId);
// obj.appointmentOrderId=row.appointmentOrderId
+
+
+ // 确认取消预约
+ cencel(appointmentOrderId) {
this.$confirm(
'是否确认取消订单',
"提示",
@@ -606,15 +633,19 @@ export default {
}
)
.then(() => {
-
- confirmCancel(this.querynursecencel).then((res) => {
+ console.log(appointmentOrderId)
+ let params={
+ appointmentOrderId:appointmentOrderId
+ }
+ confirmCancel(params).then((res) => {
this.$message.success("取消成功");
- this.getList();
+ // this.getList();
// console.log('this.OrderDetailsList :>> ', this.OrderDetailsList);
});
+
})
.catch(() => { });
- },
+ },
/** 查询护理类型信息列表 */
getList() {
this.loading = true;
@@ -645,16 +676,20 @@ 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");
this.handleQuery();
+ },
+ resetQuery2() {
+ this.resetForm("queryForm");
+ this.handleQuery2();
},
// 多选框选中数据
handleSelectionChange(selection) {