Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
闫晓茹 2024-03-07 10:13:06 +08:00
commit a35b2860f0

View File

@ -1181,18 +1181,18 @@ export default {
updateBy: null, updateBy: null,
updateTime: null updateTime: null
}; };
this.optionsway=[], this.optionsway = [],
// //
this.optionscontent=[], this.optionscontent = [],
// //
this.optionsfrequency=[ this.optionsfrequency = [
{ {
value: '', value: '',
label: '' label: ''
} }
], ],
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
@ -1286,7 +1286,9 @@ export default {
// //
submitFormadd() { submitFormadd() {
this.form.whetherRelease = 0 this.form.whetherRelease = 0
this.form.voList.forEach(e => { var obj = JSON.parse(JSON.stringify(this.form))
obj.voList.forEach(e => {
if (e.serviceFrequencyText.includes('~')) { if (e.serviceFrequencyText.includes('~')) {
const str = e.serviceFrequencyText; const str = e.serviceFrequencyText;
const parts = str.split('~'); const parts = str.split('~');
@ -1311,7 +1313,7 @@ export default {
this.form.departmentName = this.departmentName this.form.departmentName = this.departmentName
} }
addServicepackage(this.form).then(response => { addServicepackage(obj).then(response => {
this.$modal.msgSuccess("复制成功"); this.$modal.msgSuccess("复制成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -1324,32 +1326,34 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.voList) { if (this.form.voList) {
this.form.voList.forEach(e => { var obj = JSON.parse(JSON.stringify(this.form))
if (e.serviceFrequencyText.includes('~')) { obj.voList.forEach(e => {
const str = e.serviceFrequencyText; if (e.serviceFrequencyText.includes('~')) {
const parts = str.split('~'); const str = e.serviceFrequencyText;
e.serviceFrequencyStart = parts[0]; const parts = str.split('~');
e.serviceFrequencyEnd = parts[1]; e.serviceFrequencyStart = parts[0];
e.serviceFrequencyText = null e.serviceFrequencyEnd = parts[1];
} else { e.serviceFrequencyText = null
e.serviceFrequencyText = e.serviceFrequencyText } else {
} e.serviceFrequencyText = e.serviceFrequencyText
}
if (this.form.id != null) { if (this.form.id != null) {
this.form.departmentName = this.departmentName this.form.departmentName = this.departmentName
this.form.diseaseTypeName = this.diseaseTypeName this.form.diseaseTypeName = this.diseaseTypeName
updateServicepackage(this.form).then(response => { updateServicepackage(obj).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
if (this.diseaseTypeName == "请选择病种") { if (this.diseaseTypeName == "请选择病种") {
this.form.diseaseTypeName == null this.form.diseaseTypeName == null
} else { } else {
this.form.diseaseTypeName = this.diseaseTypeName this.form.diseaseTypeName = this.diseaseTypeName
} }
if (this.itemname) { if (this.itemname) {
this.form.departmentName = this.departmentName this.form.departmentName = this.departmentName
this.form.departmentId = this.itemname this.form.departmentId = this.itemname
@ -1357,7 +1361,7 @@ export default {
this.form.departmentName = this.departmentName this.form.departmentName = this.departmentName
} }
addServicepackage(this.form).then(response => { addServicepackage(obj).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -1367,7 +1371,6 @@ export default {
} }
}) })
} }
} }
}); });
}, },