From f37b47903b2df3fb44f06f09ac15364fc1372819 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 01 七月 2025 15:23:34 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/propaganda/QuestionnaireTask.vue |  126 +++++++++++++++++++-----------------------
 1 files changed, 57 insertions(+), 69 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index c6df321..c736989 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -202,7 +202,7 @@
                     <el-radio :label="1">鐥呭尯鍏宠仈</el-radio>
                   </el-radio-group>
                 </el-form-item> -->
-                <el-row >
+                <el-row>
                   <el-col :span="20"
                     ><el-form-item label="閫傜敤绉戝" prop="region">
                       <el-select
@@ -225,7 +225,7 @@
                       </el-select> </el-form-item
                   ></el-col>
                 </el-row>
-                <el-row >
+                <el-row>
                   <el-col :span="20"
                     ><el-form-item label="閫傜敤鐥呭尯" prop="region">
                       <el-select
@@ -436,6 +436,7 @@
                     :currentList="overallCase"
                     :tableLabel="tableLabelhzwb"
                     :serialnumber="false"
+                    :agenumber="true"
                     :searchTrue="true"
                     :multiplechoice="false"
                     :controlxz="false"
@@ -528,6 +529,7 @@
               :currentList="patientuserList"
               :tableLabel="tableLabelhz"
               :heights="600"
+              :agenumber="true"
               :serialnumber="false"
               :center="false"
               :typeinfo="3"
@@ -536,6 +538,8 @@
           <pagination
             v-show="patienttotal > 0 && this.patientqueryParams.allhosp != 6"
             :total="patienttotal"
+            :page.sync="patientqueryParams.pageNum"
+            :limit.sync="patientqueryParams.pageSize"
             @pagination="handleAddpatient"
           />
         </div>
@@ -764,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"
@@ -800,6 +794,7 @@
               :serialnumber="false"
               :controlsc="false"
               :multiplechoice="false"
+              :agenumber="true"
               :typeinfo="1"
             />
             <pagination
@@ -807,7 +802,7 @@
               :total="total"
               :page.sync="topqueryParams.pageNum"
               :limit.sync="topqueryParams.pageSize"
-              @pagination="Acquisitiontype"
+              @pagination="handleQuerymb"
             />
           </el-row>
         </div>
@@ -883,11 +878,10 @@
       propstask: { value: "deptCode", label: "deptName" },
       // 鎮h�呰〃鍗�
       tableLabelhz: [
-        { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "inhosptime" },
+        { 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: "骞撮緞", width: "", prop: "age" },
         { label: "鎮h�呮爣绛�", width: "", prop: "tag" },
         { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
         { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
@@ -896,11 +890,10 @@
       ],
       // 鎮h�呰〃鍗�
       tableLabelhzwb: [
-        { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
+        { 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: "age" },
         { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
         { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
         { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
@@ -955,6 +948,8 @@
         topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
         leavehospitaldistrictcodes: [],
         leaveldeptcodes: [],
+        hospitaldistrictcodes: [],
+        deptcodes: [],
       },
       topicoptions: [{ children: [{ children: [] }] }],
       showSearch: true, //
@@ -1302,6 +1297,8 @@
           // },
         ];
       }
+      console.log(this.topqueryParams, "this.topqueryParams");
+
       getQtemplatelist(this.topqueryParams).then((response) => {
         this.userList = response.rows;
         this.total = response.total;
@@ -1424,7 +1421,7 @@
     },
     // 棰勮
     previewfnmb() {
-      console.log(this.form.templateid,'this.form.templateid');
+      console.log(this.form.templateid, "this.form.templateid");
 
       getTaskQuestioncomit(this.form.templateid).then((res) => {
         if (res.code == 200) {
@@ -1491,17 +1488,14 @@
         this.allpids.push(item.patid);
       });
       if (
-        this.patientqueryParams.allhosp == 1 ||
-        (this.patientqueryParams.allhosp == 1 &&
-          this.patientqueryParams.cry == 1)
+        this.patientqueryParams.allhosp == 1
       ) {
         this.tableLabelhz = [
           // { label: "鍏ラ櫌鏃ユ湡", width: "170", prop: "starttime" },
-          { label: "鍑洪櫌鏃ユ湡", width: "150", prop: "endtime" },
+          { 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: "骞撮緞", width: "", prop: "age" },
           { label: "鎮h�呮爣绛�", width: "200", prop: "tag" },
           { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
           { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
@@ -1509,13 +1503,14 @@
           { label: "绉戝", width: "180", prop: "dept" },
           { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
         ];
-      } else if (this.patientqueryParams.allhosp == 4) {
+      } else if (
+        this.patientqueryParams.allhosp == 4
+      ) {
         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: "骞撮緞", width: "", prop: "age" },
           { label: "鎮h�呮爣绛�", width: "200", prop: "tag" },
           { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
           { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
@@ -1529,31 +1524,23 @@
       } 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 == 1) {
+        this.patientqueryParams.hospitaldistrictcodes = [];
+        this.patientqueryParams.deptcodes = [];
+      } else if (this.patientqueryParams.allhosp == 4) {
+        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) => {
@@ -1582,11 +1569,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;
           }
@@ -1638,25 +1625,27 @@
     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 (
@@ -1675,9 +1664,8 @@
     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: "age" },
         { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
       ];
       this.patientqueryParams.pageSize = 1000;
@@ -2024,10 +2012,10 @@
             this.objyl.svyTaskTemplateScriptVOS =
               this.objyl.svyTemplateLibScripts;
             this.form.svyTaskTemplateVO = this.objyl;
-            this.form.templatename=this.objyl.svyname;
+            this.form.templatename = this.objyl.svyname;
             this.$modal.msgSuccess("鏆傚瓨鎴愬姛淇濆瓨浠诲姟鍚庢ā鏉垮け鏁�");
-            this.drawermb=false;
-            this.previewtf=false;
+            this.drawermb = false;
+            this.previewtf = false;
           });
       } else {
         setTimeout(() => {

--
Gitblit v1.9.3