From 5b7a0f9d294c939e08e312309a2df395462ade15 Mon Sep 17 00:00:00 2001 From: WXL (wul) <wl_5969728@163.com> Date: 星期四, 25 九月 2025 14:18:53 +0800 Subject: [PATCH] 测试完成 --- src/views/followvisit/tasklist/index.vue | 4 +- vue.config.js | 4 +- src/store/getters.js | 16 ++++---- src/views/patient/propaganda/particty.vue | 39 ++++++++++++++----- 4 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/store/getters.js b/src/store/getters.js index dfbad96..3d4944f 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -753,14 +753,14 @@ // listClass: "", // }, // }, - // { - // value: "13", - // label: "涓撶梾闅忚", - // raw: { - // cssClass: "", - // listClass: "", - // }, - // }, + { + value: "13", + label: "涓撶梾闅忚", + raw: { + cssClass: "", + listClass: "", + }, + }, ], }; diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue index ef08e2f..2f14227 100644 --- a/src/views/followvisit/tasklist/index.vue +++ b/src/views/followvisit/tasklist/index.vue @@ -690,7 +690,7 @@ label: "闂嵎闅忚", }, ]; - this.topqueryParams.type = 2; + // this.topqueryParams.type = 2; } else if (this.tasktopic == 4 || this.tasktopic == 8) { if (!this.topqueryParams.type) this.topqueryParams.type = "3"; this.longtermlist = [ @@ -716,7 +716,7 @@ label: "瀹f暀鍏虫��", }, ]; - this.topqueryParams.type = 2; + // this.topqueryParams.type = 2; } this.topqueryParams.beginTime = this.dateRange[0]; this.topqueryParams.endTime = this.dateRange[1]; diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue index e9d753d..09acd9e 100644 --- a/src/views/patient/propaganda/particty.vue +++ b/src/views/patient/propaganda/particty.vue @@ -69,7 +69,7 @@ placeholder="璇疯緭鍏ヤ换鍔℃弿杩�" /> </el-form-item> - <el-form-item label="鏈嶅姟褰㈠紡"> + <!-- <el-form-item label="鏈嶅姟褰㈠紡"> <el-radio-group v-model="checkList" @change="handleCheckedCitiesChange" @@ -78,11 +78,19 @@ v-for="(item, index) in checkboxlist" :key="index" :label="item.value" - @change="checkboxChange($event, item.value)" > {{ item.label }}</el-radio > </el-radio-group> + </el-form-item> --> + <el-form-item label="鏈嶅姟褰㈠紡"> + <SortCheckbox + v-model="checkList" + :options="checkboxlist" + value-key="value" + label-key="label" + @change="checkSelectionChange" + /> </el-form-item> <!-- <div class="xinz-infs"> <el-form-item label="鏈嶅姟鎵ц椤哄簭" prop="daytime"> @@ -909,6 +917,7 @@ } from "@/api/AiCentre/index"; import { deptTreeSelect } from "@/api/system/user"; import OptionalForm from "@/components/OptionalForm"; +import SortCheckbox from "@/components/SortCheckbox"; //琛ㄦ牸缁勪欢 import { MessageBox } from "element-ui"; import SFtable from "@/components/SFtable"; //琛ㄦ牸缁勪欢 @@ -951,6 +960,8 @@ skip: false, donorchargeList: [], baseoperaList: [], + selectedOrder: [], + usable: [ { value: "0", label: "鍙敤" }, { value: "1", label: "鍋滅敤" }, @@ -1025,7 +1036,7 @@ pageNum: 1, // pageSize: 10, }, - checkList: "", + checkList: [], foncheckList: [], formatvalue: { format1: "", @@ -1198,7 +1209,7 @@ serviceType: null, }; }, - components: { SFtable, OptionalForm }, + components: { SFtable, OptionalForm,SortCheckbox }, created() { this.appraiselist = store.getters.appraiselist; @@ -1451,7 +1462,8 @@ this.leavehospitaldistrictcodes = []; } if (this.checkList) { - this.form.preachform = this.checkList; + this.form.preachform = this.checkList.join(','); + this.form.preachformList = this.selectedOrder; } else { this.$modal.msgError("璇烽�夋嫨鏈嶅姟绫诲瀷"); return; @@ -1467,10 +1479,10 @@ this.$modal.msgError("璇烽�夋嫨浠诲姟鍏宠仈鏉′欢"); return; } - if (!this.form.patTaskRelevances[0] && !this.form.longTask) { - this.$modal.msgError("璇烽�夋嫨鐥呬汉"); - return; - } + // if (!this.form.patTaskRelevances[0] && !this.form.longTask) { + // this.$modal.msgError("璇烽�夋嫨鐥呬汉"); + // return; + // } if (!this.form.templatename && !this.templateor) { this.$modal.msgError("鏈�夋嫨妯℃澘"); @@ -1851,7 +1863,8 @@ ? this.form.patTaskRelevances : []; this.overallCase = this.form.patTaskRelevances.concat(); - this.checkList = this.form.preachform; + this.checkList = this.form.preachform.split(','); + this.selectedOrder = this.form.preachformList; this.overallCase.forEach((item) => { if (item.endtime) { @@ -2195,7 +2208,11 @@ } }); }, - checkboxChange(checked, value) {}, + checkSelectionChange(selectedValues, selectedOrder) { + this.selectedOrder = selectedValues ; + console.log("褰撳墠閫変腑:", selectedValues); + console.log("閫変腑椤哄簭:", selectedOrder); + }, // 鏈嶅姟褰㈠紡閫夊彇 handleCheckedCitiesChange(row) { console.log(row, "鏈嶅姟"); diff --git a/vue.config.js b/vue.config.js index 4874dd6..ad3682d 100644 --- a/vue.config.js +++ b/vue.config.js @@ -36,8 +36,8 @@ // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `https://www.health-y.cn/lssf`, - // target: `http://192.168.100.126:8095`, - target: `http://192.168.100.10:8096`, + target: `http://192.168.100.127:8095`, + // target: `http://192.168.100.10:8096`, // target:`http://localhost:8095`, // target:`http://35z1t16164.qicp.vip`, // target: `http://192.168.100.193:8095`, -- Gitblit v1.9.3