From c3576dff24adbb52cf807c100afb63399e16f813 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期四, 11 九月 2025 09:36:45 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/propaganda/QuestionnaireTask.vue |  112 +++++++++++++++++---------------------------------------
 1 files changed, 34 insertions(+), 78 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index e135034..b95bfb4 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -84,6 +84,7 @@
                   <el-radio-group v-model="form.longTask">
                     <el-radio :label="0">鑷畾涔夊懆鏈�</el-radio>
                     <el-radio :label="1">闀挎湡浠诲姟</el-radio>
+                    <el-radio :label="2">鍥哄畾浠诲姟</el-radio>
                   </el-radio-group>
                 </el-form-item>
                 <el-row :gutter="20" v-if="form.longTask">
@@ -198,7 +199,7 @@
                 </el-form-item>
                 <el-form-item label="浠诲姟鍏宠仈" prop="longTask">
                   <el-radio-group v-model="form.appltype">
-                    <el-radio label="1">绉戝鍏宠仈</el-radio>
+                    <el-radio label="1">璇鹃缁勫叧鑱�</el-radio>
                     <el-radio label="2">鐥呭尯鍏宠仈</el-radio>
                     <el-radio label="3">鐤剧梾鍏宠仈</el-radio>
                     <el-radio label="4">鎵嬫湳鍏宠仈</el-radio>
@@ -206,7 +207,7 @@
                 </el-form-item>
                 <el-row v-if="form.appltype == 1">
                   <el-col :span="20"
-                    ><el-form-item label="閫傜敤绉戝" prop="region">
+                    ><el-form-item label="閫傜敤璇鹃缁�" prop="region">
                       <el-select
                         v-model="deptcodesWards"
                         @remove-tag="removetag"
@@ -214,7 +215,7 @@
                         size="medium"
                         multiple
                         filterable
-                        placeholder="璇烽�夋嫨绉戝"
+                        placeholder="璇烽�夋嫨璇鹃缁�"
                       >
                         <el-option
                           class="ruleFormaa"
@@ -438,7 +439,7 @@
       </div>
       <!-- 浠诲姟璇︽儏 -->
       <div v-if="Editprogress == 2">
-        <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹f暀鐥呬汉" type="success" effect="dark">
+        <el-alert title="鍦ㄦ湰闃舵閫夋嫨闅忚鐥呬汉" type="success" effect="dark">
         </el-alert>
         <div class="leftvlue-jbxx">
           <div class="examine-jic">
@@ -550,6 +551,12 @@
               <el-form-item label="鎮h�呰瘖鏂細">
                 <el-input
                   v-model="patientqueryParams.leavediagname"
+                  @keyup.enter.native="handleQuery"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="涓绘不鍖荤敓锛�">
+                <el-input
+                  v-model="patientqueryParams.drname"
                   @keyup.enter.native="handleQuery"
                 ></el-input>
               </el-form-item>
@@ -934,7 +941,7 @@
       previewtftype: 0, //棰勮鎯呭喌0鏂版ā鏉块瑙�1宸查�夋嫨妯℃澘淇敼
       dialogVisiblepatient: false, //娣诲姞鎮h�呭脊妗�
       dialogVisiblepatientjb: false, //娣诲姞鐤剧梾寮规
-      deptcodesWards: [], //绉戝鏁版嵁
+      deptcodesWards: [], //璇鹃缁勬暟鎹�
       leavehospitaldistrictcodes: [], //鐥呭尯鏁版嵁
       operationcodes: [], //鎵嬫湳鏁版嵁
       illnesscodes: [], //鐤剧梾鏁版嵁
@@ -964,7 +971,7 @@
         { label: "骞撮緞", width: "", prop: "age" },
         { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
         { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
-        { label: "绉戝", width: "240", prop: "dept" },
+        { label: "璇鹃缁�", width: "240", prop: "dept" },
         { label: "鐥呭尯", width: "240", prop: "leavehospitaldistrictname" },
       ],
       // 鎮h�呰〃鍗�
@@ -978,7 +985,7 @@
         { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
         { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
         { label: "涓绘不鍖荤敓", width: "", prop: "drname" },
-        { label: "绉戝", width: "180", prop: "deptName" },
+        { label: "璇鹃缁�", width: "180", prop: "deptName" },
         { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
       ],
 
@@ -1139,7 +1146,7 @@
         },
         {
           value: 1,
-          label: "绉戝鎮h��",
+          label: "璇鹃缁勬偅鑰�",
         },
         {
           value: 2,
@@ -1147,68 +1154,15 @@
         },
       ],
 
-      tasktypes: [
-        {
-          value: 1,
-          label: "鐩戞祴璇勪及",
-        },
-        {
-          value: 2,
-          label: "鍑洪櫌闅忚",
-        },
-        {
-          value: 3,
-          label: "闂ㄨ瘖闅忚",
-        },
-        {
-          value: 4,
-          label: "瀹f暀鍏虫��",
-        },
-        {
-          value: 5,
-          label: "澶嶈瘖绠$悊",
-        },
-        // {
-        //   value: 5,
-        //   label: "婊℃剰搴﹁皟鏌�",
-        // },
-        {
-          value: 7,
-          label: "鎮h�呮姤鍛�",
-        },
-        // {
-        //   value: 8,
-        //   label: "鍏朵粬閫氱煡",
-        // },
-        {
-          value: 9,
-          label: "浣撴闅忚",
-        },
-        // {
-        //   value: 1",
-        //   label: "鍖绘妧闅忚",
-        // },
-        {
-          value: 11,
-          label: "褰卞儚闅忚",
-        },
-        {
-          value: 12,
-          label: "蹇冪數闅忚",
-        },
-        // {
-        //   value: "13",
-        //   label: "涓撶梾闅忚",
-        // },
-      ],
-      // 绉戝/鐥呭尯
+      tasktypes: store.getters.tasktypes,
+      // 璇鹃缁�/鐥呭尯
       belongWards: [],
       deptlist: [],
       hosplist: [],
       diagglist: [],
       operlist: [],
-      tempDetpRelevanceslist: [], //绉戝鏁版嵁
-      tempDetpRelevanceslistform: [], //绉戝鏁版嵁
+      tempDetpRelevanceslist: [], //璇鹃缁勬暟鎹�
+      tempDetpRelevanceslistform: [], //璇鹃缁勬暟鎹�
       tempbelongWards: [], //鐥呭尯鏁版嵁
       tempbelongWardsform: [], //鐥呭尯鏁版嵁
       rules: {
@@ -1225,14 +1179,14 @@
           { required: true, message: "鍙戦�佽缃笉鑳戒负绌�", trigger: "blur" },
         ],
         deptcode: [
-          { required: true, message: "閫傜敤绉戝涓嶈兘涓虹┖", trigger: "blur" },
+          { required: true, message: "閫傜敤璇鹃缁勪笉鑳戒负绌�", trigger: "blur" },
         ],
         // leavehospitaldistrictcode: [
         //   { required: true, message: "閫傜敤鐥呭尯涓嶈兘涓虹┖", trigger: "blur" },
         // ],
       },
       belongDepts: [],
-      // 绉戝闄㈠尯鏌ヨ鍏ュ弬
+      // 璇鹃缁勯櫌鍖烘煡璇㈠叆鍙�
       queryParamsdept: {},
       quote: false,
       serviceType: null,
@@ -1330,9 +1284,9 @@
             value: "5",
             label: "寰俊鍏紬鍙�",
           },
-          { label: "寰俊灏忕▼搴�", value: 6 },
+          { label: "寰俊灏忕▼搴�", value: '6' },
         ];
-      } else if (this.form.serviceType == 6) {
+      } else if (this.form.serviceType == 6||this.form.serviceType == 14||this.form.serviceType == 15) {
         this.checkboxlist = [
           {
             value: "3",
@@ -1399,6 +1353,7 @@
         this.form.serviceType == 2 ||
         this.form.serviceType == 3 ||
         this.form.serviceType == 5 ||
+        this.form.serviceType == 16 ||
         this.form.serviceType == 4
       ) {
         this.checkboxlist = [
@@ -1486,7 +1441,8 @@
         this.deptcodesWards[0] ||
         this.leavehospitaldistrictcodes[0] ||
         this.diagglist[0] ||
-        this.operationcodes[0]
+        this.operationcodes[0] ||
+        this.form.longTask == 2
       ) {
       } else {
         this.$modal.msgError("璇烽�夋嫨浠诲姟鍏宠仈鏉′欢");
@@ -1698,7 +1654,7 @@
           { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
           { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
           { label: "鍖荤敓", width: "", prop: "drname" },
-          { label: "绉戝", width: "180", prop: "dept" },
+          { label: "璇鹃缁�", width: "180", prop: "dept" },
           { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
         ];
       } else if (this.patientqueryParams.allhosp == 1) {
@@ -1712,7 +1668,7 @@
           { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
           { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
           { label: "鍖荤敓", width: "", prop: "drname" },
-          { label: "绉戝", width: "180", prop: "dept" },
+          { label: "璇鹃缁�", width: "180", prop: "dept" },
           { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
         ];
       }
@@ -1886,7 +1842,7 @@
       this.patientqueryParams = {
         pageNum: 1, //
         pageSize: 10,
-        topica: 1, //0鍏ㄩ儴1绉戝2鐥呭尯
+        topica: 1, //0鍏ㄩ儴1璇鹃缁�2鐥呭尯
         leavehospitaldistrictcodes: [],
         leaveldeptcodes: [],
       };
@@ -1957,7 +1913,7 @@
                 this.time1 = this.form.showTimeMorn.split(",");
               }
             }
-            // 鑾峰彇浠诲姟绉戝
+            // 鑾峰彇浠诲姟璇鹃缁�
             if (this.form.taskid) {
               this.listDept();
             }
@@ -2034,7 +1990,7 @@
         }
       });
     },
-    // 浠诲姟绉戝鍒犻櫎瑙﹀彂
+    // 浠诲姟璇鹃缁勫垹闄よЕ鍙�
     removetag(row) {
       let result = this.deptlist
         .filter((item) => item.deptCode == row)
@@ -2224,7 +2180,7 @@
         });
       }
     },
-    // 淇濆瓨绉戝/鐥呭尯
+    // 淇濆瓨璇鹃缁�/鐥呭尯
     putbelongDepts(id) {
       this.tempDetpRelevanceslistform.forEach((item) => {
         item.tempid = id;
@@ -2234,7 +2190,7 @@
       });
       depthospgetson(this.tempDetpRelevanceslistform).then((res) => {
         if (res.code == 200) {
-          this.$modal.msgSuccess("绉戝鏇存柊鎴愬姛");
+          this.$modal.msgSuccess("璇鹃缁勬洿鏂版垚鍔�");
           this.tempDetpRelevanceslistform = [];
         }
       });
@@ -2246,7 +2202,7 @@
       });
     },
 
-    // 绉戝澶勭悊
+    // 璇鹃缁勫鐞�
     Departmenttreatment() {
       if (!this.form.taskid) {
         this.templateor = true;

--
Gitblit v1.9.3