From 86d2ae88ea4ecff6a5eba478f9f4094ab683755d Mon Sep 17 00:00:00 2001 From: WXL (wul) <wl_5969728@163.com> Date: 星期日, 28 九月 2025 17:40:20 +0800 Subject: [PATCH] 测试完成 --- src/views/patient/propaganda/particty.vue | 62 +++++++++++++++++++++++++----- 1 files changed, 51 insertions(+), 11 deletions(-) diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue index c715d1f..f52e5d2 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,20 @@ 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" + :selectedOrder="selectedOrder" + value-key="value" + label-key="label" + @change="checkSelectionChange" + /> </el-form-item> <!-- <div class="xinz-infs"> <el-form-item label="鏈嶅姟鎵ц椤哄簭" prop="daytime"> @@ -909,6 +918,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 +961,8 @@ skip: false, donorchargeList: [], baseoperaList: [], + selectedOrder: [], + usable: [ { value: "0", label: "鍙敤" }, { value: "1", label: "鍋滅敤" }, @@ -1025,7 +1037,7 @@ pageNum: 1, // pageSize: 10, }, - checkList: "", + checkList: [], foncheckList: [], formatvalue: { format1: "", @@ -1198,7 +1210,7 @@ serviceType: null, }; }, - components: { SFtable, OptionalForm }, + components: { SFtable, OptionalForm, SortCheckbox }, created() { this.appraiselist = store.getters.appraiselist; @@ -1374,6 +1386,7 @@ } else if ( this.form.serviceType == 2 || this.form.serviceType == 3 || + this.form.serviceType == 16 || this.form.serviceType == 4 ) { this.checkboxlist = [ @@ -1450,7 +1463,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; @@ -1466,10 +1480,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("鏈�夋嫨妯℃澘"); @@ -1649,6 +1663,20 @@ { label: "绉戝", width: "180", prop: "dept" }, { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" }, ]; + } else if (this.patientqueryParams.allhosp == 2) { + this.tableLabelhz = [ + { label: "灏辫瘖鏃ユ湡", width: "150", prop: "admitdate" }, + { label: "鎮h��", width: "", prop: "name" }, + { label: "韬唤璇�", width: "200", prop: "idcardno" }, + { label: "鐢佃瘽鍙风爜", width: "180", prop: "telcode" }, + { label: "鎬у埆", width: "", prop: "sex" }, + { label: "骞撮緞", width: "", prop: "age" }, + { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" }, + { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" }, + { label: "鍖荤敓", width: "", prop: "drname" }, + { label: "绉戝", width: "180", prop: "dept" }, + { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" }, + ]; } if (this.allpids[0]) { this.patientqueryParams.pids = this.allpids; @@ -1715,6 +1743,13 @@ item.sfzh = item.idcardno; if (this.patientqueryParams.allhosp == 6) { item.patfrom = 1; + } + if (this.patientqueryParams.allhosp == 1) { + item.visittime = item.endtime; + } else if (this.patientqueryParams.allhosp == 4) { + item.visittime = item.starttime; + } else if (this.patientqueryParams.allhosp == 2) { + item.visittime = item.admitdate; } this.overallCase.push(item); this.form.patTaskRelevances.push(item); @@ -1850,7 +1885,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) { @@ -2194,7 +2230,11 @@ } }); }, - checkboxChange(checked, value) {}, + checkSelectionChange(selectedValues, selectedOrder) { + this.selectedOrder = selectedValues; + console.log("褰撳墠閫変腑:", selectedValues); + console.log("閫変腑椤哄簭:", selectedOrder); + }, // 鏈嶅姟褰㈠紡閫夊彇 handleCheckedCitiesChange(row) { console.log(row, "鏈嶅姟"); -- Gitblit v1.9.3