From 81ffbda9c4396086a740c988ae634c57a27f868d Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 01 四月 2025 17:40:25 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/technology/index.vue             |    2 
 src/views/patient/physical/index.vue                   |    2 
 src/views/followvisit/SpecificDisease/index.vue        |    2 
 src/views/patient/medtechnician/SpecializedService.vue |    2 
 src/views/patient/patient/index.vue                    |    6 ++-
 src/views/knowledge/education/index.vue                |    2 +
 src/views/patient/questionnaire/index.vue              |    2 
 src/views/patient/subsequent/index.vue                 |    2 
 src/views/followvisit/record/index.vue                 |   31 +++++++++++++++
 src/views/patient/patient/ExternalPatient.vue          |    2 
 src/views/followvisit/record/detailpage/index.vue      |    4 +
 src/views/patient/patient/operation.vue                |    2 
 src/views/patient/patient/hospital.vue                 |    2 
 src/views/patient/patient/behospitalized.vue           |    2 
 src/views/followvisit/discharge/index.vue              |   33 +++++++++++++++-
 src/views/patient/ycquestionnaire/index.vue            |    2 
 16 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/src/views/followvisit/SpecificDisease/index.vue b/src/views/followvisit/SpecificDisease/index.vue
index 2f9bd9c..22b69ad 100644
--- a/src/views/followvisit/SpecificDisease/index.vue
+++ b/src/views/followvisit/SpecificDisease/index.vue
@@ -192,7 +192,7 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="660"
+        height="808"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 8c6ac49..81059ef 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -130,6 +130,17 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="鎺掑簭鏂瑰紡" prop="status">
+   <el-select v-model="topqueryParams.sort" placeholder="璇烽�夋嫨">
+   <el-option
+    v-for="item in topicoptionssort"
+    :key="item.value"
+    :label="item.label"
+    :value="item.value"
+   >
+   </el-option>
+   </el-select>
+  </el-form-item>
 
         <el-form-item>
           <el-button
@@ -216,7 +227,7 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="660"
+        height="808"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
@@ -909,6 +920,24 @@
         qystatus: "",
         btstatus: "",
       },
+      topicoptionssort:[
+        {
+          value: 0,
+          label: "鍑洪櫌鏃堕棿(姝e簭)",
+        },
+        {
+          value: 1,
+          label: "鍑洪櫌鏃堕棿(鍊掑簭)",
+        },
+        {
+          value: 2,
+          label: "鍙戦�佹椂闂�(姝e簭)",
+        },
+        {
+          value: 3,
+          label: "鍙戦�佹椂闂�(鍊掑簭)",
+        },
+      ],
       // 鏌ヨ鍙傛暟
       topqueryParams: {
         pageNum: 1,
@@ -1247,9 +1276,9 @@
         pageNum: 1,
         pageSize: 10,
         serviceType: 2,
+        sort: 2,
         sendstate: 2,
         searchscope: 2,
-        sort: 2,
       };
       this.handleQuery(1);
     },
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 0fa7f18..3f1578b 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -654,6 +654,7 @@
     this.patid = this.$route.query.patid;
     this.Voicetype = this.$route.query.Voicetype;
     this.serviceType = this.$route.query.serviceType;
+console.log(this.id, this.patid);
 
     this.getTaskservelist(this.id);
   },
@@ -852,7 +853,8 @@
 
     // 鑾峰彇鎮h�呰褰�
     getTaskservelist(id) {
-      this.id = id;
+      console.log(id,'idsub');
+
       if (id) {
         this.Whetherall = false;
       } else {
diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue
index 1fda892..3d888ea 100644
--- a/src/views/followvisit/record/index.vue
+++ b/src/views/followvisit/record/index.vue
@@ -119,6 +119,17 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="鎺掑簭鏂瑰紡" prop="status">
+     <el-select v-model="topqueryParams.sort" placeholder="璇烽�夋嫨">
+      <el-option
+       v-for="item in topicoptionssort"
+       :key="item.value"
+       :label="item.label"
+       :value="item.value"
+      >
+      </el-option>
+     </el-select>
+    </el-form-item>
 
         <el-form-item>
           <el-button
@@ -854,6 +865,7 @@
         serviceType: 10,
         searchscope: 3,
         sendstate:2,
+        sort:2,
         scopetype: [],
         leaveldeptcodes: [],
         leavehospitaldistrictcodes: [],
@@ -897,6 +909,24 @@
           label: "姝e父",
         },
       ],
+      topicoptionssort:[
+    {
+     value: 0,
+     label: "鍑洪櫌鏃堕棿(姝e簭)",
+    },
+    {
+     value: 1,
+     label: "鍑洪櫌鏃堕棿(鍊掑簭)",
+    },
+    {
+     value: 2,
+     label: "鍙戦�佹椂闂�(姝e簭)",
+    },
+    {
+     value: 3,
+     label: "鍙戦�佹椂闂�(鍊掑簭)",
+    },
+   ],
       errtype: "",
       leavehospitaldistrictcode: "",
       serviceState: [],
@@ -1159,6 +1189,7 @@
         pageNum: 1,
         pageSize: 10,
         serviceType: 10,
+        sort:2,
         searchscope: 2,
         sendstate:2,
       };
diff --git a/src/views/followvisit/technology/index.vue b/src/views/followvisit/technology/index.vue
index cb5c2dd..16aaa2c 100644
--- a/src/views/followvisit/technology/index.vue
+++ b/src/views/followvisit/technology/index.vue
@@ -205,7 +205,7 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="660"
+        height="808"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
diff --git a/src/views/knowledge/education/index.vue b/src/views/knowledge/education/index.vue
index b692fc7..795dfde 100644
--- a/src/views/knowledge/education/index.vue
+++ b/src/views/knowledge/education/index.vue
@@ -824,6 +824,8 @@
     },
     // 鎵撳紑缁熻鍥捐〃
     statistics() {
+      this.Collarrname=[];
+      this.Collarrvalue=[];
       //鍙栨暟鎹�
       let obj = { assortid: 13, isavailable: "", pageNum: 1, pageSize: 20 };
       getlibrarylist(obj).then((response) => {
diff --git a/src/views/patient/medtechnician/SpecializedService.vue b/src/views/patient/medtechnician/SpecializedService.vue
index daf90c1..5b29d2a 100644
--- a/src/views/patient/medtechnician/SpecializedService.vue
+++ b/src/views/patient/medtechnician/SpecializedService.vue
@@ -158,7 +158,7 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="660"
+        height="808"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
diff --git a/src/views/patient/patient/ExternalPatient.vue b/src/views/patient/patient/ExternalPatient.vue
index b05136d..83cbeab 100644
--- a/src/views/patient/patient/ExternalPatient.vue
+++ b/src/views/patient/patient/ExternalPatient.vue
@@ -108,7 +108,7 @@
             <el-table
               v-loading="loading"
               :data="userList"
-              height="660"
+              height="808"
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="50" align="center" />
diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue
index c225bc3..b562b5f 100644
--- a/src/views/patient/patient/behospitalized.vue
+++ b/src/views/patient/patient/behospitalized.vue
@@ -115,7 +115,7 @@
         <el-table
           v-loading="loading"
           :data="userList"
-          height="660"
+          height="808"
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center" />
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index 84b808f..63842a9 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -118,7 +118,7 @@
         <el-table
           v-loading="loading"
           :data="userList"
-           height="660"
+           height="808"
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center" />
diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue
index 2ed950e..d89caa1 100644
--- a/src/views/patient/patient/index.vue
+++ b/src/views/patient/patient/index.vue
@@ -215,7 +215,7 @@
             <el-table
               v-loading="loading"
               :data="userList"
-              height="660"
+              height="808"
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="50" align="center" />
@@ -1370,7 +1370,8 @@
 }
 .sidecolumn {
   width: 180px;
-  min-height: 100vh;
+  min-height: 80vh;
+  position: fixed;
   text-align: center;
   //   display: flex;
   margin-top: 20px;
@@ -1448,6 +1449,7 @@
 }
 .leftvlue {
   width: 80%;
+  margin-left:220px ;
   margin-top: 10px;
 }
 .leftvlue-bg {
diff --git a/src/views/patient/patient/operation.vue b/src/views/patient/patient/operation.vue
index 4477244..1d42f42 100644
--- a/src/views/patient/patient/operation.vue
+++ b/src/views/patient/patient/operation.vue
@@ -82,7 +82,7 @@
         <el-table
           v-loading="loading"
           :data="userList"
-           height="660"
+           height="808"
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="selection" width="50" align="center" />
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index 48f8520..7ea596b 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -192,7 +192,7 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="660"
+        height="808"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index b7dbd80..0258c6a 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -192,7 +192,7 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="660"
+        height="808"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
diff --git a/src/views/patient/subsequent/index.vue b/src/views/patient/subsequent/index.vue
index 2959b49..86907d2 100644
--- a/src/views/patient/subsequent/index.vue
+++ b/src/views/patient/subsequent/index.vue
@@ -192,7 +192,7 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="660"
+        height="808"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >
diff --git a/src/views/patient/ycquestionnaire/index.vue b/src/views/patient/ycquestionnaire/index.vue
index 40647e7..b0e44de 100644
--- a/src/views/patient/ycquestionnaire/index.vue
+++ b/src/views/patient/ycquestionnaire/index.vue
@@ -192,7 +192,7 @@
       <el-table
         v-loading="loading"
         :data="userList"
-        height="660"
+        height="808"
         :row-class-name="tableRowClassName"
         @selection-change="handleSelectionChange"
       >

--
Gitblit v1.9.3