From 2c4c416bf7950c72ffa2543a218e4fd993ee2af2 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 12 九月 2024 12:04:32 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/propaganda/QuestionnaireTask.vue |   81 ++++++++++++++++++++++++++--------------
 1 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 3f8df23..c9a50bf 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -338,7 +338,7 @@
                     @details="detailhz"
                     @handleUpdate="handleUpdate"
                     :currentList="overallCase"
-                    :tableLabel="tableLabelhz"
+                    :tableLabel="tableLabelhzwb"
                     :serialnumber="false"
                     :searchTrue="true"
                     :multiplechoice="false"
@@ -597,7 +597,7 @@
   getQtemplatelist,
   getQtemplateobj,
   TaskQuestioncomit,
-  Questionnairetaskget,
+  Questionnairetaskgetson,
   gethetaskinfo,
   delhetaskinfo,
   Editsingletask,
@@ -630,13 +630,25 @@
       questionList: [],
       // 鎮h�呰〃鍗�
       tableLabelhz: [
-        { label: "鎮h��", width: "", prop: "name" },
-        { label: "韬唤璇�", width: "200", prop: "idcardno" },
-        { label: "鎬у埆", width: "", prop: "sex" },
-        { label: "骞撮緞", width: "", prop: "age" },
-        { label: "鍖荤敓", width: "", prop: "drname" },
-        { label: "绉戝", width: "", prop: "deptName" },
-        { label: "灏辫瘖/鍑洪櫌鏃ユ湡", width: "280", prop: "inhosptime" },
+        { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "inhosptime" },
+          { label: "鎮h��", width: "", prop: "name" },
+          { label: "韬唤璇�", width: "200", prop: "idcardno" },
+          { label: "鎬у埆", width: "", prop: "sex" },
+          { label: "骞撮緞", width: "", prop: "age" },
+          { label: "鍖荤敓", width: "", prop: "drname" },
+          { label: "绉戝", width: "240", prop: "deptname" },
+          { label: "鐥呭尯", width: "240", prop: "leavehospitaldistrictname" },
+      ],
+      // 鎮h�呰〃鍗�
+      tableLabelhzwb: [
+      { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "inhosptime" },
+          { label: "鎮h��", width: "", prop: "name" },
+          { label: "韬唤璇�", width: "200", prop: "sfzh" },
+          { label: "鎬у埆", width: "", prop: "sex" },
+          { label: "骞撮緞", width: "", prop: "age" },
+          { label: "鍖荤敓", width: "", prop: "drname" },
+          { label: "绉戝", width: "180", prop: "deptName" },
+          { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
       ],
 
       tableLabelwj: [
@@ -753,7 +765,7 @@
         templateid: null,
         libtemplateid: null,
         kcb:'浜茬埍鐨勬偅鑰�-瀹跺睘锛屾偍濂斤紒鎴戜滑鏄禉涓尰澶т簩闄㈢殑鍖绘姢浜哄憳锛屼负浜嗘洿濂藉湴浜嗚В鎮ㄧ殑搴峰鎯呭喌锛岃鎮ㄦ娊涓�鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�',
-        jsy:'鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒',
+        jsy:'璇锋偍娉ㄦ剰浼戞伅鍜岃惀鍏伙紝鐢熸椿涓婅鍔抽�哥粨鍚堬紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒',
       },
       taskoptions: [
         {
@@ -1013,6 +1025,8 @@
     },
     // 淇濆瓨
     submitForm(formName) {
+      console.log(this.form.patTaskRelevances,'1.patTaskRelevances');
+      console.log(this.overallCase,'this.form.overallCase');
       if (this.time4 && this.form.sendType == 3)
         this.form.showTimeMorn = this.time4;
       this.form.sendTimeslot = [
@@ -1041,7 +1055,7 @@
       } else {
         return this.$modal.msgError("鏃堕棿淇℃伅缂哄け");
       }
-
+      console.log(this.form.patTaskRelevances,'2.patTaskRelevances');
       const filteredArray = this.variableList.filter(
         (item) =>
           item.name !== "濮撳悕" && item.name !== "鐢佃瘽" && item.name !== "鍦板潃"
@@ -1141,13 +1155,14 @@
       });
       if (this.patientqueryParams.allhosp == 1) {
         this.tableLabelhz = [
+          { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "inhosptime" },
           { label: "鎮h��", width: "", prop: "name" },
           { label: "韬唤璇�", width: "200", prop: "idcardno" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "骞撮緞", width: "", prop: "age" },
           { label: "鍖荤敓", width: "", prop: "drname" },
-          { label: "绉戝", width: "", prop: "deptName" },
-          { label: "灏辫瘖/鍑洪櫌鏃ユ湡", width: "280", prop: "inhosptime" },
+          { label: "绉戝", width: "180", prop: "deptname" },
+          { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
         ];
       } else if (this.patientqueryParams.allhosp == 2) {
         this.tableLabelhz = [
@@ -1155,7 +1170,8 @@
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "骞撮緞", width: "", prop: "age" },
           { label: "璇婃柇", width: "", prop: "diagname" },
-          { label: "灏辫瘖绉戝", width: "", prop: "deptName" },
+          { label: "绉戝", width: "", prop: "deptname" },
+        { label: "鐥呭尯", width: "", prop: "leavehospitaldistrictname" },
           { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
           { label: "鍒涘缓浜�", width: "", prop: "createBy" },
         ];
@@ -1181,8 +1197,8 @@
     handleExport() {},
     // 閫夋嫨鎮h�呰〃鏁版嵁
     handleSelectionChange(selection) {
-      console.log("澶氶�夋偅鑰�");
-      this.SelectPatientslist = selection;
+      console.log("澶氶�夋偅鑰�",selection);
+      this.SelectPatientslist = structuredClone(selection);
       this.multiple = !selection.length;
 
       // 璧嬪�肩粰鏁翠綋閫変腑鏁扮粍
@@ -1192,8 +1208,15 @@
           item.isoperation = 1;
           item.patid = item.id;
           item.hospType = this.patientqueryParams.allhosp;
+          item.sfzh = item.idcardno;
+          item.deptCode = item.deptcode;
+          item.deptName = item.deptname;
+          item.admindate = item.inhosptime;
+          item.sfzh = item.idcardno;
+          console.log(item);
           this.overallCase.push(item);
           this.form.patTaskRelevances.push(item);
+          console.log(this.form.patTaskRelevances,'patTaskRelevances');
         }
       });
     },
@@ -1239,18 +1262,18 @@
     },
     getList() {},
     handleQuery() {
-      if (this.patientqueryParams.topica == 0) {
-        this.patientqueryParams.leavehospitaldistrictcodes =
-          store.getters.leavehospitaldistrictcodes;
-        this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
-      } else if (topica == 1) {
-        this.patientqueryParams.leavehospitaldistrictcodes = null;
-        this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
-      } else if (topica == 2) {
-        this.patientqueryParams.leavehospitaldistrictcodes =
-          store.getters.leavehospitaldistrictcodes;
-        this.patientqueryParams.leaveldeptcodes = null;
-      }
+      // if (this.patientqueryParams.topica == 0) {
+      //   this.patientqueryParams.leavehospitaldistrictcodes =
+      //     store.getters.leavehospitaldistrictcodes;
+      //   this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
+      // } else if (this.patientqueryParams.topica == 1) {
+      //   this.patientqueryParams.leavehospitaldistrictcodes = null;
+      //   this.patientqueryParams.leaveldeptcodes = store.getters.leaveldeptcodes;
+      // } else if (this.patientqueryParams.topica == 2) {
+      //   this.patientqueryParams.leavehospitaldistrictcodes =
+      //     store.getters.leavehospitaldistrictcodes;
+      //   this.patientqueryParams.leaveldeptcodes = null;
+      // }
       this.handleAddpatient();
     },
     resetQuery() {},
@@ -1289,7 +1312,7 @@
       };
       this.questionList = [];
       if (this.id) {
-        Questionnairetaskget({ taskid: this.id }).then((res) => {
+        Questionnairetaskgetson({ taskid: this.id }).then((res) => {
           let filteredArray = "";
           if (res.code == 200) {
             this.form = res.data;

--
Gitblit v1.9.3