From 5fc42c5d825592f2c04ca284f4360f9bbad62174 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 12 六月 2025 16:53:45 +0800
Subject: [PATCH] 11

---
 src/views/doctor/checkAll/index.vue |   99 +++++++++++++++++++++++++------------------------
 1 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 4ba000e..912467e 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -1,11 +1,54 @@
 <template>
   <div class="mainbox">
-    <el-form
+    <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px" v-if="tjStatus == 1">
+      <el-form-item label="濮撳悕" prop="name">
+        <el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable
+          @keyup.enter.native="submitForm"></el-input>
+      </el-form-item>
+      <el-form-item label="浣撴鍙�" prop="tjNumber">
+        <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 180px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+          @keyup.enter.native="submitForm" @blur="hb"></el-input>
+      </el-form-item>
+
+      <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px">
+        <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
+          style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
+          <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
+        </el-select>
+      </el-form-item>
+       <el-form-item label="瀹℃牳鍖诲笀" prop="shys">
+        <el-input ref="inputName" v-model="queryParams.shys" style="width: 180px" placeholder="璇疯緭鍏ュ鏍稿尰甯�" clearable
+          @keyup.enter.native="submitForm"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button>
+        <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
+        <el-button type="primary" size="mini" @click="toggleCollapse" style="margin-right: 15px"
+          v-show="isCollapsed == 0">楂樼骇鎼滅储</el-button>
+        <el-button type="primary" size="mini" @click="toggleCollapse3" style="margin-right: 15px"
+          v-show="isCollapsed == 1">楂樼骇鎼滅储</el-button>
+      </el-form-item>
+      <el-row v-show="isCollapsed == 1" :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="浣撴鏃堕棿" prop="tjTime">
+            <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions"
+              style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
+              :default-time="['00:00:00', '23:00:00']" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
+              @change="dateChangebirthday1">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+
+     <el-form
       :model="queryParams"
       ref="tableList"
       :inline="true"
       label-width="76px"
       style="margin-top: 10px"
+      v-else
     >
       <el-form-item label="濮撳悕" prop="name">
         <el-input
@@ -79,49 +122,6 @@
       </el-form-item>
     </el-form>
 
-
-    <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px" v-if="tjStatus == 1">
-      <el-form-item label="濮撳悕" prop="name">
-        <el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable
-          @keyup.enter.native="submitForm"></el-input>
-      </el-form-item>
-      <el-form-item label="浣撴鍙�" prop="tjNumber">
-        <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 180px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
-          @keyup.enter.native="submitForm" @blur="hb"></el-input>
-      </el-form-item>
-
-      <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px">
-        <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
-          style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
-          <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
-        </el-select>
-      </el-form-item>
-       <el-form-item label="瀹℃牳鍖诲笀" prop="shys">
-        <el-input ref="inputName" v-model="queryParams.shys" style="width: 180px" placeholder="璇疯緭鍏ュ鏍稿尰甯�" clearable
-          @keyup.enter.native="submitForm"></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button>
-        <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
-        <el-button type="primary" size="mini" @click="toggleCollapse" style="margin-right: 15px"
-          v-show="isCollapsed == 0">楂樼骇鎼滅储</el-button>
-        <el-button type="primary" size="mini" @click="toggleCollapse3" style="margin-right: 15px"
-          v-show="isCollapsed == 1">楂樼骇鎼滅储</el-button>
-      </el-form-item>
-      <el-row v-show="isCollapsed == 1" :gutter="20">
-        <el-col :span="8">
-          <el-form-item label="浣撴鏃堕棿" prop="tjTime">
-            <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions"
-              style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
-              :default-time="['00:00:00', '23:00:00']" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
-              @change="dateChangebirthday1">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-    </el-form>
-
     <el-radio-group v-model="tjStatus" @input="radioChange" style="margin-left: 20px">
       <el-radio-button label="0">鏈鏍�</el-radio-button>
       <el-radio-button label="1">宸插鏍�</el-radio-button>
@@ -145,7 +145,8 @@
         <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" :show-overflow-tooltip="true" width="110px" />
         <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" :show-overflow-tooltip="true" width="130px" />
         <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px" />
-        <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" />
+        <!-- <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" /> -->
+        <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" :show-overflow-tooltip="true" width="160px" />
         <el-table-column label="鐘舵��" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="120px" v-if="tjStatus == 0">
           <template slot-scope="scope" v-if="tjStatus == 0">
             <span>{{ scope.row.tjStatus == "1" ? "宸插鏍�" : "鏈鏍�" }}</span>
@@ -1055,7 +1056,7 @@
       Testitems: [],
       CheckBox: {},
       startTime: [],
-       isCollapsed: 0,
+      isCollapsed: 0,
       textarea1: "",
       loading: true,
       selectLettercurrent: " ",
@@ -1611,11 +1612,13 @@
 
       getcheckList(this.queryParams).then((response) => {
         if (response.code == 200) {
-          this.loading = false;
+          // this.loading = false;
           if (response.data) {
             if (response.data.date) {
+              this.loading = false;
               this.checkList = response.data.date;
             } else {
+              this.loading = false;
               this.checkList = response.data.customers;
             }
             this.total = response.data.total;
@@ -1627,7 +1630,7 @@
 
       getCompany(this.queryParam).then((response) => {
         this.CompanyList = response.data;
-        this.loading = false;
+        // this.loading = false;
       });
     },
 

--
Gitblit v1.8.0