From d96a7562b2515584fac4dcb57fdbdcadc8f36fef Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期六, 03 八月 2024 17:48:23 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/propaganda/QuestionnaireTask.vue |   68 +++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index a5de586..2a871f3 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -169,18 +169,6 @@
               </el-form>
             </div>
           </div>
-        </div>
-        <el-button type="success" @click="nextstep('ruleForm')">{{
-          quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
-        }}</el-button>
-        <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
-      </div>
-
-      <!-- 浠诲姟璇︽儏 -->
-      <div v-if="Editprogress == 2">
-        <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹f暀鐥呬汉" type="success" effect="dark">
-        </el-alert>
-        <div class="leftvlue-jbxx">
           <div class="examine-jic">
             <div class="headline">
               <div>鍙橀噺鍖归厤閲忓弬</div>
@@ -226,6 +214,18 @@
               </div>
             </div>
           </div>
+        </div>
+        <el-button type="success" @click="nextstep('ruleForm')">{{
+          quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
+        }}</el-button>
+        <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
+      </div>
+
+      <!-- 浠诲姟璇︽儏 -->
+      <div v-if="Editprogress == 2">
+        <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹f暀鐥呬汉" type="success" effect="dark">
+        </el-alert>
+        <div class="leftvlue-jbxx">
           <div class="examine-jic">
             <div class="headline">
               <div>鎮h�呭垪琛�</div>
@@ -234,7 +234,7 @@
               <div class="jic-value">
                 <el-row :gutter="20">
                   <!--鐢ㄦ埛鏁版嵁-->
-                  <el-form
+                  <!-- <el-form
                     :model="topqueryParams"
                     ref="queryForm"
                     size="small"
@@ -314,7 +314,7 @@
                       >
                     </el-form-item>
                   </el-form>
-                  <el-divider></el-divider>
+                  <el-divider></el-divider> -->
                   <el-row :gutter="10" class="mb8">
                     <el-col :span="1.5">
                       <el-select
@@ -363,6 +363,7 @@
                     :currentList="overallCase"
                     :tableLabel="tableLabelhz"
                     :serialnumber="false"
+                    :searchTrue="true"
                     :multiplechoice="false"
                     :controlxz="false"
                     :typeinfo="2"
@@ -388,7 +389,7 @@
     </div>
     <!-- 娣诲姞鎮h�� -->
     <el-dialog
-      title="娣诲姞娲惧彂鎮h��"
+      title="閫夋嫨鎮h��"
       :visible.sync="dialogVisiblepatient"
       width="70%"
       :before-close="handleClosehz"
@@ -410,7 +411,7 @@
                 <el-input v-model="patientqueryParams.name"></el-input>
               </el-form-item>
 
-              <el-form-item label="灏辫瘖绉戝" prop="status">
+              <!-- <el-form-item label="灏辫瘖绉戝" prop="status">
                 <el-select
                   v-model="patientqueryParams.topic"
                   placeholder="璇烽�夋嫨"
@@ -429,7 +430,7 @@
                     </el-option>
                   </el-option-group>
                 </el-select>
-              </el-form-item>
+              </el-form-item> -->
 
               <el-form-item>
                 <el-button
@@ -945,11 +946,7 @@
       this.currenttype = this.$route.query.type;
       this.title = "闂嵎鍐呭鍒楄〃";
       this.tableLabel = this.tableLabelwj;
-      this.checkboxlist = [
-        "绾夸笅锛堢焊璐級",
-        "绾夸笂锛堢煭淇�/閽夐拤鐨勬枃鏈�侀棶鍗烽摼鎺ワ級",
-        "寰俊鍏紬鍙�",
-      ];
+      this.checkboxlist = ["鐭俊", "寰俊", "浜哄伐鐢佃瘽", "鏅鸿兘鏈哄櫒浜�"];
       getQtemplatelist(queryParams).then((response) => {
         this.userList = response.rows;
         this.total = response.total;
@@ -964,6 +961,10 @@
     submitForm(formName) {
       // this.form.preachform = this.checkList.join(",");
       this.formatFn(1);
+      if (!this.form.patTaskRelevances[0]) {
+        this.$modal.msgError("璇烽�夋嫨鐥呬汉");
+        return;
+      }
       this.form.hospType = this.currenttype;
       const filteredArray = this.variableList.filter(
         (item) =>
@@ -1045,6 +1046,29 @@
       this.overallCase.forEach((item) => {
         this.allpids.push(item.patid);
       });
+      if (this.patientqueryParams.allhosp == 1) {
+        this.tableLabelhz = [
+          { label: "搴忓彿", width: "", prop: "patid" },
+          { label: "鎮h�呭悕绉�", width: "", prop: "name" },
+          { label: "鎬у埆", width: "", prop: "sex" },
+          { label: "骞撮緞", width: "", prop: "age" },
+          { label: "涓讳换鍖诲笀", width: "", prop: "drname" },
+          { label: "灏辫瘖绉戝", width: "", prop: "deptName" },
+          { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
+          { label: "鍒涘缓浜�", width: "", prop: "createBy" },
+        ];
+      } else if (this.patientqueryParams.allhosp == 2) {
+        this.tableLabelhz = [
+          { label: "搴忓彿", width: "", prop: "patid" },
+          { label: "鎮h�呭悕绉�", width: "", prop: "name" },
+          { label: "鎬у埆", width: "", prop: "sex" },
+          { label: "骞撮緞", width: "", prop: "age" },
+          { label: "璇婃柇", width: "", prop: "diagname" },
+          { label: "灏辫瘖绉戝", width: "", prop: "deptName" },
+          { label: "鍏ラ櫌鏃ユ湡", width: "", prop: "inhosptime" },
+          { label: "鍒涘缓浜�", width: "", prop: "createBy" },
+        ];
+      }
       if (this.allpids[0]) {
         this.patientqueryParams.pids = this.allpids;
         console.log(this.patientqueryParams.pids);

--
Gitblit v1.9.3