diff --git a/src/views/basic-dictionary/ResultStatus.vue b/src/views/basic-dictionary/ResultStatus.vue
index 41a7318..d7aa88a 100644
--- a/src/views/basic-dictionary/ResultStatus.vue
+++ b/src/views/basic-dictionary/ResultStatus.vue
@@ -229,7 +229,7 @@ export default {
dataInputFontColor: 1089274,
// dataInputFontColor16: "#409EFF",
},
- reportBackgroundColor16: "#409EFF",
+ reportBackgroundColor16: "",
reportFontColor16: "#409EFF",
dataInputBackgroundColor16: "#409EFF",
dataInputFontColor16: "#409EFF",
@@ -336,29 +336,13 @@ export default {
},
rowclick(row) {
this.form = row;
- // this.form.reportBackgroundColor16 = "#"+row.reportBackgroundColor;
- // this.form.reportFontColor16 = "#"+row.reportFontColor;
- // this.form.dataInputBackgroundColor16 = "#"+row.dataInputBackgroundColor;
- // this.form.dataInputFontColor16 = "#"+row.dataInputFontColor;
- // this.reportBackgroundColor16 = reportBackgroundColor16;
- // this.reportFontColor16 = row.reportFontColor16;
- // this.dataInputBackgroundColor16 = row.dataInputBackgroundColor16;
- // this.dataInputFontColor16 = row.dataInputFontColor16;
- // this.form.reportBackgroundColor16 = "#" + row.reportBackgroundColor;
- // this.form.reportFontColor16 = "#" + row.reportFontColor;
- // this.form.dataInputBackgroundColor16 = "#" + row.dataInputBackgroundColor;
- // this.form.dataInputFontColor16 = "#" + row.dataInputFontColor;
console.log(this.form);
- //颜色选择的数据反写
- console.log(this.form.reportBackgroundColor16);
- this.reportBackgroundColor16 = this.reportBackgroundColor16(
- "0" + parseInt(this.form.reportBackgroundColor).toString(16)
- );
-
- // .slice(-2);
- // this.reportFontColor16 = this.form.reportFontColor16;
- // this.dataInputBackgroundColor16 = this.form.dataInputBackgroundColor16;
- // this.dataInputFontColor16 = this.form.dataInputFontColor16;
+ this.reportBackgroundColor16 = "#" + this.form.reportBackgroundColor; //reportBackgroundColor
+ console.log("reportBackgroundColor16", this.reportBackgroundColor16);
+ this.reportBackgroundColorchange1(this.form.reportBackgroundColor);
+ this.reportFontColor1(this.form.reportFontColor);
+ this.dataInputFontColor1(this.form.dataInputFontColor);
+ this.inputdataInputBackgroundColor(this.form.dataInputBackgroundColor);
},
haxadecimal() {
let str = this.form.dataInputFontColor;
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index 3878e1b..bd10060 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -376,20 +376,116 @@
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
新增
@@ -436,6 +532,40 @@ import {
export default {
data() {
return {
+ guiderules: {
+ organizationUnitId: [
+ {
+ required: true,
+ message: "请选择体检单位",
+ trigger: "change",
+ },
+ ],
+ asbitemId: [
+ {
+ required: true,
+ message: "请选择组合项目",
+ trigger: "change",
+ },
+ ],
+ forSexId: [
+ {
+ required: true,
+ message: "请选择组适用性别",
+ trigger: "change",
+ },
+ ],
+ guide: [{ required: true, message: "请输入指引内容", trigger: "blur" }],
+ },
+ guidetitle: 1,
+ guideform: {
+ organizationUnitId: "",
+ asbitemId: "",
+ forSexId: "",
+ guide: "",
+ }, //指引信息的数据对象
+ organizationUnitdata: [], //体检中心
+ guidetitledialogVisible: false,
+ guidanceinformationdata: [],
activeName: "first",
isdislob: true,
filetelists: [],
@@ -626,6 +756,8 @@ export default {
nums: 0,
itemid: "", //项目id
curRow: {},
+ asbitemdata: [], //组合项目
+ forsexdata: [], //适用性别
};
},
created() {
@@ -635,8 +767,62 @@ export default {
mounted() {
this.rowDrop();
this.gitfleslist();
+ this.getobtainguidance();
},
methods: {
+ guiderow(row) {
+ this.guideform = row;
+ },
+ //指引信息删除
+ deleteguidelines() {
+ if (this.guideform == "{}") {
+ alert("1");
+ }
+ console.log(this.guideform);
+ },
+ //确定新增或者修改指引ruleForm
+ determineguidelines() {
+ this.$refs.ruleForms.validate((v) => {
+ if (v) {
+ postapi("/api/app/asbitem-guide", this.guideform).then((res) => {
+ // if (res.code == 1) {
+ this.guidetitledialogVisible = false;
+ this.getobtainguidance();
+ this.$message.success("创建成功");
+ // }
+ });
+ }
+ });
+ },
+ //新增或者编辑需要的api中的id
+ publicapi() {
+ //获取体检中心
+ getapi("/api/app/organization-units/by-code-all").then((res) => {
+ this.organizationUnitdata = res.data;
+ });
+ //获取组合项目
+ getapi("/api/app/asbitem/in-filter").then((res) => {
+ this.asbitemdata = res.data.items;
+ });
+ //获取适用性别
+ getapi("/api/app/for-sex").then((res) => {
+ this.forsexdata = res.data;
+ });
+ },
+ //创建弹框
+ createabulletbox() {
+ this.guidetitledialogVisible = true;
+ this.guidetitle = 1;
+ this.publicapi();
+ },
+ //获取指引信息guidanceinformationdata
+ getobtainguidance() {
+ getapi("/api/app/asbitem-guide").then((res) => {
+ this.guidanceinformationdata = res.data;
+ console.log(res, "指引信息");
+ });
+ },
+ //获取项目
gitfleslist() {
getapi("/api/app/item").then((res) => {
this.filetelists = res.data.items;