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 |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 873f2d7..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>鎮h�呭垪琛�</div>
@@ -701,6 +701,7 @@
       overallCase: [], //閫夋嫨鎮h�呮��
       allpids: [],
       libId: null, //妯℃澘搴撴ā鐗坕d
+      nhh: null, //鏄惁渚濈収鏂板
       Editprogress: 1, //缂栬緫杩涘害
       drawermb: false, //閫夋嫨妯$増寮圭獥
       previewtf: false, //棰勮
@@ -887,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();
@@ -992,6 +994,7 @@
     // 澶勭悊闂灞傚彉閲�
     Variablehandling(arr, type) {
       let Variablist = [];
+      this.variableList = []; //鍙橀噺鍒楄〃
       if (type == 1) {
         console.log(arr);
         // 寰幆闂
@@ -1008,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);
       }
     },
@@ -1138,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;
@@ -1193,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 = [];

--
Gitblit v1.9.3