diff --git a/src/api/system/order.js b/src/api/system/order.js index 2c4a811..c00d1a3 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -11,11 +11,21 @@ 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 xylWeChatRefundNotify(data) { + return request({ + + url: '/nurseApp/weChatPayment/weChatRefundOrderApply', + method: 'post', + data: data + }) +} //删除 export function deldetailed(appointmentOrderId) { return request({ @@ -50,4 +60,4 @@ export function confirmCancel(appointmentOrderId) { url: `/system/appointmentOrder/confirmCancel?appointmentOrderId=${appointmentOrderId}`, method: 'post' }) -} \ No newline at end of file +} diff --git a/src/views/system/OperateGoodsInfo/index.vue b/src/views/system/OperateGoodsInfo/index.vue index 2f3a6ac..b21485d 100644 --- a/src/views/system/OperateGoodsInfo/index.vue +++ b/src/views/system/OperateGoodsInfo/index.vue @@ -239,8 +239,34 @@ style="width: 210px" /> - - + {{ StationName }} + {{ StationName }} + 取 消 + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + - - @@ -214,7 +192,7 @@ > - + - - - - + - + - + - + - - - - - - - - - - - + - +
- 取 消 + 取 消 确 定
@@ -430,10 +407,10 @@ v-model="querynursePersonname.nursePersonName" placeholder="请输入姓名" clearable - + /> - + { + xylWeChatRefundNotify(obj).then((res) => { + if (res.code == 200) { + this.$modal.msgSuccess("退款成功"); + } + this.innerrefund=false + this.getList(); console.log(res); }); + + }, + // 取消按钮 + cencelbtn(){ + this.innerrefund = false; }, switchOrderStatus(orderStatus) { switch (orderStatus) { @@ -697,13 +705,7 @@ export default { // 确认取消预约 cencel(row) { Detailed(row.orderNo).then((res) => { - res.data.forEach((e) => { - if (e.serviceDate) { - e.time = - e.serviceDate + "-" + e.serviceStartTime + "-" + e.serviceEndTime; - } - }); - this.query = res.data[0]; + this.query = res.data; this.innerrefund = true; }); }, diff --git a/src/views/system/person/index.vue b/src/views/system/person/index.vue index c8bd22b..091c381 100644 --- a/src/views/system/person/index.vue +++ b/src/views/system/person/index.vue @@ -125,17 +125,6 @@ >导入 - - @@ -488,20 +467,6 @@ :show-overflow-tooltip="true" > - @@ -514,8 +479,8 @@ - @@ -611,29 +566,14 @@ align="center" > - - @@ -666,7 +606,6 @@ v-model="queryParams3.departmentName" placeholder="请输入科室名称" clearable - @keyup.enter.native="handleQuery" /> @@ -726,8 +665,8 @@ - @@ -768,7 +700,7 @@ v-model="queryParams3.departmentName" placeholder="请输入科室名称" clearable - @keyup.enter.native="handleQuery" + /> @@ -828,8 +760,8 @@ {{ nurseStationName }} @@ -1084,12 +1016,9 @@ export default { // 显示搜索条件 showSearch: true, // 总条数 - // total:null, total: 0, - total2: 0, - total3: 0, - total4: 0, - total5: 0, + departtotal: 0, + nursetotal: 0, // 护理站人员信息表格数据 nurseStationPersonList: [], // 护理站名称 @@ -1100,14 +1029,15 @@ export default { stationid: "", stationid2: "", departid: "", - nurseStationName: "请选择护理站名称", + nurseStationName: "请选择所属护理站", departmentName: "请选择所属科室", // 弹出层标题 title: "", title2: "", title3: "", - // 是否显示弹出层 + // 修改弹出层 open: false, + // 添加弹出层 open2: false, //权限查询 // 查询参数 @@ -1155,9 +1085,7 @@ export default { departmentName: [ { required: true, message: "所属科室不能为空", trigger: "blur" }, ], - // nurseStationId: [ - // { required: true, message: "所属护理站不能为空", trigger: "blur" }, - // ], + nursePersonName: [ { required: true, message: "护理人姓名不能为空", trigger: "blur" }, ], @@ -1180,7 +1108,7 @@ export default { nursePersonName: [ { required: true, - message: "护理站人员名称不能为空", + message: "请选择所属护理站", trigger: "blur", }, ], @@ -1188,7 +1116,7 @@ export default { { required: true, message: "所属科室不能为空", trigger: "blur" }, ], nurseStationId: [ - { required: true, message: "所属护理站不能为空", trigger: "blur" }, + { required: true, message: "请选择所属护理站", trigger: "blur" }, ], nursePersonName: [ { required: true, message: "护理人姓名不能为空", trigger: "blur" }, @@ -1208,22 +1136,13 @@ export default { address: [ { required: true, message: "居住地址不能为空", trigger: "blur" }, ], - // nurseStationPersonList: { - // nursePersonName: [ - // { - // required: true, - // message: "请输入护理站人员名称", - // trigger: "blur", - // }, - // ], - // }, }, }, }; }, created() { this.getList(); - this.getList2(); + // this.getList2(); // this.nurselist(); this.info(); }, @@ -1239,10 +1158,9 @@ export default { departclick2() { StationDepartmentList(this.queryParams3).then((res) => { this.StationDepartmentLists = res.rows; - this.total3 = res.total; + this.departtotal = res.total; this.loading = false; }); - // console.log(item); this.departid2 = this.form.departmentCode; this.innerVisiblexg2 = true; // this.index = index; @@ -1253,33 +1171,6 @@ export default { this.innerVisible = 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); @@ -1368,14 +1259,13 @@ export default { getList2() { // 护理站名称 this.loading = true; - stationList(this.queryParams2).then((res) => { - this.stationLists = res.rows; - this.total2 = res.total; - this.loading = false; + getListByUser(this.nurseStationqueryParams).then((res) => { + this.nursetotal = res.total; + this.nurseStationlist = res.rows; }); StationDepartmentList(this.queryParams3).then((res) => { this.StationDepartmentLists = res.rows; - this.total3 = res.total; + this.departtotal = res.total; this.loading = false; }); }, @@ -1383,7 +1273,7 @@ export default { cancel() { this.open = false; this.open2 = false; - this.nurseStationName = "请选择护理站名称"; + this.nurseStationName = "请选择所属护理站"; this.departmentName = "请选择所属科室"; // this.upload.open=false; this.reset(); @@ -1404,7 +1294,7 @@ export default { createTime: null, updateBy: null, updateTime: null, - nurseStationName: "请选择护理站名称", + nurseStationName: "请选择所属护理站", departmentName: "请选择所属科室", nurseStationPersonList: [ { @@ -1414,7 +1304,7 @@ export default { nursePersonCode: "", nursePersonName: "", nursePersonType: "", - nurseStationName: "请选择护理站名称", + nurseStationName: "请选择所属护理站", phone: "", address: "", sex: "", @@ -1426,41 +1316,31 @@ export default { }, /** 搜索按钮操作 */ handleQuery2() { - getListByUser(this.nurseStationqueryParams).then((res) => { - this.total5 = res.total; - this.nurseStationlist = res.rows; - }); + this.nurseStationqueryParams.pageNum = 1; + this.getList2() }, 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.getList2() + // this.getList(); }, 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(); - this.resetQuery3(); + }, + departcancel(){ + this.innerVisible2 = false; + this.innerVisiblexg2=false; + this.resetQuery3(); + }, + resetQuery2() { this.nurseStationqueryParams = { pageNum: 1, @@ -1481,13 +1361,8 @@ export default { departmentName: null, nurseStationId: null, }; - StationDepartmentList(this.queryParams3).then((response) => { - this.StationDepartmentLists = response.rows; - this.total3 = response.total; - this.loading = false; - }); + this.handleQuery3() }, - resetQuery() { if (this.nurseStationlist[0].isAdmin == "1") { this.resetForm("queryForm"); @@ -1525,16 +1400,14 @@ export default { 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; @@ -1551,8 +1424,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) => { @@ -1565,7 +1436,7 @@ export default { this.$modal.msgSuccess("新增成功"); this.open2 = false; this.getList(); - this.nurseStationName = "请选择护理站名称"; + this.nurseStationName = "请选择所属护理站"; this.departmentName = "请选择所属科室"; }); } @@ -1641,9 +1512,9 @@ 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.handleQuery(); @@ -1652,8 +1523,8 @@ export default { }, //滑动下拉框 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 { @@ -1668,24 +1539,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); - // }); - // }); - // } - // } - // }, }, };