From 7c71fcb61dd0bfc6a179a973f9cab5ef979ad5f2 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期一, 02 二月 2026 17:11:56 +0800
Subject: [PATCH] 测试完成

---
 src/views/patient/patient/AwaitingAdmission.vue |  241 +++++++++++++++++-------------------------------
 1 files changed, 86 insertions(+), 155 deletions(-)

diff --git a/src/views/patient/patient/AwaitingAdmission.vue b/src/views/patient/patient/AwaitingAdmission.vue
index a4f82aa..6a72312 100644
--- a/src/views/patient/patient/AwaitingAdmission.vue
+++ b/src/views/patient/patient/AwaitingAdmission.vue
@@ -11,42 +11,6 @@
           v-show="showSearch"
           label-width="98px"
         >
-          <el-form-item label="濮撳悕" width="100" prop="name">
-            <el-input
-              v-model="queryParams.patname"
-              placeholder="璇疯緭鍏ュ鍚�"
-              clearable
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="璇婃柇" width="100" prop="name">
-            <el-input
-              v-model="queryParams.diagname"
-              placeholder="璇疯緭鍏ヨ瘖鏂�"
-              clearable
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="绉戝" width="100" prop="name">
-            <el-input
-              v-model="queryParams.deptname"
-              placeholder="璇疯緭鍏ョ瀹ゅ悕绉�"
-              clearable
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="鍖荤敓" width="100" prop="name">
-            <el-input
-              v-model="queryParams.drname"
-              placeholder="璇疯緭鍏ュ尰鐢熷鍚�"
-              clearable
-              style="width: 200px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
           <el-form-item label="鐥呮鍙�" prop="outhospno">
             <el-input
               v-model="queryParams.outhospno"
@@ -56,17 +20,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-
-          <el-form-item label="鎮h�呰寖鍥�" prop="status">
-            <el-cascader
-              v-model="queryParams.scopetype"
-              placeholder="榛樿鍏ㄩ儴"
-              :options="sourcetype"
-              :props="{ expandTrigger: 'hover' }"
-              @change="handleChange"
-            ></el-cascader>
-          </el-form-item>
-          <el-form-item label="灏辫瘖鏃ユ湡">
+          <el-form-item label="棰勭害浣忛櫌鏃ユ湡">
             <el-date-picker
               v-model="dateRange"
               style="width: 240px"
@@ -76,28 +30,31 @@
               start-placeholder="寮�濮嬫棩鏈�"
               end-placeholder="缁撴潫鏃ユ湡"
             ></el-date-picker>
-            <!-- <el-date-picker
-                v-model="dateRange"
-                type="datetimerange"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                start-placeholder="寮�濮嬫棩鏈�"
-                end-placeholder="缁撴潫鏃ユ湡"
-                :default-time="['12:00:00']"
+          </el-form-item>
+          <el-form-item label="鏈夋棤闄㈠墠妫�鏌�" prop="status">
+            <el-select v-model="queryParams.examine" placeholder="璇烽�夋嫨">
+              <el-option label="鏈�" :value="1"> </el-option>
+              <el-option label="鏃�" :value="2"> </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="鏀舵不绫诲瀷" prop="status">
+            <el-select v-model="queryParams.cureType" placeholder="璇烽�夋嫨">
+              <el-option
+                v-for="item in dict.type.receive_and_cure"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
               >
-              </el-date-picker> -->
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="瀹夋帓鐘舵��" prop="status">
+            <el-select v-model="queryParams.arrange" placeholder="璇烽�夋嫨">
+              <el-option label="宸插畨鎺�" :value="1"> </el-option>
+              <el-option label="鏈畨鎺�" :value="2"> </el-option>
+            </el-select>
           </el-form-item>
           <el-row>
-            <!-- <el-form-item label=" 灏辫瘖鏃ユ湡 " prop="admitdate">
-              <el-date-picker
-                clearable
-                v-model="queryParams.admitdate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="璇烽�夋嫨 灏辫瘖鏃ユ湡 "
-              >
-              </el-date-picker>
-            </el-form-item> -->
-
             <el-form-item>
               <el-button
                 type="primary"
@@ -207,6 +164,12 @@
             prop="id"
           /> -->
           <el-table-column
+            label="鐥呮鍙�"
+            align="center"
+            key="outhospno"
+            prop="outhospno"
+          />
+          <el-table-column
             label="灏辫瘖鏃堕棿"
             align="center"
             key="admitdate"
@@ -217,18 +180,29 @@
               <span>{{ formatTime(scope.row.admitdate) }}</span>
             </template>
           </el-table-column>
-          <!-- <el-table-column
-            label="鐥呮鍙�"
-            align="center"
-            key="patno"
-            prop="patno"
-          /> -->
           <el-table-column
-            label="鐥呮鍙�"
+            label="棰勭害浣忛櫌鏃ユ湡"
             align="center"
-            key="outhospno"
-            prop="outhospno"
-          />
+            key="admitdate"
+            prop="admitdate"
+            width="160"
+          >
+            <template slot-scope="scope">
+              <span>{{ formatTime(scope.row.admitdate) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="棰勭害璇婃柇鏃ユ湡"
+            align="center"
+            key="admitdate"
+            prop="admitdate"
+            width="160"
+          >
+            <template slot-scope="scope">
+              <span>{{ formatTime(scope.row.admitdate) }}</span>
+            </template>
+          </el-table-column>
+
           <el-table-column
             label="濮撳悕"
             width="100"
@@ -272,70 +246,54 @@
             width="120"
           />
           <el-table-column
+            label="韬唤璇佸彿"
+            align="center"
+            key="idcardno"
+            prop="idcardno"
+            width="220"
+          />
+          <el-table-column
             label="鑱旂郴鐢佃瘽"
             align="center"
             key="telcode"
             prop="telcode"
             width="120"
           />
-          <!-- <el-table-column
-            label="鎮h�呮爣绛撅紙缂猴級"
-            align="center"
-            key="tagList"
-            prop="tagList"
-            width="160"
-            :show-overflow-tooltip="true"
-          >
-            <template slot-scope="scope">
-              <span v-for="item in scope.row.tagList">{{ item }} </span>
-            </template>
-          </el-table-column> -->
 
           <el-table-column
-            label="璇婃柇"
-            align="center"
-            key="diagname"
-            prop="diagname"
-            width="190"
-          />
-          <!-- <el-table-column
-            label="涓昏堪"
-            align="center"
-            key="mainsuit"
-            prop="mainsuit"
-            width="120"
-          /> -->
-          <el-table-column
-            label="灏辫瘖绉戝"
+            label="绉戝"
             align="center"
             key="deptname"
             prop="deptname"
             width="120"
           />
           <el-table-column
-            label="鎺ヨ瘖鍖荤敓"
+            label="鏈夋棤闄㈠墠妫�鏌�"
+            align="center"
+            key="deptname"
+            prop="deptname"
+            width="120"
+          />
+          <el-table-column
+            label="鏀舵不绫诲瀷"
+            align="center"
+            key="deptname"
+            prop="deptname"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <dict-tag
+                :options="dict.type.receive_and_cure"
+                :value="scope.row.sendState"
+              /> </template
+          ></el-table-column>
+          <el-table-column
+            label="瀹夋帓鐘舵��"
             align="center"
             key="drname"
             prop="drname"
             width="120"
           />
-          <el-table-column
-            label="鏄惁瀛樺湪浠诲姟"
-            align="center"
-            key="serverState"
-            prop="serverState"
-            width="100"
-          >
-            <template slot-scope="scope">
-              <span
-                :style="{
-                  color: scope.row.serverState == 1 ? 'green' : 'gray',
-                }"
-              >
-                {{ scope.row.serverState == 1 ? "鏄�" : "鏃�" }}
-              </span>
-            </template>
-          </el-table-column>
           <el-table-column
             label="鎿嶄綔"
             fixed="right"
@@ -576,7 +534,7 @@
 import { delUser } from "@/api/system/user";
 
 import {
-  listPatouthosp,
+  listPatMedInhosp,
   getPatouthosp,
   addPatouthosp,
   updatePatouthosp,
@@ -594,7 +552,7 @@
 
 export default {
   name: "Userhuanze",
-  dicts: ["sys_normal_disable", "sys_user_sex"],
+  dicts: ["sys_normal_disable", "sys_user_sex", "receive_and_cure"],
   components: { Treeselect },
   data() {
     return {
@@ -739,9 +697,7 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        searchscope: 3,
-        scopetype: [],
-        deptcodes: [],
+
       },
       // 琛ㄥ崟鏍¢獙
       rules: {
@@ -817,13 +773,6 @@
     /** 鏌ヨ鎮h�呭垪琛� */
     getList() {
       this.loading = true;
-      if (this.queryParams.searchscope == 3) {
-        this.queryParams.deptcodes = store.getters.belongDepts.map(
-          (obj) => obj.deptCode
-        );
-        // this.queryParams.leavehospitaldistrictcodes =
-        //   store.getters.belongWards.map((obj) => obj.districtCode);
-      }
       if (this.dateRange) {
         this.queryParams.beginTime = this.dateRange[0];
         this.queryParams.endTime = this.dateRange[1];
@@ -831,7 +780,9 @@
         this.queryParams.beginTime = "";
         this.queryParams.endTime = "";
       }
-      listPatouthosp(this.queryParams).then((response) => {
+        this.loading = false;
+
+      listPatMedInhosp(this.queryParams).then((response) => {
         this.userList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -851,25 +802,7 @@
         this.optionstag = response.rows;
       });
     },
-    // 鎮h�呰寖鍥村鐞�
-    handleChange(value) {
-      let type = value[0];
-      let code = value.slice(-1)[0];
-      // this.queryParams.leavehospitaldistrictcodes = [];
-      this.queryParams.deptcodes = [];
 
-      if (type == 1) {
-        this.queryParams.deptcodes.push(code);
-        // this.queryParams.leavehospitaldistrictcodes = [];
-        this.queryParams.searchscope = 1;
-      } else if (type == 2) {
-        // this.queryParams.leavehospitaldistrictcodes.push(code);
-        this.queryParams.deptcodes = [];
-        this.queryParams.searchscope = 2;
-      } else {
-        this.queryParams.searchscope = 3;
-      }
-    },
     // 鏌ヨ瀵煎叆灞曠ず鍒楄〃
     geterryList() {
       this.loading = true;
@@ -936,9 +869,7 @@
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-        searchscope: 3,
-        scopetype: [],
-        deptcodes: [],
+
         // leavehospitaldistrictcodes: [],
       };
       this.handleQuery();

--
Gitblit v1.9.3