From e6ebe0e35d52cacf5af58f82abbdbe5829991836 Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Mon, 10 Jul 2023 19:21:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BD=95=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unitGrouping/unitGroupCategory.vue | 60 ++++++++++--------- src/utlis/mm.js | 3 +- src/views/basic-dictionary/GuideType.vue | 2 + .../basic-dictionary/MedicalConclusion.vue | 8 ++- src/views/basic-dictionary/Nation.vue | 27 +++++---- src/views/fee-settings/Asbitem.vue | 5 +- src/views/fee-settings/Diagnosis.vue | 3 +- src/views/fee-settings/Item.vue | 12 ++-- src/views/login/Login.vue | 4 +- 9 files changed, 75 insertions(+), 49 deletions(-) diff --git a/src/components/unitGrouping/unitGroupCategory.vue b/src/components/unitGrouping/unitGroupCategory.vue index 1b4e6b5..c1e5201 100644 --- a/src/components/unitGrouping/unitGroupCategory.vue +++ b/src/components/unitGrouping/unitGroupCategory.vue @@ -74,8 +74,7 @@ @@ -175,10 +174,8 @@ export default { }, methods: { inputchang(row, newVal) { - console.log(row); - console.log(newVal); - // this.price = v.price; - // console.log(this.price); + this.price = row.price; + console.log(this.price); }, //保存按钮 Onsubmit() { @@ -186,6 +183,7 @@ export default { alert("请先选择单位分组"); return; } else { + console.log(this.personnelUnit.nogroupselected); postapi("/api/app/customer-org-group-detail/many", this.addrulst).then( (res) => { this.$message.success("操作成功"); @@ -213,6 +211,8 @@ export default { if (this.personnelUnit.form.id == "") { alert("请先选择单位类别"); } else { + // 让按钮恢复禁用 + this.saveornot = false; //personnelUnit.nogroupselected if (this.rightselctedata.length == 0) { this.$message.warning("已选数据为空无法移动"); @@ -220,21 +220,19 @@ export default { let count = this.rightselctedata.length - 1; for (var i = count; i >= 0; i--) { // this.personnelUnit.nogroupselected.splice(i, 1); - // !this.rightselctedata.includes(this.rightselctedata[i].displayName) [...new Set(this.rightselctedata)]; - this.tabledata.push(this.rightselctedata[i]); this.personnelUnit.nogroupselected.splice(i, 1); - // this.tabledata.push(this.rightselctedata[i]); } + console.log(this.personnelUnit.customerOrgGroupId); + // this. this.rightselctedata.forEach((item) => { - console.log(this.personnelUnit.customerOrgGroupId); this.addrulst.push({ asbitemId: item.id, - price: item.price, + price: price, // price: this.price, customerOrgGroupId: this.personnelUnit.customerOrgGroupId, }); @@ -255,35 +253,43 @@ export default { } else { if (this.unselecteddata.length == 0) { this.$message.warning("未选数据为空无法移动"); - } else { + } else { this.saveornot = false; - let count = this.unselecteddata.length - 1; - let uniqueSet = [...new Set(this.unselecteddata, ...this.tabledata)]; - const filteredArray = []; + let count = this.unselecteddata.length - 1; for (var i = count; i >= 0; i--) { // this.tabledata.splice(i, 1); - this.unselecteddata.push(this.unselecteddata[i]); - this.tabledata.splice(i, 1); + if ([...new Set(this.unselecteddata)]) { + // this.unselecteddata.push(this.unselecteddata[i]); + this.personnelUnit.nogroupselected.push(this.unselecteddata[i]); + this.tabledata.splice(i, 1); + } // this.personnelUnit.nogroupselected.push(this.unselecteddata[i]); } console.log(this.personnelUnit.customerOrgGroupId); this.unselecteddata.forEach((item) => { - this.price = item.price; + // var price = ""; + // if (this.price == "") { + // price = item.price; + // } else { + // price = this.price; + // } + //获取最新价格 + }); + let prices = ""; + this.personnelUnit.nogroupselected.forEach((items) => { + prices = items.price; + console.log(prices); + // this.price = item.price; + console.log(price); this.addrulst.push({ - asbitemId: item.id, - price: item.price, + asbitemId: "3a0b2f0c-f884-bec4-a350-79b46b455a2d", + price: prices, // price: this.psrice, customerOrgGroupId: this.personnelUnit.customerOrgGroupId, }); }); console.log(this.addrulst, "hhhhhhh"); - // this.selecteddata = this.unselecteddata; - // 复制 - // let count = this.unselecteddata.length - 1; - // for (var i = count; i >= 0; i--) { - // this.tabledata.splice(i, 1); - // this.selecteddata.push(this.unselecteddata[i]); - // } + } } }, diff --git a/src/utlis/mm.js b/src/utlis/mm.js index 5843f57..c66c8ba 100644 --- a/src/utlis/mm.js +++ b/src/utlis/mm.js @@ -1,3 +1,4 @@ export default{ - apiurl:'http://81.70.217.145:9529', + apiurl: "http://140.143.162.39:9529", + // apiurl:'http://81.70.217.145:9529', } \ No newline at end of file diff --git a/src/views/basic-dictionary/GuideType.vue b/src/views/basic-dictionary/GuideType.vue index 41a9e30..98d4c1b 100644 --- a/src/views/basic-dictionary/GuideType.vue +++ b/src/views/basic-dictionary/GuideType.vue @@ -665,6 +665,7 @@ export default { //确定编辑或者新增 addoredit() { if (this.title == 1) { + this.form={} if (this.form.displayName == "") { this.$message.warning("请输入名称"); } else { @@ -720,6 +721,7 @@ export default { //新增弹框 guideadd() { this.dialogVisible = true; + this.title = 1; }, //编辑弹框 diff --git a/src/views/basic-dictionary/MedicalConclusion.vue b/src/views/basic-dictionary/MedicalConclusion.vue index d728618..30976a4 100644 --- a/src/views/basic-dictionary/MedicalConclusion.vue +++ b/src/views/basic-dictionary/MedicalConclusion.vue @@ -219,6 +219,8 @@ export default { dialogVisible: false, form: { displayName: "", + medicalConclusionTypeId:'', + ars:'', }, Selectacategory: [], Selectvalue: "", @@ -288,6 +290,8 @@ export default { }, isselctvalue(v) { + this.form.medicalConclusionTypeId=v + console.log(v); this.pages.TypeId = v; console.log(v); console.log(this.pages.TypeId); @@ -428,6 +432,7 @@ export default { }, change(v) { this.selars = v; + this.form.medicalConclusionTypeId=v console.log(this.form.ids); }, //确定新增或者编辑 @@ -435,7 +440,8 @@ export default { if (this.title == 1) { addconclusion({ displayName: this.form.displayName, - medicalConclusionTypeId: this.form.ars, + // medicalConclusionTypeId: this.form.ars, + medicalConclusionTypeId: this.form.medicalConclusionTypeId, }).then((res) => { this.$message.success("新增成功"); this.getlist(); diff --git a/src/views/basic-dictionary/Nation.vue b/src/views/basic-dictionary/Nation.vue index 061fefc..5450ca4 100644 --- a/src/views/basic-dictionary/Nation.vue +++ b/src/views/basic-dictionary/Nation.vue @@ -86,7 +86,7 @@ > - + { - deleteEthnic(this.form.id).then((res) => { - - this.$message.success("删除成功"); - this.form={} - this.getlist(); - }); - }).catch(()=>{ - this.$message.info('已取消删除') }) + .then(() => { + deleteEthnic(this.form.id).then((res) => { + this.$message.success("删除成功"); + this.form = {}; + this.getlist(); + }); + }) + .catch(() => { + this.$message.info("已取消删除"); + }); // deleteEthnic(this.form.id).then((res) => { // this.$message.success("删除成功"); // this.getlist(); @@ -411,6 +415,7 @@ export default { addll() { this.dialogVisible = true; this.title = 1; + this.form={} }, //获取列表 getlist() { diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue index 610a922..908ac5e 100644 --- a/src/views/fee-settings/Asbitem.vue +++ b/src/views/fee-settings/Asbitem.vue @@ -638,7 +638,10 @@ export default { // console.log(sdate); if (sampleGroupId == undefined) { 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; diff --git a/src/views/fee-settings/Diagnosis.vue b/src/views/fee-settings/Diagnosis.vue index 831cb14..09097e7 100644 --- a/src/views/fee-settings/Diagnosis.vue +++ b/src/views/fee-settings/Diagnosis.vue @@ -607,7 +607,8 @@ export default { this.form = {}; //项目类别 projectlist().then((res) => { - this.itemTypeId = res.data.items; + this.itemTypeId = res.data; + console.log(res); }); //性别 examinationgender().then((res) => { diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue index 7a86297..ac6ccd1 100644 --- a/src/views/fee-settings/Item.vue +++ b/src/views/fee-settings/Item.vue @@ -123,14 +123,14 @@ - - - + - --> + @@ -1560,12 +1560,14 @@ export default { this.$refs.form.validate((v) => { if (v) { if (this.title == 1) { + this.form.price=Number( this.form.price) addproject(this.form).then((res) => { - this.$message.success("新增成功"); + 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(); diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index 7407d20..b410c89 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -78,10 +78,10 @@ export default { // scope: "Peis", // }).then((res) => { // console.log(res); - // }); + // }); "http://81.70.217.145:9529/connect/token", this.$axios .post( - "http://81.70.217.145:9529/connect/token", + "http://140.143.162.39:9529/connect/token", { client_id: "Peis_App", grant_type: "password", From 9cf71eedcd21d15f0385c14296498fe9b008cc45 Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Tue, 11 Jul 2023 09:02:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BD=95=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/unitGrouping/unitGroupCategory.vue | 4 ++-- src/views/common-settings/SampleGroup.vue | 3 ++- src/views/fee-settings/SysParmType.vue | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/unitGrouping/unitGroupCategory.vue b/src/components/unitGrouping/unitGroupCategory.vue index c1e5201..db3b0fd 100644 --- a/src/components/unitGrouping/unitGroupCategory.vue +++ b/src/components/unitGrouping/unitGroupCategory.vue @@ -283,8 +283,8 @@ export default { console.log(price); this.addrulst.push({ asbitemId: "3a0b2f0c-f884-bec4-a350-79b46b455a2d", - price: prices, - // price: this.psrice, + // price: prices, + price: this.psrice, customerOrgGroupId: this.personnelUnit.customerOrgGroupId, }); }); diff --git a/src/views/common-settings/SampleGroup.vue b/src/views/common-settings/SampleGroup.vue index 83452d2..2dd0631 100644 --- a/src/views/common-settings/SampleGroup.vue +++ b/src/views/common-settings/SampleGroup.vue @@ -466,7 +466,8 @@ export default { // 获取项目类别接口 posjectlist() { projectlist().then((res) => { - this.projectid = res.data.items; + console.log(res); + this.projectid = res.data; }); }, handlechang(value, direction, movedkeys) { diff --git a/src/views/fee-settings/SysParmType.vue b/src/views/fee-settings/SysParmType.vue index f321972..642b795 100644 --- a/src/views/fee-settings/SysParmType.vue +++ b/src/views/fee-settings/SysParmType.vue @@ -37,7 +37,7 @@ - + From 34fd2a3ef9bfd16a9486df003e5d57bc9bb843f4 Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Tue, 11 Jul 2023 09:29:31 +0800 Subject: [PATCH 3/4] 1 --- src/views/login/Login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index 1d30669..80edadc 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -81,7 +81,7 @@ export default { // }); "http://81.70.217.145:9529/connect/token", this.$axios .post( - "http://81.70.217.145:9529/connect/token", + "http://140.143.162.39:9529/connect/token", { client_id: "Peis_App", grant_type: "password", From f8cdea3e551e5dc32d953e966c4af9daaf7d9d20 Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Tue, 11 Jul 2023 09:30:45 +0800 Subject: [PATCH 4/4] 1 --- src/utlis/mm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utlis/mm.js b/src/utlis/mm.js index 5843f57..f313f78 100644 --- a/src/utlis/mm.js +++ b/src/utlis/mm.js @@ -1,3 +1,3 @@ export default{ - apiurl:'http://81.70.217.145:9529', + apiurl:'http://140.143.162.39:9529', } \ No newline at end of file