Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
a35b2860f0
@ -1181,18 +1181,18 @@ export default {
|
||||
updateBy: null,
|
||||
updateTime: null
|
||||
};
|
||||
this.optionsway=[],
|
||||
// 服务内容
|
||||
this.optionsway = [],
|
||||
// 服务内容
|
||||
|
||||
this.optionscontent=[],
|
||||
// 服务频次
|
||||
this.optionsfrequency=[
|
||||
{
|
||||
value: '',
|
||||
label: ''
|
||||
}
|
||||
],
|
||||
this.resetForm("form");
|
||||
this.optionscontent = [],
|
||||
// 服务频次
|
||||
this.optionsfrequency = [
|
||||
{
|
||||
value: '',
|
||||
label: ''
|
||||
}
|
||||
],
|
||||
this.resetForm("form");
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
@ -1286,7 +1286,9 @@ export default {
|
||||
// 复制确定
|
||||
submitFormadd() {
|
||||
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('~')) {
|
||||
const str = e.serviceFrequencyText;
|
||||
const parts = str.split('~');
|
||||
@ -1311,7 +1313,7 @@ export default {
|
||||
this.form.departmentName = this.departmentName
|
||||
|
||||
}
|
||||
addServicepackage(this.form).then(response => {
|
||||
addServicepackage(obj).then(response => {
|
||||
this.$modal.msgSuccess("复制成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
@ -1324,32 +1326,34 @@ export default {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.voList) {
|
||||
this.form.voList.forEach(e => {
|
||||
if (e.serviceFrequencyText.includes('~')) {
|
||||
const str = e.serviceFrequencyText;
|
||||
const parts = str.split('~');
|
||||
e.serviceFrequencyStart = parts[0];
|
||||
e.serviceFrequencyEnd = parts[1];
|
||||
e.serviceFrequencyText = null
|
||||
} else {
|
||||
e.serviceFrequencyText = e.serviceFrequencyText
|
||||
}
|
||||
var obj = JSON.parse(JSON.stringify(this.form))
|
||||
obj.voList.forEach(e => {
|
||||
if (e.serviceFrequencyText.includes('~')) {
|
||||
const str = e.serviceFrequencyText;
|
||||
const parts = str.split('~');
|
||||
e.serviceFrequencyStart = parts[0];
|
||||
e.serviceFrequencyEnd = parts[1];
|
||||
e.serviceFrequencyText = null
|
||||
} else {
|
||||
e.serviceFrequencyText = e.serviceFrequencyText
|
||||
}
|
||||
|
||||
if (this.form.id != null) {
|
||||
this.form.departmentName = this.departmentName
|
||||
this.form.diseaseTypeName = this.diseaseTypeName
|
||||
updateServicepackage(this.form).then(response => {
|
||||
updateServicepackage(obj).then(response => {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
});
|
||||
} else {
|
||||
|
||||
if (this.diseaseTypeName == "请选择病种") {
|
||||
this.form.diseaseTypeName == null
|
||||
} else {
|
||||
this.form.diseaseTypeName = this.diseaseTypeName
|
||||
}
|
||||
if (this.itemname) {
|
||||
|
||||
this.form.departmentName = this.departmentName
|
||||
this.form.departmentId = this.itemname
|
||||
|
||||
@ -1357,7 +1361,7 @@ export default {
|
||||
this.form.departmentName = this.departmentName
|
||||
|
||||
}
|
||||
addServicepackage(this.form).then(response => {
|
||||
addServicepackage(obj).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
@ -1367,7 +1371,6 @@ export default {
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user