From 9aa3335264341ff3716edeeaca0b447147bb780f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 26 Sep 2022 11:37:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/order.js | 12 +++++++----- src/views/system/order/index.vue | 9 +++++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/api/system/order.js b/src/api/system/order.js index 9755fc4..34cf624 100644 --- a/src/api/system/order.js +++ b/src/api/system/order.js @@ -2,23 +2,25 @@ import request from '@/utils/request' // 查询护理类型信息列表 export function appointmentOrderDetailsList(query) { return request({ - url: '/system/appointmentOrderDetails/appointmentOrderDetailsList', + url: 'system/appointmentOrder/list', method: 'get', params: query }) } + export function Detailed(id) { return request({ url: `/system/appointmentOrderDetails/Detailed`+`?orderNo=${id}`, method: 'get', - + }) } //删除 -export function deldetailed(id) { +export function deldetailed(appointmentOrderId) { return request({ - url: '/system/appointmentOrderDetails/' + id, - method: 'delete' + url: '/system/appointmentOrder/'+appointmentOrderId, + method: 'post', + }) } diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue index 588f6bc..b80ecf2 100644 --- a/src/views/system/order/index.vue +++ b/src/views/system/order/index.vue @@ -318,7 +318,6 @@ export default { break; } }, - seeLook(row) { this.innerVisible4 = true; const id = row.orderNo; @@ -371,8 +370,9 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { + // console.log('row :>> ', row); this.$confirm( - '是否确认删除订单编号为"' + row.orderNo + '"的数据项？', + '是否确认删除订单信息的数据项？', "提示", { confirmButtonText: "确定", @@ -381,9 +381,10 @@ export default { } ) .then(() => { - deldetailed(row.appointOrderDetailsId).then((res) => { + deldetailed(row.appointmentOrderId).then((res) => { this.$message.success("删除成功"); this.getList(); + // console.log('this.OrderDetailsList :>> ', this.OrderDetailsList); }); }) .catch(() => {}); @@ -406,4 +407,4 @@ export default { height: 500px; overflow-y: scroll; } - \ No newline at end of file + From c6494148b7df6658de0c67c9f35dbeffc9f1ab7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 26 Sep 2022 13:49:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8A=A4=E7=90=86?= =?UTF-8?q?=E7=AB=99=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF=E7=9A=84=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/StationDepartment/index.vue | 39 +++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/views/system/StationDepartment/index.vue b/src/views/system/StationDepartment/index.vue index 5c1d409..b5e41b5 100644 --- a/src/views/system/StationDepartment/index.vue +++ b/src/views/system/StationDepartment/index.vue @@ -8,7 +8,7 @@ v-show="showSearch" label-width="68px" > - - { + // 验证手机号的正则表达式 + const regMobile = + /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/; + if (regMobile.test(value)) { + return cb(); + } + cb(new Error("请输入正确的联系电话")); + }; return { nurseStationlist: [], // 遮罩层 @@ -379,7 +389,7 @@ export default { // 总条数 total: 0, total2: 0, - + // 护理站部门信息表格数据 StationDepartmentList: [], // 弹出层标题 @@ -438,12 +448,13 @@ export default { }, ], phone: [ - { - required: true, - message: "请选择联系电话", - trigger: "blur", - }, - ], + { + required: true, + validator: checkMobile, + trigger: "blur", + message: "", + }, + ], }, nurseStationId: [ { @@ -469,14 +480,15 @@ export default { phone: [ { required: true, - message: "请选择联系电话", + validator: checkMobile, trigger: "blur", + message: "", }, ], }, }; }, - + created() { this.getList(); // this.listinfo(); @@ -514,7 +526,7 @@ export default { nurseinfo() { this.nurseStationId = row.nurseStationId; }, - + //滑动下拉框 loadMore() { var a = Math.ceil(this.total2 / 10); @@ -628,6 +640,7 @@ export default { this.nurseStationlist = res.rows; this.queryParams.nurseStationId = res.rows[0].id; this.handleQuery(); + console.log(this.queryParams) } }); }, @@ -678,7 +691,7 @@ export default { handleDelete(row) { const ids = row.id || this.ids; this.$modal - .confirm('是否确认删除护理站部门信息编号为"' + ids + '"的数据项？') + .confirm('是否确认删除护理站部门信息的数据项？') .then(function () { return delStationDepartment(ids); }) From e15afdbbf96c83234a40ed99e572fd13a93f77d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 26 Sep 2022 14:04:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 0c10672..bebcbe3 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -21,7 +21,7 @@ - --> +