diff --git a/src/views/basic-dictionary/CustomerOrgType.vue b/src/views/basic-dictionary/CustomerOrgType.vue index f196434..8c36d72 100644 --- a/src/views/basic-dictionary/CustomerOrgType.vue +++ b/src/views/basic-dictionary/CustomerOrgType.vue @@ -326,13 +326,17 @@ export default { this.dialogVisible = false; }); } else if (this.title == 2) { - edatcustomer(this.form.id, { - displayName: this.form.displayName, - }).then((res) => { - this.$message.success("修改成功"); - this.getlist(); - this.dialogVisible = false; - }); + if (this.form.displayName == "") { + this.$message.warning("请输入名称"); + } else { + edatcustomer(this.form.id, { + displayName: this.form.displayName, + }).then((res) => { + this.$message.success("修改成功"); + this.getlist(); + this.dialogVisible = false; + }); + } } } }, diff --git a/src/views/basic-dictionary/ItemDefaultResult.vue b/src/views/basic-dictionary/ItemDefaultResult.vue index 48a7afa..b2fc4dc 100644 --- a/src/views/basic-dictionary/ItemDefaultResult.vue +++ b/src/views/basic-dictionary/ItemDefaultResult.vue @@ -324,13 +324,18 @@ export default { } ); } else if (this.title == 2) { - editprojectresult(this.form.id, { - displayName: this.form.displayName, - }).then((res) => { - this.$message.success("修改成功"); - this.getlist(); - this.dialogVisible = false; - }); + console.log(this.form.displayName); + if (this.form.displayName == "") { + this.$message.warning("请输入名称"); + } else { + editprojectresult(this.form.id, { + displayName: this.form.displayName, + }).then((res) => { + this.$message.success("修改成功"); + this.getlist(); + this.dialogVisible = false; + }); + } } } }, diff --git a/src/views/basic-dictionary/MedicalReportType.vue b/src/views/basic-dictionary/MedicalReportType.vue index f6b781c..35cd573 100644 --- a/src/views/basic-dictionary/MedicalReportType.vue +++ b/src/views/basic-dictionary/MedicalReportType.vue @@ -430,17 +430,22 @@ export default { }); } } else if (this.title == 2) { - reportupdates(this.form.id, { - displayName: this.form.displayName, - displayOrder: this.form.displayOrder, - }).then((res) => { - if (res.code == 1) { - this.dialogVisible = false; - this.$message.success("修改成功"); - this.getlist(); - } - console.log(res); - }); + if (this.form.displayName == "") { + this.$message.warning("请输入名称"); + } else { + reportupdates(this.form.id, { + displayName: this.form.displayName, + displayOrder: this.form.displayOrder, + }).then((res) => { + if (res.code == 1) { + this.dialogVisible = false; + this.$message.success("修改成功"); + this.getlist(); + } + console.log(res); + }); + } + // console.log('1111'); } }, @@ -448,7 +453,7 @@ export default { addll() { this.dialogVisible = true; this.title = 1; - this.form={} + this.form = {}; }, //获取列表 getlist() { diff --git a/src/views/basic-dictionary/PersonnelType.vue b/src/views/basic-dictionary/PersonnelType.vue index 81e644a..485b330 100644 --- a/src/views/basic-dictionary/PersonnelType.vue +++ b/src/views/basic-dictionary/PersonnelType.vue @@ -340,13 +340,18 @@ export default { this.dialogVisible = false; }); } else if (this.title == 2) { - personnelmodif(this.form.id, { - displayName: this.form.displayName, - }).then((res) => { - this.$message.success("修改成功"); - this.getlist(); - this.dialogVisible = false; - }); + if (this.form.displayName == "") { + console.log(this.form.displayName); + this.$message.warning("请输入名称"); + } else { + personnelmodif(this.form.id, { + displayName: this.form.displayName, + }).then((res) => { + this.$message.success("修改成功"); + this.getlist(); + this.dialogVisible = false; + }); + } } } }, diff --git a/src/views/common-settings/SampleGroup.vue b/src/views/common-settings/SampleGroup.vue index a8bc64d..25eb623 100644 --- a/src/views/common-settings/SampleGroup.vue +++ b/src/views/common-settings/SampleGroup.vue @@ -11,7 +11,7 @@ border:stripe="true" @row-click="rowick" highlight-current-row - height="240" + height="" > @@ -128,7 +128,8 @@ 确 定 - + 项目类别 +
@@ -425,6 +427,7 @@ export default { //左侧添加按钮 addobj() { if (this.ites.length > 0) { + this.isdislob = false; this.ites.splice(this.num, 1); this.rightdata.push(this.rightobj); // this.sdate.push({ id: this.leftobj.id }); @@ -481,7 +484,7 @@ export default { //科室选择 ischangs(v) { itemtypeid(v).then((res) => { - this.ites=res.data + this.ites = res.data; let dq = res.data; if (dq.length > 0) { dq.forEach((element) => { @@ -521,7 +524,7 @@ export default { // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置 result.push({ id: item.id, displayOrder: currentDisplayOrder }); } - }); + }); // console.log('assertion', result); barcodedraganddrop({ itemList: result }).then((res) => { this.$message.success("操作成功"); diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue index ac32a5c..ad05dd3 100644 --- a/src/views/fee-settings/Asbitem.vue +++ b/src/views/fee-settings/Asbitem.vue @@ -273,7 +273,7 @@ 确 定 - 项目类别 { - this.itemTypeId = res.data.items; + this.itemTypeId = res.data; }); //仪器类别 instrumentlist().then((res) => { diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue index d319e34..b5f99a6 100644 --- a/src/views/fee-settings/Item.vue +++ b/src/views/fee-settings/Item.vue @@ -186,7 +186,20 @@ - + + + + + @@ -1183,6 +1196,24 @@ export default { name: "", }, ], + defaultResult: [ + { + value: "1", + label: "未见异常", + }, + { + value: "2", + label: "正常", + }, + { + value: "3", + label: "阴性", + }, + { + value: "4", + label: "无", + }, + ], //默认结果 ssdate: [], fssubdex: "", resultitemtype: [], //项目类别 @@ -1204,12 +1235,11 @@ export default { //启用诊断函数 enablediagnostics(v) { console.log(v); - if (v == 'N') { + if (v == "N") { this.disableddiagnosisFunction = true; - }else{ - this.disableddiagnosisFunction = false; + } else { + this.disableddiagnosisFunction = false; } - }, //参考范围确定类型 determinetype() { @@ -1423,7 +1453,6 @@ export default { this.$message.warning("请选择操作的数据"); } else { this.referencerangedialogVisible = true; - console.log("11111111"); } }, //结果模板添加或者修改需要的列