From d7955aa628b7579039e90fe8334067ca9bfe28cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8C=97=E5=8C=97?= <2958847195@qq.com>
Date: Fri, 28 Nov 2025 09:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-local.yml  |   2 +-
 .../medicineStorage/purchaseOrder/index.vue   |   9 +-
 .../medicineStorage/stockInOrder/index.vue    | 125 +++++++++---------
 3 files changed, 73 insertions(+), 63 deletions(-)

diff --git a/openhis-server-new/openhis-application/src/main/resources/application-local.yml b/openhis-server-new/openhis-application/src/main/resources/application-local.yml
index 9042834d..25e5ee40 100644
--- a/openhis-server-new/openhis-application/src/main/resources/application-local.yml
+++ b/openhis-server-new/openhis-application/src/main/resources/application-local.yml
@@ -6,7 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=public&characterEncoding=UTF-8&client_encoding=UTF-8
+        url: jdbc:postgresql://192.168.110.252:15432/postgresql?currentSchema=hisdev&characterEncoding=UTF-8&client_encoding=UTF-8
         username: postgresql
         password: Jchl1528
       # 从库数据源
diff --git a/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/index.vue b/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/index.vue
index a773aeb6..7e2a92f3 100644
--- a/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/index.vue
+++ b/openhis-ui-vue3/src/views/medicineStorage/purchaseOrder/index.vue
@@ -111,7 +111,12 @@
           </el-form>
         </el-row>
         <el-row :gutter="10">
-          <el-scrollbar height="calc(100vh - 350px)" style="width: 100%">
+          <!-- 固定位置的新增单据按钮，始终可见 -->
+          <div class="fixed-add-button" style="margin-bottom: 10px; text-align: center;">
+            <el-button type="primary" @click="handleAdd" :disabled="isAddDisabled"> 新增单据 </el-button>
+          </div>
+          
+          <el-scrollbar height="calc(100vh - 400px)" style="width: 100%">
             <div class="order-list-container">
               <!-- 有数据时显示列表 -->
               <template v-if="orderList.length > 0">
@@ -169,7 +174,7 @@
               <!-- 空状态显示 -->
               <div v-else class="empty-state">
                 <el-empty description="暂无单据" :image-size="80">
-                  <el-button type="primary" @click="handleAdd"> 新增单据 </el-button>
+                  <!-- 空状态下不再显示新增单据按钮，因为已在上方固定位置显示 -->
                 </el-empty>
               </div>
             </div>
diff --git a/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/index.vue b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/index.vue
index 23b38a62..f233d0c0 100644
--- a/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/index.vue
+++ b/openhis-ui-vue3/src/views/medicineStorage/stockInOrder/index.vue
@@ -111,67 +111,72 @@
           </el-form>
         </el-row>
         <el-row :gutter="10">
-          <el-scrollbar height="calc(100vh - 350px)" style="width: 100%">
-            <div class="order-list-container">
-              <!-- 有数据时显示列表 -->
-              <template v-if="orderList.length > 0">
-                <div
-                  v-for="item in orderList"
-                  :key="item.supplyBusNo"
-                  :class="['order-item', { 'is-active': selectedOrder === item }]"
-                  @click="handleOrderClick(item)"
-                >
-                  <el-card class="order-card" shadow="hover">
-                    <div class="order-header">
-                      <div class="order-number">
-                        <el-icon><Document /></el-icon>
-                        <span class="number-text">{{ item.supplyBusNo }}</span>
-                      </div>
-                    </div>
-                    <div class="order-content">
-                      <div class="info-item">
-                        <el-icon class="info-icon"><User /></el-icon>
-                        <span class="label">采购员：</span>
-                        <span class="value">{{ item.applicantId_dictText }}</span>
-                      </div>
-                      <div class="info-item">
-                        <el-icon class="info-icon"><Shop /></el-icon>
-                        <span class="label">供应商：</span>
-                        <span class="value">{{ item.supplierId_dictText }}</span>
-                      </div>
-                      <div class="info-item">
-                        <el-icon class="info-icon"><User /></el-icon>
-                        <span class="label">审核状态：</span>
-                        <el-tag type="success" v-if="item.statusEnum_enumText === '同意'">
-                          {{ item.statusEnum_enumText }}
-                        </el-tag>
-                        <el-tag type="danger" v-else>
-                          {{ item.statusEnum_enumText }}
-                        </el-tag>
-                      </div>
-                      <div class="info-item">
-                        <el-icon class="info-icon"><Files /></el-icon>
-                        <span class="label">单据类型：</span>
-                        <span class="value">{{ item.typeEnum_enumText }}</span>
-                      </div>
-                      <div class="info-item">
-                        <el-icon class="info-icon"><Calendar /></el-icon>
-                        <span class="label">单据日期：</span>
-                        <span class="value">{{
-                          parseTime(item.applyTime, '{y}-{m}-{d} {h}:{i}:{s}')
-                        }}</span>
-                      </div>
-                    </div>
-                  </el-card>
-                </div>
-              </template>
-
-              <!-- 空状态显示 -->
-              <div v-else class="empty-state">
-                <el-empty description="暂无单据" :image-size="80">
-                  <el-button type="primary" @click="handleAdd"> 新增单据 </el-button>
-                </el-empty>
+              <!-- 固定位置的新增单据按钮，始终可见 -->
+              <div class="fixed-add-button" style="margin-bottom: 10px; text-align: center;">
+                <el-button type="primary" @click="handleAdd" :disabled="isAddDisabled"> 新增单据 </el-button>
               </div>
+              
+              <el-scrollbar height="calc(100vh - 400px)" style="width: 100%">
+                <div class="order-list-container">
+                  <!-- 有数据时显示列表 -->
+                  <template v-if="orderList.length > 0">
+                    <div
+                      v-for="item in orderList"
+                      :key="item.supplyBusNo"
+                      :class="['order-item', { 'is-active': selectedOrder === item }]"
+                      @click="handleOrderClick(item)"
+                    >
+                      <el-card class="order-card" shadow="hover">
+                        <div class="order-header">
+                          <div class="order-number">
+                            <el-icon><Document /></el-icon>
+                            <span class="number-text">{{ item.supplyBusNo }}</span>
+                          </div>
+                        </div>
+                        <div class="order-content">
+                          <div class="info-item">
+                            <el-icon class="info-icon"><User /></el-icon>
+                            <span class="label">采购员：</span>
+                            <span class="value">{{ item.applicantId_dictText }}</span>
+                          </div>
+                          <div class="info-item">
+                            <el-icon class="info-icon"><Shop /></el-icon>
+                            <span class="label">供应商：</span>
+                            <span class="value">{{ item.supplierId_dictText }}</span>
+                          </div>
+                          <div class="info-item">
+                            <el-icon class="info-icon"><User /></el-icon>
+                            <span class="label">审核状态：</span>
+                            <el-tag type="success" v-if="item.statusEnum_enumText === '同意'">
+                              {{ item.statusEnum_enumText }}
+                            </el-tag>
+                            <el-tag type="danger" v-else>
+                              {{ item.statusEnum_enumText }}
+                            </el-tag>
+                          </div>
+                          <div class="info-item">
+                            <el-icon class="info-icon"><Files /></el-icon>
+                            <span class="label">单据类型：</span>
+                            <span class="value">{{ item.typeEnum_enumText }}</span>
+                          </div>
+                          <div class="info-item">
+                            <el-icon class="info-icon"><Calendar /></el-icon>
+                            <span class="label">单据日期：</span>
+                            <span class="value">{{
+                              parseTime(item.applyTime, '{y}-{m}-{d} {h}:{i}:{s}')
+                            }}</span>
+                          </div>
+                        </div>
+                      </el-card>
+                    </div>
+                  </template>
+
+                  <!-- 空状态显示 -->
+                  <div v-else class="empty-state">
+                    <el-empty description="暂无单据" :image-size="80">
+                      <!-- 空状态下不再显示新增单据按钮，因为已在上方固定位置显示 -->
+                    </el-empty>
+                  </div>
             </div>
           </el-scrollbar>
         </el-row>