From da5ca684352b166fa2c0644ed0944df87f85a106 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 28 四月 2025 14:18:14 +0800
Subject: [PATCH] 1

---
 src/views/doctor/check/index.vue    |    3 ++-
 src/components/public/index.vue     |    4 ++--
 src/views/picture/picture/index.vue |   38 +++++++++++++++++++++-----------------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index 19a6ccc..7781757 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -6,7 +6,7 @@
         妫�娴嬬粨鏋� :{{ fList.proResult }}{{ fList.project.proMetering }}
       </h3>
 
-      <h2 style="text-align: center;">{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h2>
+      <h2 style="text-align: center;">{{ proName || '鏆傛棤椤圭洰鍚嶇О' }}</h2>
       <div style="display: flex; width: 100%">
         <div style="width: 50%; margin-right: 40px">
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
@@ -146,7 +146,7 @@
         if (newVal && newVal.length > 0) {
           const firstProject = newVal[0]; // 浣犱篃鍙互閬嶅巻鎵�鏈夐」鐩紝鐪嬩綘涓氬姟闇�姹�
           this.queryParams.proId = firstProject.proId; // 鍋囪椤圭洰涓彨 id
-          this.queryParams.proName = firstProject.proName; // 鍋囪鍙� proName
+          //this.queryParams.proName = firstProject.proName; // 鍋囪鍙� proName
           this.proName = firstProject.proName
         }
       },
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index af5ab3f..d09e7bb 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -36,7 +36,8 @@
           </template>
         </el-table-column>
         <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" width="100px" />
-        <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" width="100px" />
+        <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="100px" />
+        <!-- <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" width="100px" /> -->
         <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" />
         <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjTime" width="160px">
         </el-table-column>
diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue
index 62558e2..76fcd3e 100644
--- a/src/views/picture/picture/index.vue
+++ b/src/views/picture/picture/index.vue
@@ -1,14 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+      <el-form-item label="濮撳悕" prop="name">
+        <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable @keyup.enter.native="handleQuery"
+          style="width: 110px" />
+      </el-form-item>
       <el-form-item label="浣撴鍙�" prop="tjNumber">
         <el-input ref="inputName" v-model="queryParams.tjNumber" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
           @keyup.enter.native="handleQuery" @blur="hb" style="width: 170px" />
       </el-form-item>
-
-      <el-form-item label="濮撳悕" prop="name">
-        <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable @keyup.enter.native="handleQuery"
-          style="width: 110px" />
+      <el-form-item label="椤圭洰" prop="tcm">
+        <el-input v-model="queryParams.tcm" placeholder="璇疯緭鍏ラ」鐩�" clearable @keyup.enter.native="handleQuery"
+          style="width: 170px" />
       </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"
@@ -16,25 +19,26 @@
           <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="tcm">
-        <el-input v-model="queryParams.tcm" placeholder="璇疯緭鍏ラ」鐩�" clearable @keyup.enter.native="handleQuery"
-          style="width: 170px" />
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+          style="margin-right: 15px">鎼滅储</el-button>
+        <el-button icon="el-icon-refresh" 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-form-item label="鐧昏鏃堕棿" prop="createTimeList" v-show="isCollapsed == 1">
+      
+      <el-row v-show="isCollapsed == 1" :gutter="20">
+        <el-col :span="8">
+          <el-form-item label="鐧昏鏃堕棿" prop="createTimeList" v-show="isCollapsed == 1">
         <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
           style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:59:59']"
           format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
         </el-date-picker>
       </el-form-item>
-      <el-form-item>
-        <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-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
-          style="margin-right: 15px">鎼滅储</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
-      </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
     <el-radio-group v-model="checkStatus" @input="radioChange" style="margin: 10px 15px">

--
Gitblit v1.8.0