From d9004dd77540b0633b12a41323ba2006c362fb8e Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 07 七月 2025 19:54:52 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/propaganda/QuestionnaireTask.vue |  176 ++++++++++++++++++++++++++++------------------------------
 1 files changed, 86 insertions(+), 90 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index eff5fda..81be5bc 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -87,7 +87,7 @@
                   </el-radio-group>
                 </el-form-item>
                 <el-row :gutter="20" v-if="form.longTask">
-                  <el-col :span="8">
+                  <el-col :span="6">
                     <el-form-item label="鍛ㄦ湡鏃堕棿" prop="name">
                       <el-input
                         v-model="form.sendDay"
@@ -768,17 +768,7 @@
               <el-form-item label="闂嵎鍚嶇О">
                 <el-input v-model="topqueryParams.svyname"></el-input>
               </el-form-item>
-              <!-- <el-form-item label="閫傜敤褰㈠紡" prop="status">
-                <el-select v-model="topqueryParams.topica" placeholder="璇烽�夋嫨">
-                  <el-option
-                    v-for="item in taskoptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item> -->
+
               <el-form-item>
                 <el-button
                   type="primary"
@@ -812,7 +802,7 @@
               :total="total"
               :page.sync="topqueryParams.pageNum"
               :limit.sync="topqueryParams.pageSize"
-              @pagination="Acquisitiontype"
+              @pagination="handleQuerymb"
             />
           </el-row>
         </div>
@@ -890,7 +880,7 @@
       tableLabelhz: [
         { label: "鍑洪櫌鏃ユ湡", width: "180", prop: "endtime" },
         { label: "鎮h��", width: "", prop: "name" },
-        { label: "韬唤璇�", width: "200", prop: "idcardno" },
+        { label: "鎮h�呯紪鍙�", width: "200", prop: "patientno" },
         { label: "鎬у埆", width: "", prop: "sex" },
         { label: "鎮h�呮爣绛�", width: "", prop: "tag" },
         { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
@@ -902,7 +892,7 @@
       tableLabelhzwb: [
         { label: "鍑洪櫌鏃ユ湡", width: "180", prop: "endtime" },
         { label: "鎮h��", width: "", prop: "name" },
-        { label: "韬唤璇�", width: "200", prop: "sfzh" },
+        { label: "鎮h�呯紪鍙�", width: "200", prop: "sfzh" },
         { label: "鎬у埆", width: "", prop: "sex" },
         { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
         { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
@@ -958,6 +948,8 @@
         topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
         leavehospitaldistrictcodes: [],
         leaveldeptcodes: [],
+        hospitaldistrictcodes: [],
+        deptcodes: [],
       },
       topicoptions: [{ children: [{ children: [] }] }],
       showSearch: true, //
@@ -1035,11 +1027,11 @@
       },
       taskoptions: [
         {
-          value: "1",
+          value: "4",
           label: "鍑洪櫌鐥呬汉",
         },
         {
-          value: "4",
+          value: "1",
           label: "鍦ㄩ櫌鐥呬汉",
         },
         {
@@ -1071,34 +1063,38 @@
       ],
 
       tasktypes: [
+        // {
+        //   value: "1",
+        //   label: "鐩戞祴璇勪及",
+        // },
         {
-          value: 1,
-          label: "蹇冪數闅忚",
-        },
-        {
-          value: 2,
+          value: "2",
           label: "鍑洪櫌闅忚",
         },
         {
-          value: 3,
-          label: "褰卞儚闅忚",
+          value: "3",
+          label: "闂ㄨ瘖闅忚",
         },
         {
-          value: 4,
+          value: "4",
           label: "瀹f暀鍏虫��",
         },
         {
-          value: 5,
-          label: "浣撴闅忚",
+          value: "5",
+          label: "澶嶈瘖绠$悊",
         },
         {
-          value: 11,
-          label: "鍖绘妧闅忚",
+          value: "6",
+          label: "婊℃剰搴﹁皟鏌�",
         },
         {
-          value: 10,
-          label: "涓撶闅忚",
+          value: "7",
+          label: "鎮h�呮姤鍛�",
         },
+        // {
+        //   value: "8",
+        //   label: "鍏朵粬閫氱煡",
+        // },
       ],
       // 绉戝/鐥呭尯
       belongWards: [],
@@ -1495,16 +1491,12 @@
       this.overallCase.forEach((item) => {
         this.allpids.push(item.patid);
       });
-      if (
-        this.patientqueryParams.allhosp == 1 ||
-        (this.patientqueryParams.allhosp == 1 &&
-          this.patientqueryParams.cry == 1)
-      ) {
+      if (this.patientqueryParams.allhosp == 4) {
         this.tableLabelhz = [
           // { label: "鍏ラ櫌鏃ユ湡", width: "170", prop: "starttime" },
           { label: "鍑洪櫌鏃ユ湡", width: "180", prop: "endtime" },
           { label: "鎮h��", width: "", prop: "name" },
-          { label: "韬唤璇�", width: "200", prop: "idcardno" },
+          { label: "鎮h�呯紪鍙�", width: "200", prop: "patientno" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "鎮h�呮爣绛�", width: "200", prop: "tag" },
           { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
@@ -1513,15 +1505,26 @@
           { label: "绉戝", width: "180", prop: "dept" },
           { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
         ];
-      } else if (this.patientqueryParams.allhosp == 4) {
+      } else if (this.patientqueryParams.allhosp == 1) {
         this.tableLabelhz = [
           { label: "鍏ラ櫌鏃ユ湡", width: "150", prop: "starttime" },
           { label: "鎮h��", width: "", prop: "name" },
-          { label: "韬唤璇�", width: "200", prop: "idcardno" },
+          { label: "鎮h�呯紪鍙�", width: "200", prop: "patientno" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "鎮h�呮爣绛�", width: "200", prop: "tag" },
           { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
           { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
+          { label: "鍖荤敓", width: "", prop: "drname" },
+          { label: "绉戝", width: "180", prop: "dept" },
+          { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
+        ];
+      } else {
+        this.tableLabelhz = [
+          { label: "灏辫瘖鏃ユ湡", width: "150", prop: "admitdate" },
+          { label: "鎮h��", width: "", prop: "name" },
+          { label: "鎮h�呯紪鍙�", width: "200", prop: "patientno" },
+          { label: "鎬у埆", width: "", prop: "sex" },
+          { label: "鎮h�呮爣绛�", width: "200", prop: "tag" },
           { label: "鍖荤敓", width: "", prop: "drname" },
           { label: "绉戝", width: "180", prop: "dept" },
           { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
@@ -1532,31 +1535,22 @@
       } else {
         this.patientqueryParams.pids = null;
       }
-      // 绫诲瀷鍒ゆ柇
-      if (this.patientqueryParams.allhosp == 1) {
-        this.patientqueryParams.cry = 1;
-      } else if (this.patientqueryParams.allhosp == 4) {
-        this.patientqueryParams.cry = 0;
-        this.patientqueryParams.allhosp = "1";
-      }
-      // 鏉ユ簮鍒ゆ柇
 
-      if (this.patientqueryParams.searchscope == 1) {
-        this.patientqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
+      // 绉戝杩樻槸鐥呭尯
+
+      // 鍑洪櫌杩樻槸鍏ラ櫌
+      if (this.patientqueryParams.allhosp == 4) {
+        this.patientqueryParams.hospitaldistrictcodes = [];
+        this.patientqueryParams.deptcodes = [];
+      } else if (this.patientqueryParams.allhosp == 1) {
+        this.patientqueryParams.deptcodes =
+          this.patientqueryParams.leaveldeptcodes;
+        this.patientqueryParams.hospitaldistrictcodes =
+          this.patientqueryParams.leavehospitaldistrictcodes;
         this.patientqueryParams.leavehospitaldistrictcodes = [];
-      } else if (this.patientqueryParams.searchscope == 2) {
-        this.patientqueryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
         this.patientqueryParams.leaveldeptcodes = [];
-      } else {
-        this.patientqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        this.patientqueryParams.leavehospitaldistrictcodes =
-          store.getters.belongWards.map((obj) => obj.districtCode);
       }
+
       getTaskpatientQC(this.patientqueryParams).then((response) => {
         this.patientuserList = response.rows;
         this.patientuserList.forEach((item) => {
@@ -1585,11 +1579,11 @@
           item.isoperation = 1;
           item.patid = item.id;
           item.hospType = this.patientqueryParams.allhosp;
-          item.sfzh = item.idcardno;
+          item.sfzh = item.patientno;
           item.deptCode = item.deptcode;
           item.deptName = item.dept;
           item.admindate = item.inhosptime;
-          item.sfzh = item.idcardno;
+          item.sfzh = item.patientno;
           if (this.patientqueryParams.allhosp == 6) {
             item.patfrom = 1;
           }
@@ -1641,25 +1635,26 @@
     getList() {},
     handleQuery() {
       // 鑾峰彇澶栭儴鎮h��
-      console.log(this.patientqueryParams.allhosp, "aaalll");
-
       if (this.patientqueryParams.allhosp == 6) {
         this.Externallist();
         console.log();
-
         return;
       }
-      if (this.patientqueryParams.topica == 0) {
+      if (this.patientqueryParams.searchscope == 1) {
+        this.patientqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.patientqueryParams.leavehospitaldistrictcodes = [];
+      } else if (this.patientqueryParams.searchscope == 2) {
         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) {
+          store.getters.belongWards.map((obj) => obj.districtCode);
+        this.patientqueryParams.leaveldeptcodes = [];
+      } else {
+        this.patientqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
         this.patientqueryParams.leavehospitaldistrictcodes =
-          store.getters.leavehospitaldistrictcodes;
-        this.patientqueryParams.leaveldeptcodes = null;
+          store.getters.belongWards.map((obj) => obj.districtCode);
       }
 
       if (
@@ -1678,7 +1673,7 @@
     Externallist() {
       this.tableLabelhz = [
         { label: "鎮h��", width: "", prop: "name" },
-        { label: "韬唤璇�", width: "200", prop: "idcardno" },
+        { label: "鎮h�呯紪鍙�", width: "200", prop: "patientno" },
         { label: "鎬у埆", width: "", prop: "sex" },
         { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
       ];
@@ -1999,25 +1994,13 @@
           "褰撳墠涓烘柊澧炰换鍔℃湭淇濆瓨涓嶅彲鍏宠仈妯℃澘锛屾槸鍚﹀厛淇濆瓨浠诲姟锛�",
           "鍔熻兘鎻愮ず",
           {
-            confirmButtonText: "淇濆瓨浠诲姟",
-            cancelButtonText: "鏆傚瓨妯℃澘",
+            confirmButtonText: "鏆傚瓨妯℃澘",
+            cancelButtonText: "淇濆瓨浠诲姟",
             type: "warning",
           }
         )
           .then(() => {
-            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.submitForm();
-          })
-          .catch(() => {
-            if (Array.isArray(this.objyl.suitway)) {
+         if (Array.isArray(this.objyl.suitway)) {
               this.objyl.suitway = this.objyl.suitway.join(",");
             }
             this.objyl.templateid = this.objyl.svyid;
@@ -2030,6 +2013,19 @@
             this.$modal.msgSuccess("鏆傚瓨鎴愬姛淇濆瓨浠诲姟鍚庢ā鏉垮け鏁�");
             this.drawermb = false;
             this.previewtf = false;
+          })
+          .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.submitForm();
           });
       } else {
         setTimeout(() => {

--
Gitblit v1.9.3