From 1a0a97184dc3e1fb23924d6e7bd2faa749d513cd Mon Sep 17 00:00:00 2001 From: mch <1332099529@qq.com> Date: Thu, 3 Aug 2023 15:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E5=88=AB=EF=BC=8C=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/systemapi.js | 6 +- .../basic-dictionary/CustomerOrgType.vue | 14 +-- src/views/basic-dictionary/ResultStatus.vue | 100 +++++++++++++----- src/views/basic-dictionary/Sex.vue | 17 ++- 4 files changed, 100 insertions(+), 37 deletions(-) diff --git a/src/request/systemapi.js b/src/request/systemapi.js index c09e1f4..ce7c489 100644 --- a/src/request/systemapi.js +++ b/src/request/systemapi.js @@ -116,9 +116,9 @@ export const examinationgender = (data) => { }); }; //性别修改 -export const modifygender = (SexId, data) => { +export const modifygender = (ID, data) => { return request({ - url: `/api/app/sex?SexId=${SexId}`, + url: `/api/app/sex/update=${ID}`, method: "put", data, }); @@ -280,7 +280,7 @@ export const statusaddition = (data) => { //状态列表修改 export const statusmodification = (id, data) => { return request({ - url: `/api/app/result-status?ResultStatusId=${id}`, + url: `/api/app/result-status?Id=${id}`, method: "put", data, }); diff --git a/src/views/basic-dictionary/CustomerOrgType.vue b/src/views/basic-dictionary/CustomerOrgType.vue index 37b8f07..e1be31f 100644 --- a/src/views/basic-dictionary/CustomerOrgType.vue +++ b/src/views/basic-dictionary/CustomerOrgType.vue @@ -288,9 +288,11 @@ export default { }) .then(() => { customerdelat(this.form.id).then((res) => { - this.$message.success("删除成功"); - this.getlist(); - this.form = {}; + if (res.code == 0) { + this.$message.success("删除成功"); + this.getlist(); + this.form = {}; + } }); }) .catch(() => {}); @@ -346,9 +348,9 @@ export default { this.title = 1; this.dialogVisible = true; this.form = {}; - this.$nextTick(()=>{ - this.$refs.refinput.focus() - }) + this.$nextTick(() => { + this.$refs.refinput.focus(); + }); }, //点击列表通过id查询 rowick(row) { diff --git a/src/views/basic-dictionary/ResultStatus.vue b/src/views/basic-dictionary/ResultStatus.vue index 58650ec..846f432 100644 --- a/src/views/basic-dictionary/ResultStatus.vue +++ b/src/views/basic-dictionary/ResultStatus.vue @@ -103,42 +103,59 @@ prop="reportBackgroundColor" > {{ form.reportBackgroundColor }} + > - + {{ form.reportFontColor }} - - - - + @change="reportFontColorchange" + > - - + + + @@ -151,10 +168,16 @@ > @@ -166,8 +189,10 @@ -
- 编辑 +
+ 编辑
@@ -242,6 +267,33 @@ export default { this.rowDrop(); }, methods: { + //数据录入字体 + dataInputFontColorchange(v) { + var hexColor = v; + hexColor = hexColor.substring(1); + this.form.dataInputFontColor = parseInt(hexColor, 16); + }, + //数据录入背景 + dataInputBackgroundColorchange(v) { + var hexColor = v; + hexColor = hexColor.substring(1); + this.form.dataInputBackgroundColor = parseInt(hexColor, 16); + }, + //报告单字体色 + reportFontColorchange(v) { + var hexColor = v; + hexColor = hexColor.substring(1); + this.form.reportFontColor = parseInt(hexColor, 16); + }, + //报告单背景色 + reportBackgroundColorchange(v) { + var hexColor = v; + // 去除开头的#号 + hexColor = hexColor.substring(1); + // 转换为十进制 + this.form.reportBackgroundColor = parseInt(hexColor, 16); + console.log(this.form.reportBackgroundColor); + }, rowclick(row) { this.form = row; console.log(row); @@ -347,12 +399,10 @@ export default { // displayName: this.form.displayName, dataInputPrompt: this.form.dataInputPrompt, reportPrompt: this.form.reportPrompt, - reportBackgroundColor: Number(this.form.reportBackgroundColor), - reportFontColor: Number(this.form.reportFontColor), - dataInputBackgroundColor: Number( - this.form.dataInputBackgroundColor - ), - dataInputFontColor: Number(this.form.dataInputFontColor), + reportBackgroundColor: this.form.reportBackgroundColor, + reportFontColor: this.form.reportFontColor, + dataInputBackgroundColor: this.form.dataInputBackgroundColor, + dataInputFontColor: this.form.dataInputFontColor, }; statusmodification(this.form.id, obj).then((res) => { this.$message.success("修改成功"); diff --git a/src/views/basic-dictionary/Sex.vue b/src/views/basic-dictionary/Sex.vue index eb8c9d1..75e04f4 100644 --- a/src/views/basic-dictionary/Sex.vue +++ b/src/views/basic-dictionary/Sex.vue @@ -100,6 +100,7 @@ import { genderbottomtotop, modifydraganddrop, } from "../../request/systemapi"; +import { postapi } from "@/api/api"; export default { data() { return { @@ -207,11 +208,21 @@ export default { //确定修改 confirmmodification() { if (this.form.displayName == "") { - this.$$message.warning("请输入名称"); + this.$message.warning("请输入名称"); } else if (this.form.simpleCode == "") { - this.$$message.warning("请输入快捷码"); + this.$message.warning("请输入快捷码"); } else { - modifygender(this.form.id, { + // modifygender(this.form.id, { + // displayName: this.form.displayName, + // simpleCode: this.form.simpleCode, + // }).then((res) => { + // if (res.code == 1) { + // this.$message.success("修改成功"); + // this.getlist(); + // this.dialogVisible = false; + // } + // }); + postapi(`/api/app/sex/update/${this.form.id}`, { displayName: this.form.displayName, simpleCode: this.form.simpleCode, }).then((res) => {