From e5ca8bbe26b2983348fd50d8cfc1f5afe9c7adc8 Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Fri, 14 Jul 2023 18:22:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unitGrouping/unitGroupCategory.vue | 6 +- src/views/common-settings/SampleGroup.vue | 19 +++++- src/views/fee-settings/Asbitem.vue | 13 ++-- src/views/fee-settings/Item.vue | 61 ++++++++++++++----- 4 files changed, 72 insertions(+), 27 deletions(-) diff --git a/src/components/unitGrouping/unitGroupCategory.vue b/src/components/unitGrouping/unitGroupCategory.vue index 18a0619..14ca113 100644 --- a/src/components/unitGrouping/unitGroupCategory.vue +++ b/src/components/unitGrouping/unitGroupCategory.vue @@ -224,8 +224,8 @@ export default { ); } // if (this.title == 2) { - // if (!this.personnelUnit.customerOrgGroupId) { - // alert("请先选择单位分组"); + // if (!this.personnelUnit.customerOrgGroupId) { 3a0c563d-cb6a-3638-6e06-651f282e17ca + // alert("请先选择单位分组"); // return; // } else { // console.log(this.personnelUnit.nogroupselected); @@ -268,7 +268,7 @@ export default { // this.title = 2; let count = this.rightselctedata.length - 1; for (var i = count; i >= 0; i--) { - if ([...new Set(this.rightselctedata)]) { + if ([...new Set(this.tabledata)]) { this.tabledata.push(this.rightselctedata[i]); this.personnelUnit.nogroupselected.splice(i, 1); } diff --git a/src/views/common-settings/SampleGroup.vue b/src/views/common-settings/SampleGroup.vue index 99f4500..097c87e 100644 --- a/src/views/common-settings/SampleGroup.vue +++ b/src/views/common-settings/SampleGroup.vue @@ -100,15 +100,28 @@ - + - - + + + + + + + + + + + + diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue index 7c6262c..ac32a5c 100644 --- a/src/views/fee-settings/Asbitem.vue +++ b/src/views/fee-settings/Asbitem.vue @@ -165,12 +165,12 @@ - + - + @@ -638,10 +638,9 @@ export default { // console.log(sdate); if (sampleGroupId == undefined) { this.$message.warning("请选择列表"); - } else if(this.itemid==''){ - this.$message.warning('请选择项目') - } - else { + } else if (this.itemid == "") { + this.$message.warning("请选择项目"); + } else { postapi("/api/app/asbitem-detail/many", sdate).then((res) => { this.$message.success("操作成功"); this.isdislob = true; @@ -714,7 +713,7 @@ export default { gitprojectcategory() { getapi("/api/app/item-type/by-code-all").then((res) => { this.projectid = res.data; - console.log('res项目类别',res); + console.log("res项目类别", res); }); }, //ary1 需要追加的数据 ary2目标数组 diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue index f8c56e9..a5750c0 100644 --- a/src/views/fee-settings/Item.vue +++ b/src/views/fee-settings/Item.vue @@ -130,7 +130,7 @@ :show-all-levels="false" > --> - + - + - + - + + + + + @@ -189,7 +202,7 @@ - + - + - + - + - - + + + + + + - + - + { if (v) { if (this.title == 1) { - this.form.price=Number( this.form.price) + this.form.price = Number(this.form.price); addproject(this.form).then((res) => { this.$message.success("新增成功222"); this.getlist(); this.dialogVisible = false; }); } else if (this.title == 2) { - projectedit(this.form.id, this.form).then((res) => { this.$message.success("修改成功"); this.getlist(); @@ -1605,6 +1629,15 @@ export default { priceitemlist().then((res) => { this.priceItemId = res.data.items; }); + //参考范围 + getapi("/api/app/reference-range").then((res) => { + this.reference = res.data.items; + }); + //结果模板 + getapi("/api/app/item-result-template").then((res) => { + this.resulttemp = res.data.items; + console.log(res, "结果模板"); + }); }, getlist() { this.getlistM();