From 44d24a2155bb22930a0d0d02ccacebd8d0871fa2 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 25 二月 2025 15:42:21 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/propaganda/QuestionnaireTask.vue |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index a02534f..04c9c0a 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -200,11 +200,10 @@
                   <el-col :span="20"
                     ><el-form-item label="閫傜敤绉戝" prop="region">
                       <el-select
-                        v-model="deptcodesWards"
+                        v-model="form.deptcode"
                         @remove-tag="removetag"
                         style="width: 400px"
                         size="medium"
-                        multiple
                         filterable
                         placeholder="璇烽�夋嫨绉戝"
                       >
@@ -223,11 +222,10 @@
                   <el-col :span="20"
                     ><el-form-item label="閫傜敤鐥呭尯" prop="region">
                       <el-select
-                        v-model="leavehospitaldistrictcodes"
+                        v-model="form.leavehospitaldistrictcode"
                         style="width: 400px"
                         @remove-tag="removehpsp"
                         size="medium"
-                        multiple
                         filterable
                         placeholder="璇烽�夋嫨鐥呭尯"
                       >
@@ -489,7 +487,7 @@
             <!-- 閫夋嫨鎮h�呭垪琛� -->
             <SFtable
               ref="multipleTable"
-              @handleUpdate="handleUpdate"
+
               @handleSelectionChange="handleSelectionChange"
               :currentList="patientuserList"
               :tableLabel="tableLabelhz"
@@ -992,7 +990,7 @@
         templatename: "",
         templateid: null,
         libtemplateid: null,
-        kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹f暀璧勮銆�",
+        kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹f暀璧勮銆�",
         jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈瀹f暀鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
       },
       taskoptions: [
@@ -1309,7 +1307,7 @@
         this.$modal.msgError("璇烽�夋嫨鏈嶅姟绫诲瀷");
         return;
       }
-      if (this.deptcodesWards[0]||this.leavehospitaldistrictcodes[0]) {
+      if (this.form.leavehospitaldistrictcode||this.form.deptcode) {
       } else {
         this.$modal.msgError("璇烽�夋嫨绉戝鎴栫梾鍖�");
         return;
@@ -1347,9 +1345,9 @@
         this.form.type = this.$route.query.type;
       }
       this.form.serviceType = this.serviceType;
-      this.form.deptcode = this.deptcodesWards.join(",");
-      this.form.leavehospitaldistrictcode =
-        this.leavehospitaldistrictcodes.join(",");
+      // this.form.deptcode = this.deptcodesWards.join(",");
+      // this.form.leavehospitaldistrictcode =
+      //   this.leavehospitaldistrictcodes.join(",");
 
       Editsingletask(this.form).then((res) => {
         if (res.code == 200) {
@@ -1358,8 +1356,6 @@
           } else {
             this.$modal.msgSuccess("鏂板鎴愬姛");
           }
-      this.$modal.closeLoading();
-
           this.$router.push({
             path: "/followvisit/tasklist",
             query: { tasktopic: this.form.serviceType },
@@ -1558,6 +1554,9 @@
           item.deptName = item.dept;
           item.admindate = item.inhosptime;
           item.sfzh = item.idcardno;
+          if (this.patientqueryParams.allhosp==6) {
+          item.patfrom = 1;
+          }
           this.overallCase.push(item);
           this.form.patTaskRelevances.push(item);
         }
@@ -1695,7 +1694,7 @@
         templatename: "",
         templateid: null,
         libtemplateid: null,
-        kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
+        kcb: "浜茬埍鐨勬偅鑰�/瀹跺睘锛屾偍濂斤紒鎴戜滑鏄棤閿″効绔ュ尰闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
         jsy: "璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
       };
 
@@ -1974,7 +1973,9 @@
               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.submitForm();
           })

--
Gitblit v1.9.3