From 186b27156c14216e4359ab3f811ca1821962f3d3 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 09 五月 2025 11:14:41 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/propaganda/particty.vue          |   28 ++++++++--------------------
 src/views/patient/propaganda/QuestionnaireTask.vue |   28 ++++++++++++----------------
 2 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 542a537..c55859c 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -364,6 +364,10 @@
                       placeholder="璇风偣鍑诲彸渚ч�夋嫨"
                     />
                     <el-button
+                    v-if="
+                        (form.templateid && form.sendState == 1) ||
+                        !form.templateid
+                      "
                       style="margin-left: 10px"
                       type="primary"
                       icon="el-icon-edit"
@@ -372,7 +376,7 @@
                     ></el-button>
 
                     <el-button
-                      v-if="form.templatename"
+                      v-if="form.templateid"
                       type="success"
                       icon="el-icon-search"
                       @click="previewfnmb"
@@ -2240,11 +2244,11 @@
       if (!this.form.taskid) {
         this.templateor = true;
         MessageBox.confirm(
-          "褰撳墠涓烘柊澧炰换鍔℃湭淇濆瓨涓嶅彲鍏宠仈妯℃澘锛屾槸鍚﹀厛淇濆瓨浠诲姟锛�",
+          "褰撳墠涓烘柊澧炰换鍔℃湭淇濆瓨涓嶅彲鍏宠仈妯℃澘锛屾槸鍚﹀厛鏆傚瓨妯℃澘淇濆瓨浠诲姟鍚庣敓鏁堬紵",
           "鍔熻兘鎻愮ず",
           {
-            confirmButtonText: "淇濆瓨浠诲姟",
-            cancelButtonText: "鏆傚瓨妯℃澘",
+            confirmButtonText: "鏆傚瓨妯℃澘",
+            cancelButtonText: "鍙栨秷",
             type: "warning",
           }
         )
@@ -2258,22 +2262,14 @@
             this.objyl.svyTaskTemplateScriptVOS =
               this.objyl.svyTemplateLibScripts;
             this.form.svyTaskTemplateVO = this.objyl;
-            this.submitForm();
-          })
-          .catch(() => {
-            if (Array.isArray(this.objyl.suitway)) {
-              this.objyl.suitway = this.objyl.suitway.join(",");
-            }
-            this.objyl.templateid = this.objyl.svyid;
-            this.form.libtemplateid = this.objyl.svyid;
-            this.objyl.isoperation = 1;
-            this.objyl.svyTaskTemplateScriptVOS =
-              this.objyl.svyTemplateLibScripts;
-            this.form.svyTaskTemplateVO = this.objyl;
             this.form.templatename = this.objyl.svyname;
             this.$modal.msgSuccess("鏆傚瓨鎴愬姛淇濆瓨浠诲姟鍚庢ā鏉垮け鏁�");
             this.drawermb = false;
             this.previewtf = false;
+          })
+          .catch(() => {
+            this.drawermb = false;
+            this.previewtf = false;
           });
       } else {
         setTimeout(() => {
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index f7aa534..69c24a5 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -375,7 +375,7 @@
                     ></el-button>
 
                     <el-button
-                      v-if="form.templatename"
+                      v-if="form.templateid"
                       type="success"
                       icon="el-icon-search"
                       @click="previewfnmb()"
@@ -2269,11 +2269,11 @@
       if (!this.form.taskid) {
         this.templateor = true;
         MessageBox.confirm(
-          "褰撳墠涓烘柊澧炰换鍔℃湭淇濆瓨涓嶅彲鍏宠仈妯℃澘锛屾槸鍚﹀厛淇濆瓨浠诲姟锛�",
+          "褰撳墠涓烘柊澧炰换鍔℃湭淇濆瓨涓嶅彲鍏宠仈妯℃澘锛屾槸鍚﹀厛鏆傚瓨妯℃澘淇濆瓨浠诲姟鍚庣敓鏁堬紵",
           "鍔熻兘鎻愮ず",
           {
-            confirmButtonText: "淇濆瓨浠诲姟",
-            cancelButtonText: "鏆傚瓨妯℃澘",
+            confirmButtonText: "鏆傚瓨妯℃澘",
+            cancelButtonText: "鍙栨秷",
             type: "warning",
           }
         )
@@ -2290,26 +2290,14 @@
             this.objyl.ivrTaskTemplateScriptVOList =
               this.objyl.ivrLibaTemplateScriptVOList;
             this.form.ivrTaskTemplateVO = this.objyl;
-
-            this.submitForm();
-          })
-          .catch(() => {
-            if (Array.isArray(this.objyl.suitway)) {
-              this.objyl.suitway = this.objyl.suitway.join(",");
-            }
-            this.objyl.templateid = this.objyl.id;
-            this.objyl.isoperation = 1;
-            this.objyl.ivrLibaTemplateScriptVOList.forEach((item) => {
-              item.ivrTaskScriptTargetoptionList =
-                item.ivrLibaScriptTargetoptionList;
-            });
-            this.objyl.ivrTaskTemplateScriptVOList =
-              this.objyl.ivrLibaTemplateScriptVOList;
-            this.form.ivrTaskTemplateVO = this.objyl;
             this.form.templatename = this.objyl.templateName;
             this.$modal.msgSuccess("鏆傚瓨鎴愬姛淇濆瓨浠诲姟鍚庢ā鏉垮け鏁�");
             this.drawermb = false;
             this.previewtf = false;
+          })
+          .catch(() => {
+            this.drawermb = false;
+            this.previewtf = false;
           });
       } else {
         setTimeout(() => {

--
Gitblit v1.9.3