diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue index 3052b5f..db8341c 100644 --- a/src/views/system/hospital/index.vue +++ b/src/views/system/hospital/index.vue @@ -119,16 +119,17 @@ - + - + - + @@ -161,16 +162,16 @@ export default { components: { editor }, name: "Hospital", 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("请输入正确的联系电话")); + // }; return { // 遮罩层 loading: true, @@ -223,7 +224,7 @@ export default { phone: [ { required: true, - validator: checkMobile, + // validator: checkMobile, message: "", trigger: "blur", }, diff --git a/src/views/system/hospitalDepartment/index.vue b/src/views/system/hospitalDepartment/index.vue index 848fc88..00a45f4 100644 --- a/src/views/system/hospitalDepartment/index.vue +++ b/src/views/system/hospitalDepartment/index.vue @@ -8,7 +8,6 @@ v-show="showSearch" label-width="68px" > - @@ -220,6 +220,7 @@ style="width: 250px" v-model="item.departmentName" placeholder="请输入科室名称" + maxlength="50" /> @@ -241,6 +243,7 @@ > @@ -252,6 +255,7 @@ > @@ -262,10 +266,11 @@ :prop="`hospitalDepartmentInfoList.${index}.departmentSort`" > - - + + @@ -429,6 +446,7 @@ @@ -438,11 +456,13 @@ v-model="form.departmentAddress" placeholder="请输入科室地址" style="width: 250px" + maxlength="300" /> { - // 验证手机号的正则表达式 - 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("请输入正确的联系电话")); + // }; return { // 遮罩层 loading: true, @@ -489,8 +509,8 @@ export default { hospitalqueryParams: { pageNum: 1, pageSize: 10, - hospitalCode:"", - hospitalName:"", + hospitalCode: "", + hospitalName: "", }, infolist: [], // 非单个禁用 @@ -568,7 +588,7 @@ export default { departmentPhone: [ { required: true, - validator: checkMobile, + // validator: checkMobile, trigger: "blur", message: "", }, @@ -599,7 +619,7 @@ export default { departmentPhone: [ { required: true, - validator: checkMobile, + // validator: checkMobile, trigger: "blur", message: "", }, @@ -617,10 +637,8 @@ export default { required: true, message: "请输入科室显示顺序", trigger: "blur", - message: "", }, ], - }, }; }, @@ -647,11 +665,10 @@ export default { // this.form.hospitalName = row.hospitalName; // this.form.hospitalId = row.id; // } else { - this.form.hospitalDepartmentInfoList[ - this.nnerVisibleindex - ].hospitalName = row.hospitalName; - this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalId = - row.id; + this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalName = + row.hospitalName; + this.form.hospitalDepartmentInfoList[this.nnerVisibleindex].hospitalId = + row.id; // } this.innerVisible = false; }, @@ -694,8 +711,8 @@ export default { this.hospitalqueryParams = { pageNum: 1, pageSize: 10, - hospitalCode:"", - hospitalName:"", + hospitalCode: "", + hospitalName: "", }; this.info(); }, @@ -709,9 +726,9 @@ export default { }); }, info() { - list(this.hospitalqueryParams,).then((response) => { + list(this.hospitalqueryParams).then((response) => { this.infolist = response.rows; - console.log(this.infolist) + console.log(this.infolist); this.total2 = response.total; this.loading = false; }); @@ -751,9 +768,9 @@ export default { this.queryParams = { pageNum: 1, pageSize: 10, - hospitalName:"", - departmentCode:"", - departmentName:"", + hospitalName: "", + departmentCode: "", + departmentName: "", }; this.handleQuery(); }, @@ -804,7 +821,7 @@ export default { handleDelete(row) { const ids = row.id || this.ids; this.$modal - .confirm('是否确认删除此科室的信息?') + .confirm("是否确认删除此科室的信息?") .then(function () { return delHospitalDepartment(ids); }) diff --git a/src/views/system/hospitalPerson/index.vue b/src/views/system/hospitalPerson/index.vue index 566f08e..d3eb763 100644 --- a/src/views/system/hospitalPerson/index.vue +++ b/src/views/system/hospitalPerson/index.vue @@ -32,6 +32,7 @@ v-model="queryParams.personPhone" placeholder="请输入联系电话" clearable + oninput="value=value.replace(/[^\d]/g,'')" @keyup.enter.native="handleQuery" /> @@ -257,6 +258,7 @@ @@ -293,7 +295,7 @@ @@ -335,7 +337,7 @@ :prop="`hospitalPersonCertificateList.${index}.certificateName`" > @@ -347,7 +349,7 @@ :prop="`hospitalPersonCertificateList.${index}.certificateUrl`" > - - - - - {{ form.hospitalName }} - {{ form.hospitalName }} - - - {{ form.departmentName }} - {{ form.departmentName }} - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
-
- -
- - - - - @@ -1071,18 +643,18 @@ export default { } }; // 验证手机号的规则 - // 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}$/; - // // /^((0\\d{2,3}(-)?\\d{7,8})|((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[2567]{1})(17[0-9]{1})|(18[0-9]{1})|(19[0-9]{1}))+\\d{8})$/; - // /^((0\d{2,3}(-)?\d{7,8})|(13[0-9]|14[0-9]|15[0-9]|16[2567]|17[0-9]|18[0-9]|19[0-9])+\d{8})$/; + 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}$/; + // /^((0\\d{2,3}(-)?\\d{7,8})|((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[2567]{1})(17[0-9]{1})|(18[0-9]{1})|(19[0-9]{1}))+\\d{8})$/; + /^((0\d{2,3}(-)?\d{7,8})|(13[0-9]|14[0-9]|15[0-9]|16[2567]|17[0-9]|18[0-9]|19[0-9])+\d{8})$/; - // if (regMobile.test(value)) { - // return cb(); - // } - // cb(new Error("请输入正确的联系电话")); - // }; + if (regMobile.test(value)) { + return cb(); + } + cb(new Error("请输入正确的联系电话")); + }; return { // 遮罩层 loading: true, @@ -1136,11 +708,14 @@ export default { // 弹出层标题 title: "", deletNewImgs: [], + NewImgs:[], + objitempicture:[], objitem: [], // 是否显示弹出层 open: false, addopen: false, homenumber: false, + deletupdata:[], // 查询参数 queryParams: { pageNum: 1, @@ -1237,7 +812,7 @@ export default { personPhone: [ { required: true, - // validator: checkMobile, + validator: checkMobile, message: "请输入联系电话", trigger: "blur", }, @@ -1312,7 +887,7 @@ export default { personPhone: [ { required: true, - // validator: checkMobile, + validator: checkMobile, message: "11", trigger: "blur", }, @@ -1399,11 +974,17 @@ export default { this.form.certificateUrl = items.certificateUrl; } }, - imgUrl(imgUrl) { + console.log(imgUrl, "新上传"); + this.form.certificateUrl = imgUrl; + this.deletupdata.push(imgUrl); + console.log(this.deletupdata) + }, + imgUrl2(imgUrl) { console.log(imgUrl, "新上传"); this.form.personPictureUrl = imgUrl; this.deletUploadImages.push(imgUrl); + console.log( this.deletUploadImages) }, nurseclick(row) { @@ -1420,12 +1001,6 @@ export default { this.innerVisible = false; // this.stationcancel(); }, - // nurseclickxg(row) { - // console.log(row); - // this.form.hospitalName = row.hospitalName; - // this.hospitalId = row.id; - // this.innerVisiblexg = false; - // }, // 科室 departmentclick(row) { console.log(row); @@ -1442,28 +1017,16 @@ export default { } this.innerVisibledepartment = false; }, - // departmentclickxg(row) { - // console.log(row); - // this.form.departmentName = row.departmentName; - // this.departmentId = row.id; - // // } - // this.innerVisibledepartmentxg = false; - // }, + //医院关闭 innerVisiblecancel() { this.innerVisible = false; }, - - // innerVisiblecancelxg() { - // this.innerVisiblexg = false; - // }, //科室关闭 innerVisiblecanceldepart() { this.innerVisibledepartment = false; }, - // innerVisiblecanceldepartxg() { - // this.innerVisibledepartmentxg = false; - // }, + //删除deldisease deldisease(index) { this.form.hospitalPersonCertificateList.splice(index, 1); @@ -1504,16 +1067,10 @@ export default { this.hospitalId = this.form.hospitalId; } }, - // // 修改医院按钮 - // clickinnerVisiblexg() { - // this.addresetQuery(); - // this.innerVisiblexg = true; - // }, //新增科室按钮 clicklist(item) { this.homenumber = item; if (this.homenumber) { - // 为查询页面时 this.hospitalId = this.queryParams.hospitalId; } else { this.hospitalId = this.form.hospitalId; @@ -1572,13 +1129,19 @@ export default { if (this.deletUploadImages.length > 0) { updatePicture({ pictureUrlList: this.deletUploadImages }).then( (res) => { - this.open = false; + } + ); + } + console.log("11111",this.NewImgs) + if (this.deletupdata.length > 0) { + updatePicture({ pictureUrlList: this.deletupdata }).then( + (res) => { + } ); } this.imgsurl = { pictureUrlList: [] }; this.addopen = false; - this.open = false; this.reset(); }, // 表单重置 @@ -1614,6 +1177,8 @@ export default { ], }; this.deletUploadImages = []; + + this.deletupdata = []; // this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -1666,7 +1231,7 @@ export default { getHospitalPerson(id).then((response) => { this.form = response.data; this.imgone = this.form.certificateUrl; - this.open = true; + this.addopen = true; this.title = "修改科室人员信息"; }); }, @@ -1681,7 +1246,7 @@ export default { if (this.form.id != null) { updateHospitalPerson(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); - this.open = false; + this.addopen = false; this.getList(); }); } else { diff --git a/src/views/system/settings/index.vue b/src/views/system/settings/index.vue index f3e9973..3958d11 100644 --- a/src/views/system/settings/index.vue +++ b/src/views/system/settings/index.vue @@ -437,7 +437,7 @@ export default { settingsName: [ { required: true, - message: "请输入系统设置名称", + message: "请输入规则名称", trigger: "blur", }, ], @@ -451,7 +451,7 @@ export default { settingsType: [ { required: true, - message: "请选择系统设置类型", + message: "请选择规则类型", trigger: "blur", }, ], @@ -487,14 +487,7 @@ export default { }, }; }, - // computed: { - // label() { - // let label = "积分数量"; - // if (this.form.settingsType == "INVITE_FRIENDS") label = "邀请好友次数"; - // if (this.form.settingsType == "SIGN_IN_RULE") label = "赠送积分数量"; - // return label; - // }, - // }, + created() { this.getList(); @@ -594,6 +587,7 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { + console.log(row) const ids = row.id || this.ids; const settingsNames=row.settingsName||this.settingsNames this.$modal diff --git a/src/views/system/stationAvatar/index.vue b/src/views/system/stationAvatar/index.vue index 0b6d6e1..09a9d38 100644 --- a/src/views/system/stationAvatar/index.vue +++ b/src/views/system/stationAvatar/index.vue @@ -80,6 +80,7 @@
+