From 76196fb19d525648532a209710818ea74c242c3a Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 23 七月 2024 09:47:47 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/propaganda/particty.vue | 68 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 26 deletions(-)
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 5254501..d49df9b 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>
@@ -248,7 +248,7 @@
<el-form-item label="鎮ｈ�呰寖鍥�" prop="status">
<el-select
- v-model="topqueryParams.topic"
+ v-model="topqueryParams.scriptTopic"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -263,7 +263,7 @@
<el-form-item label="鎮ｈ�呯姸鎬�" prop="status">
<el-select
- v-model="topqueryParams.topic"
+ v-model="topqueryParams.scriptTopic"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -277,7 +277,7 @@
</el-form-item>
<el-form-item label="闅忚缁撴灉" prop="status">
<el-select
- v-model="topqueryParams.topic"
+ v-model="topqueryParams.scriptTopic"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -412,7 +412,7 @@
<el-form-item label="灏辫瘖绉戝" prop="status">
<el-select
- v-model="patientqueryParams.topic"
+ v-model="patientqueryParams.scriptTopic"
placeholder="璇烽�夋嫨"
>
<el-option-group
@@ -479,12 +479,12 @@
<div class="preview-left">
<!-- 鍗曢�� -->
<div
- class="topic-dev"
+ class="scriptTopic-dev"
v-for="(item, index) in questionList"
:key="item.aaa"
>
<div class="dev-text">
- {{ index + 1 }}銆�<span>{{ item.questionText }}</span>
+ {{ index + 1 }}銆�<span>{{ item.scriptContent }}</span>
</div>
<div class="dev-xx" v-if="item.valueType == 1">
@@ -501,7 +501,7 @@
<el-input
type="textarea"
placeholder="鏈幏鍙栧埌淇℃伅"
- v-model.sync="item.questionResult"
+ v-model.sync="item.scriptResult"
:rows="2"
/>
</div>
@@ -557,7 +557,10 @@
prop="status"
v-if="currenttype == 1 || currenttype == 8"
>
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="topqueryParams.scriptTopic"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in taskoptions"
:key="item.value"
@@ -572,7 +575,10 @@
prop="status"
v-if="currenttype == 4 || currenttype == 5"
>
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="topqueryParams.scriptTopic"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in taskoptions"
:key="item.value"
@@ -587,7 +593,10 @@
prop="status"
v-if="currenttype == 2 || currenttype == 3 || currenttype == 7"
>
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="topqueryParams.scriptTopic"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in taskoptions"
:key="item.value"
@@ -692,6 +701,7 @@
overallCase: [], //閫夋嫨鎮ｈ�呮��
allpids: [],
libId: null, //妯℃澘搴撴ā鐗坕d
+ nhh: null, //鏄惁渚濈収鏂板
Editprogress: 1, //缂栬緫杩涘害
drawermb: false, //閫夋嫨妯＄増寮圭獥
previewtf: false, //棰勮
@@ -878,6 +888,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();
@@ -983,6 +994,7 @@
// 澶勭悊闂灞傚彉閲�
Variablehandling(arr, type) {
let Variablist = [];
+ this.variableList = []; //鍙橀噺鍒楄〃
if (type == 1) {
console.log(arr);
// 寰幆闂
@@ -999,13 +1011,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);
}
},
@@ -1129,6 +1141,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;
@@ -1184,10 +1197,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 = [];
@@ -1405,7 +1421,7 @@
border: 1px solid #dcdfe6;
-webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
0 0 6px 0 rgba(0, 0, 0, 0.04);
- .topic-dev {
+ .scriptTopic-dev {
margin-bottom: 25px;
font-size: 20px !important;
.dev-text {
@@ -1469,7 +1485,7 @@
width: 22px;
height: 22px;
}
-// ::v-deep.topic-dev.el-radio__label {
+// ::v-deep.scriptTopic-dev.el-radio__label {
// font-size: 24px;
// }
::v-deep.el-radio-group {
--
Gitblit v1.9.3