From d1367a2eafbc26cadf07abb3caa94a0d64d09cab Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 13 八月 2024 14:14:12 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/propaganda/particty.vue | 142 ++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 80 deletions(-)
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 873f2d7..bc7e42a 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -169,18 +169,6 @@
</el-form>
</div>
</div>
- </div>
- <el-button type="success" @click="nextstep('ruleForm')">{{
- quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
- }}</el-button>
- <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
- </div>
-
- <!-- 浠诲姟璇︽儏 -->
- <div v-if="Editprogress == 2">
- <el-alert title="鍦ㄦ湰闃舵閫夋嫨闅忚鐥呬汉" type="success" effect="dark">
- </el-alert>
- <div class="leftvlue-jbxx">
<div class="examine-jic">
<div class="headline">
<div>鍙橀噺鍖归厤閲忓弬</div>
@@ -226,6 +214,18 @@
</div>
</div>
</div>
+ </div>
+ <el-button type="success" @click="nextstep('ruleForm')">{{
+ quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
+ }}</el-button>
+ <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
+ </div>
+
+ <!-- 浠诲姟璇︽儏 -->
+ <div v-if="Editprogress == 2">
+ <el-alert title="鍦ㄦ湰闃舵閫夋嫨闅忚鐥呬汉" type="success" effect="dark">
+ </el-alert>
+ <div class="leftvlue-jbxx">
<div class="examine-jic">
<div class="headline">
<div>鎮ｈ�呭垪琛�</div>
@@ -234,7 +234,7 @@
<div class="jic-value">
<el-row :gutter="20">
<!--鐢ㄦ埛鏁版嵁-->
- <el-form
+ <!-- <el-form
:model="topqueryParams"
ref="queryForm"
size="small"
@@ -314,7 +314,7 @@
>
</el-form-item>
</el-form>
- <el-divider></el-divider>
+ <el-divider></el-divider> -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-select
@@ -363,6 +363,7 @@
:currentList="overallCase"
:tableLabel="tableLabelhz"
:serialnumber="false"
+ :searchTrue="true"
:multiplechoice="false"
:controlxz="false"
:typeinfo="2"
@@ -388,7 +389,7 @@
</div>
<!-- 娣诲姞鎮ｈ�� -->
<el-dialog
- title="娣诲姞娲惧彂鎮ｈ��"
+ title="閫夋嫨鎮ｈ��"
:visible.sync="dialogVisiblepatient"
width="70%"
:before-close="handleClosehz"
@@ -410,26 +411,7 @@
<el-input v-model="patientqueryParams.name"></el-input>
</el-form-item>
- <el-form-item label="灏辫瘖绉戝" prop="status">
- <el-select
- v-model="patientqueryParams.scriptTopic"
- placeholder="璇烽�夋嫨"
- >
- <el-option-group
- v-for="group in topicoptions[0].children"
- :key="group.deptName"
- :label="group.deptName"
- >
- <el-option
- v-for="item in group.children"
- :key="item.deptId"
- :label="item.deptName"
- :value="item.deptId"
- >
- </el-option>
- </el-option-group>
- </el-select>
- </el-form-item>
+
<el-form-item>
<el-button
@@ -701,6 +683,7 @@
overallCase: [], //閫夋嫨鎮ｈ�呮��
allpids: [],
libId: null, //妯℃澘搴撴ā鐗坕d
+ nhh: null, //鏄惁渚濈収鏂板
Editprogress: 1, //缂栬緫杩涘害
drawermb: false, //閫夋嫨妯＄増寮圭獥
previewtf: false, //棰勮
@@ -721,44 +704,14 @@
{ label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
{ label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "update_by" },
],
- tableLabelxj: [
- { label: "闅忚鍚嶇О", width: "", prop: "preachname" },
- { label: "闅忚鎻忚堪", width: "", prop: "note" },
- { label: "闅忚褰㈠紡", width: "", prop: "playType" },
- { label: "閫傜敤鏂瑰紡", width: "", prop: "suitway" },
- { label: "淇敼鏃ユ湡", width: "", prop: "uploadTime" },
- { label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
- ],
+
tableLabelmz: [
{ label: "闅忚鍚嶇О", width: "", prop: "templateName" },
{ label: "涓昏鍐呭", width: "", prop: "note" },
{ label: "淇敼鏃ユ湡", width: "", prop: "updateTime" },
{ label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
],
- tableLabelcy: [
- { label: "闅忚鍚嶇О", width: "", prop: "templatename" },
- { label: "闅忚璁″垝", width: "", prop: "impTemplate" },
- { label: "淇敼鏃ユ湡", width: "", prop: "uploadTime" },
- { label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
- ],
- tableLabelfz: [
- { label: "閫氱煡鍚嶇О", width: "", prop: "templatename" },
- { label: "閫氱煡妯＄増", width: "", prop: "impTemplate" },
- { label: "淇敼鏃ユ湡", width: "", prop: "uploadTime" },
- { label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
- ],
- tableLabeltj: [
- { label: "閫氱煡鍚嶇О", width: "", prop: "name" },
- { label: "閫氱煡妯＄増", width: "", prop: "impTemplate" },
- { label: "淇敼鏃ユ湡", width: "", prop: "uploadTime" },
- { label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
- ],
- tableLabelwj: [
- { label: "闂嵎鍚嶇О", width: "", prop: "name" },
- { label: "闂嵎妯＄増", width: "", prop: "impTemplate" },
- { label: "淇敼鏃ユ湡", width: "", prop: "uploadTime" },
- { label: "鍒涘缓浜猴紙缂猴級", width: "", prop: "updateBy" },
- ],
+
// 鍙橀噺
tableLabelvariable: [
{ label: "鍙橀噺鍚嶇О", width: "", prop: "variablename" },
@@ -766,17 +719,13 @@
{ label: "鏇挎崲鍊�", width: "", prop: "Replacementvalue" },
],
preachform: [
- { label: "澶氬獟浣�", value: 1 },
- { label: "绾歌川", value: 2 },
- { label: "鐢佃瘽", value: 3 },
+ { label: "绾夸笅", value: 1 },
+ { label: "鐢佃瘽", value: 2 },
+ { label: "灏忕▼搴�", value: 3 },
{ label: "鐭俊", value: 4 },
- { label: "寰俊鍏紬鍙�", value: 5 },
- { label: "寰俊灏忕▼搴�", value: 6 },
- { label: "鏀粯瀹�", value: 7 },
- { label: "鏅鸿兘灏忕▼搴�", value: 8 },
- { label: "閽夐拤", value: 9 },
- { label: "绾夸笅锛堢焊璐級", value: 10 },
- { label: "绾夸笂锛堢煭淇�/閽夐拤鐨勬枃鏈�侀棶鍗烽摼鎺ワ級", value: 11 },
+ { label: "寰俊鍏紬", value: 5 },
+ { label: "閽夐拤", value: 6 },
+ { label: "鏅鸿兘鏈哄櫒浜�", value: 7 },
],
// 鏃堕棿澶勭悊
daytime: [], //鏃ユ湡
@@ -887,6 +836,7 @@
this.id = this.$route.query.id;
this.form.type = this.$route.query.type;
this.form.typename = this.$route.query.typename;
+ this.form.nhh = this.$route.query.nhh;
this.listDept();
this.Acquisitiontype();
this.Getdetails();
@@ -933,7 +883,7 @@
// 鍑洪櫌銆侀棬璇娿�佷笓鐥呴殢璁�
this.title = "闅忚鍐呭鍒楄〃";
this.tableLabel = this.tableLabelmz;
- this.checkboxlist = ["绾歌川", "澶氬獟浣�", "鐢佃瘽", "寰俊鍏紬鍙�"];
+ this.checkboxlist = ["鐭俊", "寰俊", "浜哄伐鐢佃瘽", "鏅鸿兘鏈哄櫒浜�"];
getFollowuplist(queryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
@@ -948,6 +898,10 @@
submitForm(formName) {
// this.form.preachform = this.checkList.join(",");
this.formatFn(1);
+ if (!this.form.patTaskRelevances[0]) {
+ this.$modal.msgError("璇烽�夋嫨鐥呬汉");
+ return;
+ }
const filteredArray = this.variableList.filter(
(item) =>
item.name !== "濮撳悕" && item.name !== "鐢佃瘽" && item.name !== "鍦板潃"
@@ -992,6 +946,7 @@
// 澶勭悊闂灞傚彉閲�
Variablehandling(arr, type) {
let Variablist = [];
+ this.variableList = []; //鍙橀噺鍒楄〃
if (type == 1) {
console.log(arr);
// 寰幆闂
@@ -1008,13 +963,13 @@
}
});
});
- console.log(Variablist, "Variablist");
const Aarr = Variablist.filter(
(obj, index, self) =>
index ===
self.findIndex((t) => t.name === obj.name && t.value === obj.value)
);
this.variableList = this.transitionList.concat(Aarr);
+ console.log(this.variableList, "variableList");
// this.form.textParam = this.convertFormat2ToFormat1(this.variableList);
}
},
@@ -1025,6 +980,29 @@
this.overallCase.forEach((item) => {
this.allpids.push(item.patid);
});
+ if (this.patientqueryParams.allhosp == 1) {
+ this.tableLabelhz = [
+ { label: "搴忓彿", width: "", prop: "patid" },
+ { label: "鎮ｈ�呭悕绉�", width: "", prop: "name" },
+ { label: "鎬у埆", width: "", prop: "sex" },
+ { label: "骞撮緞", width: "", prop: "age" },
+ { label: "涓讳换鍖诲笀", width: "", prop: "drname" },
+ { label: "灏辫瘖绉戝", width: "", prop: "deptName" },
+ { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
+ { label: "鍒涘缓浜�", width: "", prop: "createBy" },
+ ];
+ } else if (this.patientqueryParams.allhosp == 2) {
+ this.tableLabelhz = [
+ { label: "搴忓彿", width: "", prop: "patid" },
+ { label: "鎮ｈ�呭悕绉�", width: "", prop: "name" },
+ { label: "鎬у埆", width: "", prop: "sex" },
+ { label: "骞撮緞", width: "", prop: "age" },
+ { label: "璇婃柇", width: "", prop: "diagname" },
+ { label: "灏辫瘖绉戝", width: "", prop: "deptName" },
+ { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
+ { label: "鍒涘缓浜�", width: "", prop: "createBy" },
+ ];
+ }
if (this.allpids[0]) {
this.patientqueryParams.pids = this.allpids;
console.log(this.patientqueryParams.pids);
@@ -1138,6 +1116,7 @@
this.formatFn(2);
console.log(this.form.showDate, "this.form");
this.daytime = this.form.showDate.split(",");
+ this.changeTimeday(this.daytime);
if (this.form.showTimeMorn) {
if (this.form.sendType == 3) {
this.time4 = this.form.showTimeMorn;
@@ -1193,10 +1172,13 @@
console.log(this.form.sendTimeslot, "鏃堕棿");
},
changeTimeday(row) {
+ console.log(row, "鏃ユ湡");
const startDate = new Date(row[0]);
const endDate = new Date(row[1]);
this.applydaytime = this.getDates(startDate, endDate);
- this.processingTime();
+ if (!top) {
+ this.processingTime();
+ }
},
getDates(startDate, endDate) {
const dates = [];
--
Gitblit v1.9.3