From 95f312a63ff50381314f28f10c4179b925c074d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Fri, 17 Feb 2023 17:00:53 +0800 Subject: [PATCH] =?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/views/system/station/stationjs.js | 85 +++++++++++----------- src/views/system/stationClassify/index.vue | 10 ++- src/views/system/stationItem/index.vue | 68 +++++++++-------- 3 files changed, 87 insertions(+), 76 deletions(-) diff --git a/src/views/system/station/stationjs.js b/src/views/system/station/stationjs.js index d1b81d2..5daef87 100644 --- a/src/views/system/station/stationjs.js +++ b/src/views/system/station/stationjs.js @@ -17,31 +17,31 @@ export default { components: { stationAcatar, editor }, name: "Station", data() { - var checkMobile = (rule, value, cb) => { - // 验证手机号的正则表达式 - 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("请输入正确的联系电话")); - }; + // var checkMobile = (rule, value, cb) => { + // // 验证手机号的正则表达式 + // 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("请输入正确的联系电话")); + // }; // 验证手机号的规则 - var checkMobile2 = (rule, value, cb) => { - // 验证手机号的正则表达式 - const regMobile = - /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/; - if (!value) { - //所以当没有值的时候,我们直接callback,让他不校验直接执行下一步 - return cb(); - } else { - if (regMobile.test(value)) { - return cb(); - } else { - cb(new Error("请输入正确的联系电话")); - } - } - }; + // var checkMobile2 = (rule, value, cb) => { + // // 验证手机号的正则表达式 + // const regMobile = + // /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/; + // if (!value) { + // //所以当没有值的时候,我们直接callback,让他不校验直接执行下一步 + // return cb(); + // } else { + // if (regMobile.test(value)) { + // return cb(); + // } else { + // cb(new Error("请输入正确的联系电话")); + // } + // } + // }; return { imgsurl: { pictureUrlList: [] }, imageUrl: "", @@ -124,12 +124,12 @@ export default { resid: null, // 表单校验 rules: { - morningOpenStartTime: [ - { required: true, message: "请选择上午营业时间", trigger: "blur" }, - ], - afternoonOpenStartTime: [ - { required: true, message: "请选择下午营业时间", trigger: "blur" }, - ], + // morningOpenStartTime: [ + // { required: true, message: "请选择上午营业时间", trigger: "blur" }, + // ], + // afternoonOpenStartTime: [ + // { required: true, message: "请选择下午营业时间", trigger: "blur" }, + // ], agencyIntroduce: [ { required: true, message: "请输入护理站简介", trigger: "blur" }, ], @@ -144,15 +144,15 @@ export default { ], phone: [{ required: true, - validator: checkMobile, + // validator: checkMobile, trigger: "blur", - message: "", + message: "请输入手机号", },], dutyPhone: [{ - validator: checkMobile2, + // validator: checkMobile2, trigger: "blur", - message: "", + message: "请输入联系电话", },], sort: [{ required: true, message: "排序不能为空", trigger: "blur" }], address: [{ required: true, message: "地址不能为空", trigger: "blur" }], @@ -358,6 +358,7 @@ export default { let classify = this.classifylist.find(d => d.id == f) this.form.classifyNameList += classify.classifyName + "," }) + this.form.classifyNameList = this.form.classifyNameList.substring(0, this.form.classifyNameList.length - 1) } this.cancelClassifyshow(); }, @@ -455,14 +456,14 @@ export default { /** 提交按钮 */ submitForm() { // this.form.classifyNameList=this.form.classifyName - this.form.afternoonOpenStartTime = this.form.afternoonOpenStartTime + ':00' - this.form.afternoonOpenStartTime = this.form.afternoonOpenStartTime.slice(0, 8) - this.form.afternoonOpenEndTime = this.form.afternoonOpenEndTime + ':00' - this.form.afternoonOpenEndTime = this.form.afternoonOpenEndTime.slice(0, 8) - this.form.morningOpenEndTime = this.form.morningOpenEndTime + ':00' - this.form.morningOpenEndTime = this.form.morningOpenEndTime.slice(0, 8) - this.form.morningOpenStartTime = this.form.morningOpenStartTime + ':00' - this.form.morningOpenStartTime = this.form.morningOpenStartTime.slice(0, 8) + // this.form.afternoonOpenStartTime = this.form.afternoonOpenStartTime + ':00' + // this.form.afternoonOpenStartTime = this.form.afternoonOpenStartTime.slice(0, 8) + // this.form.afternoonOpenEndTime = this.form.afternoonOpenEndTime + ':00' + // this.form.afternoonOpenEndTime = this.form.afternoonOpenEndTime.slice(0, 8) + // this.form.morningOpenEndTime = this.form.morningOpenEndTime + ':00' + // this.form.morningOpenEndTime = this.form.morningOpenEndTime.slice(0, 8) + // this.form.morningOpenStartTime = this.form.morningOpenStartTime + ':00' + // this.form.morningOpenStartTime = this.form.morningOpenStartTime.slice(0, 8) this.form.nurseStationLabelList = this.looknurseStationLabel; this.form.nurseStationType = this.nurseStationType2; this.$refs["form"].validate((valid) => { diff --git a/src/views/system/stationClassify/index.vue b/src/views/system/stationClassify/index.vue index 8a6bf7a..4bd3c12 100644 --- a/src/views/system/stationClassify/index.vue +++ b/src/views/system/stationClassify/index.vue @@ -514,9 +514,15 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const ids = row.id || this.ids; + const ids = row.id ? [row.id] : this.ids; + let names = ""; + ids.forEach((id) => { + let selected = this.stationClassifyList.find((f) => f.id == id); + names += selected.classifyName + ","; + }); + names = names.substring(0, names.length - 1); this.$modal - .confirm('是否确认删除护理机构分类信息编号为"' + ids + '"的数据项?') + .confirm('是否确认删除护理机构分类名称为"' + names + '"的数据项?') .then(function () { return delStationClassify(ids); }) diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue index 5d68005..fda3280 100644 --- a/src/views/system/stationItem/index.vue +++ b/src/views/system/stationItem/index.vue @@ -292,24 +292,25 @@ maxlength="50" /> - - - - - - - - + + + + + + + + + @@ -331,20 +333,22 @@ - - - - - - + + + + + +