diff --git a/src/views/system/classifyItem/index.vue b/src/views/system/classifyItem/index.vue index 2e6bb41..978bcf8 100644 --- a/src/views/system/classifyItem/index.vue +++ b/src/views/system/classifyItem/index.vue @@ -508,8 +508,8 @@ export default { }, /** 提交按钮 */ submitForm() { - console.log(this.form); - this.$refs["form"].validate((valid) => { + this.form.classifySort = Number(this.form.classifySort); + this.$refs["form"].validate(valid => { if (valid) { if (this.form.id != null) { updateInfo(this.form).then((response) => { @@ -523,7 +523,6 @@ export default { this.getList(); }); } else { - addInfo(this.form).then((response) => { this.$modal.msgSuccess("新增成功"); this.open = false; @@ -539,7 +538,7 @@ export default { console.log(row); this.$modal .confirm("是否确认删除?") - .then(function () { + .then(function() { return delInfo(ids); }) .then(() => { @@ -553,11 +552,11 @@ export default { this.download( "classify/info/export", { - ...this.queryParams, + ...this.queryParams }, `info_${new Date().getTime()}.xlsx` ); - }, - }, + } + } }; diff --git a/src/views/system/poser/index.vue b/src/views/system/poser/index.vue index 563e1c7..00bc426 100644 --- a/src/views/system/poser/index.vue +++ b/src/views/system/poser/index.vue @@ -199,7 +199,7 @@ { - obj.pictureUrlList.push(e.posterPictureUrl); - }); - } - console.log(this.deletNewImgs) - if(obj.pictureUrlList.length>0){ - updatePicture({pictureUrlList:this.deletNewImgs}).then((res) => { + if (this.form.posterPictureUrlLists) { + this.form.posterPictureUrlLists.forEach(e => { + obj.pictureUrlList.push(e.posterPictureUrl); + }); + } + console.log(this.deletNewImgs); + if (obj.pictureUrlList.length > 0) { + updatePicture({ pictureUrlList: this.deletNewImgs }).then(res => { this.open = false; }); - } - this.deletNewImgs=[], - + } + this.deletNewImgs = []; this.nurseItemquery.nurseStationId = null; this.imgs = { pictureUrlList: [] }; this.open = false; @@ -875,6 +868,7 @@ export default { nurseItemName: "请选择所属护理项目", nurseItemId: null }; + this.deletNewImgs = []; this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -885,7 +879,6 @@ export default { resetQuery() { this.nurseItemquery.pageNum = 1; this.nurseItemquery.pageSize = 10; - // this.stationid = ""; this.nurseitemid = ""; this.queryParams.pageNum = 1; this.queryParams.pageSize = 10; @@ -928,28 +921,17 @@ export default { }, /** 提交按钮 */ submitForm() { - this.$refs["form"].validate((valid) => { + this.$refs["form"].validate(valid => { if (valid) { if (this.form.id != null) { - updatePoser(this.form).then((response) => { - // var obj = { pictureUrlList: [] }; - // var obj = { pictureUrlList: [] }; - // if (this.form.posterPictureUrlLists) { - // this.form.posterPictureUrlLists.forEach((e) => { - // obj.pictureUrlList.push(e.posterPictureUrl); - // }); - // } - - // updatePicture(obj).then((res) => { - // this.open = false; - // }); + updatePoser(this.form).then(response => { + var obj = { pictureUrlList: [] }; this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { - - addPoser(this.form).then((response) => { + addPoser(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); diff --git a/src/views/system/stationItem/index.vue b/src/views/system/stationItem/index.vue index 8490fa6..86733c0 100644 --- a/src/views/system/stationItem/index.vue +++ b/src/views/system/stationItem/index.vue @@ -704,7 +704,7 @@ export default { classifyName: "请选择护理项目分类", nurseClassifyId: "", appointmentLimitCount: null, - appointmentTimeInterval: "", + appointmentTimeInterval: "" } }, idd: 1, @@ -999,7 +999,7 @@ export default { nurseStationName: "请选择所属护理站", classifyName: "请选择护理项目分类", nurseClassifyId: "", - appointmentLimitCount: null, + appointmentLimitCount: null }, nurseStationItemConsumables: [ // { @@ -1064,7 +1064,7 @@ export default { this.StationConsumablequeryParams.nurseStationId = response.data.nurseStationItem.nurseStationId; this.imgone = this.form.nurseStationItem.itemPictureUrl; - if (this.form.nurseStationItemPrices.length==0) { + if (this.form.nurseStationItemPrices.length == 0) { var obj = { serveDurationUnit: "", price: "", @@ -1072,7 +1072,7 @@ export default { idd: this.idd }; this.form.nurseStationItemPrices.push(obj); - } + } this.open = true; this.title = "修改护理站护理项目"; }); @@ -1086,11 +1086,6 @@ export default { this.form.nurseStationItem.nurseTypeId = this.form.nurseTypeId; this.$refs["form"].validate(valid => { if (valid) { - if( this.form.nurseStationItem.appointmentLimitCount=""){ - this.form.nurseStationItem.appointmentLimitCount=null - }else{ - this.form.nurseStationItem.appointmentLimitCount = parseInt(this.form.nurseStationItem.appointmentLimitCount) - } if (this.form.nurseStationItem.id != null) { this.form.nurseStationItemPrices.forEach(e => { e.nurseStationItemId = this.form.nurseStationItem.id; @@ -1106,18 +1101,15 @@ export default { this.form.nurseStationItemPrices.forEach(e => { e.price = Number(e.price); }); - updateNurseItem(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { - this.form.nurseStationItemPrices.forEach(e => { e.price = Number(e.price); }); - addNurseItem(this.form).then(response => { this.$modal.msgSuccess("新增成功"); this.$forceUpdate();