From f5221c566758ab0873727da3cb3df645708eb085 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期六, 13 九月 2025 14:41:12 +0800
Subject: [PATCH] 测试分支发布

---
 src/views/patient/propaganda/QuestionnaireTask.vue |   76 ++++++++------------------------------
 1 files changed, 16 insertions(+), 60 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 2548a55..87d5d31 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">
@@ -438,7 +439,7 @@
       </div>
       <!-- 浠诲姟璇︽儏 -->
       <div v-if="Editprogress == 2">
-        <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹ｆ暀鐥呬汉" 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="鎮ｈ�呰瘖鏂細">
                 <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>
@@ -1108,11 +1115,11 @@
       },
       taskoptions: [
         {
-          value: "1",
+          value: "4",
           label: "鍑洪櫌鐥呬汉",
         },
         {
-          value: "4",
+          value: "1",
           label: "鍦ㄩ櫌鐥呬汉",
         },
         {
@@ -1147,60 +1154,7 @@
         },
       ],
 
-      tasktypes: [
-        {
-          value: 1,
-          label: "鐩戞祴璇勪及",
-        },
-        {
-          value: 2,
-          label: "鍑洪櫌闅忚",
-        },
-        {
-          value: 3,
-          label: "闂ㄨ瘖闅忚",
-        },
-        {
-          value: 4,
-          label: "瀹ｆ暀鍏虫��",
-        },
-        {
-          value: 5,
-          label: "澶嶈瘖绠＄悊",
-        },
-        // {
-        //   value: 5,
-        //   label: "婊℃剰搴﹁皟鏌�",
-        // },
-        {
-          value: 7,
-          label: "鎮ｈ�呮姤鍛�",
-        },
-        // {
-        //   value: 8,
-        //   label: "鍏朵粬閫氱煡",
-        // },
-        {
-          value: 9,
-          label: "浣撴闅忚",
-        },
-        // {
-        //   value: 1",
-        //   label: "鍖绘妧闅忚",
-        // },
-        {
-          value: 11,
-          label: "褰卞儚闅忚",
-        },
-        {
-          value: 12,
-          label: "蹇冪數闅忚",
-        },
-        // {
-        //   value: "13",
-        //   label: "涓撶梾闅忚",
-        // },
-      ],
+      tasktypes: store.getters.tasktypes,
       // 绉戝/鐥呭尯
       belongWards: [],
       deptlist: [],
@@ -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("璇烽�夋嫨浠诲姟鍏宠仈鏉′欢");

--
Gitblit v1.9.3