From 10d41618a894bd849dd8f7dd91c930dac635f507 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 5 Nov 2025 10:54:58 +0800
Subject: [PATCH] v1.9 测试采购功能，部分页面功能优化

---
 src/components/resource/chooseResourceStore4.vue        |  14 ++++++--------
 src/components/system/viewImage.vue                     |  68 +++++++++++++++++++++++++++++++++-----------------------------------
 src/router/index.js                                     |   5 +++++
 src/router/resourceRouter.js                            |   5 +++++
 src/views/report/reportNoFeeRoomList.vue                |   8 +++-----
 src/views/resource/allocationStorehouseDetailedList.vue |   2 +-
 src/views/resource/assetInventoryInList.vue             |   4 ++--
 src/views/resource/assetInventoryInStockList.vue        | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------
 src/views/resource/printPurchaseOutApply.vue            | 262 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/resource/purchaseApplyDetailLang.js           |   8 ++++++--
 src/views/resource/purchaseApplyDetailManageList.vue    |   3 ++-
 11 files changed, 403 insertions(+), 129 deletions(-)
 create mode 100644 src/views/resource/printPurchaseOutApply.vue

diff --git a/src/components/resource/chooseResourceStore4.vue b/src/components/resource/chooseResourceStore4.vue
index 96b9090..f2750b1 100644
--- a/src/components/resource/chooseResourceStore4.vue
+++ b/src/components/resource/chooseResourceStore4.vue
@@ -2,7 +2,7 @@
   <el-dialog :title="$t('chooseResourceStore4.title')" :visible.sync="visible" width="80%" @close="handleClose">
     <div class="filter-container">
       <el-row :gutter="20">
-        <el-col :span="8">
+        <el-col :span="4">
           <el-select v-model="chooseResourceStoreInfo4.shId" disabled style="width:100%">
             <el-option value="" :label="$t('chooseResourceStore4.selectWarehouse')" />
             <el-option v-for="(item, index) in chooseResourceStoreInfo4.storehouses" :key="index" :label="item.shName"
@@ -10,7 +10,7 @@
           </el-select>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="4">
           <el-select v-model="chooseResourceStoreInfo4.parentRstId" @change="_listResourceStoreSonTypes"
             style="width:100%">
             <el-option value="" :label="$t('chooseResourceStore4.selectItemType')" />
@@ -19,21 +19,19 @@
           </el-select>
         </el-col>
 
-        <el-col :span="8">
+        <el-col :span="4">
           <el-select v-model="chooseResourceStoreInfo4.rstId" style="width:100%;margin-right:10px">
             <el-option value="" :label="$t('chooseResourceStore4.selectSubType')" />
             <el-option v-for="(item, index) in chooseResourceStoreInfo4.resourceStoreSonTypes" :key="index"
               :label="item.name" :value="item.rstId" />
           </el-select>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20" style="margin-top:10px">
-        <el-col :span="8">
+4
+        <el-col :span="4">
           <el-input v-model.trim="chooseResourceStoreInfo4._currentResourceStoreName"
             :placeholder="$t('chooseResourceStore4.inputItemName')" />
         </el-col>
-        <el-col :span="16" style="text-align:right">
+        <el-col :span="4" style="text-align:right">
           <el-button type="primary" @click="queryResourceStores">
             <i class="el-icon-search"></i>
             {{ $t('common.search') }}
diff --git a/src/components/system/viewImage.vue b/src/components/system/viewImage.vue
index b0eb3e9..87d5199 100644
--- a/src/components/system/viewImage.vue
+++ b/src/components/system/viewImage.vue
@@ -2,20 +2,21 @@
   <div class="view-image-container">
     <el-dialog
       :visible.sync="visible"
-      :fullscreen="true"
+      :width="dialogWidth"
       :show-close="true"
       custom-class="image-viewer-dialog"
+      @close="close"
+      center
     >
       <div class="image-wrapper">
         <img
           :src="imageInfo.url"
           :style="{
-            width: imageInfo.width + 'px',
-            height: imageInfo.height + 'px'
+            maxWidth: '100%',
+            maxHeight: imageInfo.maxHeight + 'px'
           }"
           @error="handleImageError"
         />
-        <i class="el-icon-close close-icon" @click="close"></i>
       </div>
     </el-dialog>
   </div>
@@ -27,10 +28,10 @@ export default {
   data() {
     return {
       visible: false,
+      dialogWidth: '50%',
       imageInfo: {
         url: '',
-        width: 800,
-        height: 800
+        maxHeight: 600
       }
     }
   },
@@ -39,21 +40,24 @@ export default {
       this.imageInfo.url = params.url
       this.visible = true
       
-      // 动态计算图片尺寸
-      const img = new Image()
-      img.src = params.url
-      img.onload = () => {
-        const imgScale = img.width / img.height
-        this.imageInfo.width = 800
-        this.imageInfo.height = 800 / imgScale
+      // 根据屏幕尺寸动态调整对话框大小
+      const screenWidth = window.innerWidth
+      if (screenWidth < 768) {
+        this.dialogWidth = '90%'
+        this.imageInfo.maxHeight = 400
+      } else if (screenWidth < 1200) {
+        this.dialogWidth = '70%'
+        this.imageInfo.maxHeight = 500
+      } else {
+        this.dialogWidth = '50%'
+        this.imageInfo.maxHeight = 600
       }
     },
     close() {
       this.visible = false
       this.imageInfo = {
         url: '',
-        width: 800,
-        height: 800
+        maxHeight: 600
       }
     },
     handleImageError(e) {
@@ -65,34 +69,28 @@ export default {
 
 <style lang="scss" scoped>
 .view-image-container {
-  .image-viewer-dialog {
-    background-color: rgba(0, 0, 0, 0.8);
+  ::v-deep .image-viewer-dialog {
+    .el-dialog__header {
+      padding: 10px;
+    }
+    
+    .el-dialog__body {
+      padding: 20px;
+      text-align: center;
+    }
     
     .image-wrapper {
-      position: relative;
       display: flex;
       justify-content: center;
       align-items: center;
-      height: 100%;
+      min-height: 200px;
       
       img {
-        max-width: 90%;
-        max-height: 90%;
+        display: block;
+        width: auto;
+        height: auto;
         object-fit: contain;
-      }
-      
-      .close-icon {
-        position: absolute;
-        top: 20px;
-        right: 20px;
-        font-size: 24px;
-        color: #fff;
-        cursor: pointer;
-        z-index: 2001;
-        
-        &:hover {
-          color: #f56c6c;
-        }
+        border-radius: 4px;
       }
     }
   }
diff --git a/src/router/index.js b/src/router/index.js
index 11b7551..4e0372d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -753,6 +753,11 @@ const routes = [
     name: '/views/resource/printPurchaseApply',
     component: () => import('@/views/resource/printPurchaseApply.vue')
   },
+  {
+    path: '/pages/property/printPurchaseOutApply',
+    name: '/views/resource/printPurchaseOutApply',
+    component: () => import('@/views/resource/printPurchaseOutApply.vue')
+},
 ]
 
 const router = new VueRouter({
diff --git a/src/router/resourceRouter.js b/src/router/resourceRouter.js
index 6e511f4..9e5b4d5 100644
--- a/src/router/resourceRouter.js
+++ b/src/router/resourceRouter.js
@@ -210,5 +210,10 @@ export default [
         name: '/views/resource/printPurchaseApply',
         component: () => import('@/views/resource/printPurchaseApply.vue')
     },
+    {
+        path: '/views/resource/printPurchaseOutApply',
+        name: '/views/resource/printPurchaseOutApply',
+        component: () => import('@/views/resource/printPurchaseOutApply.vue')
+    },
 
 ]
\ No newline at end of file
diff --git a/src/views/report/reportNoFeeRoomList.vue b/src/views/report/reportNoFeeRoomList.vue
index 7c1b7cc..2948f61 100644
--- a/src/views/report/reportNoFeeRoomList.vue
+++ b/src/views/report/reportNoFeeRoomList.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="report-no-fee-room-container animated fadeInRight">
-    <el-row :gutter="20">
-      <el-col :span="24">
+
         <el-card class="search-card">
           <div slot="header" class="flex justify-between">
             <span>{{ $t('reportNoFeeRoom.search.title') }}</span>
@@ -44,10 +43,9 @@
             </el-col>
           </el-row>
         </el-card>
-      </el-col>
-    </el-row>
 
-    <el-row :gutter="20" style="margin-top:20px;">
+
+    <el-row :gutter="20" >
       <el-col :span="24">
         <el-card>
           <div slot="header" class="flex justify-between ">
diff --git a/src/views/resource/allocationStorehouseDetailedList.vue b/src/views/resource/allocationStorehouseDetailedList.vue
index c00753c..6ccb615 100644
--- a/src/views/resource/allocationStorehouseDetailedList.vue
+++ b/src/views/resource/allocationStorehouseDetailedList.vue
@@ -72,7 +72,7 @@
             </el-col>
           </el-row>
 
-          <el-row v-show="allocationStorehousesInfo.moreCondition == true" :gutter="20">
+          <el-row v-show="allocationStorehousesInfo.moreCondition == true" :gutter="20" class="margin-top margin-bottom">
             <el-col :span="4">
               <el-input v-model.trim="allocationStorehousesInfo.conditions.applyId"
                 :placeholder="$t('allocationStorehouseDetailed.applyIdPlaceholder')" clearable />
diff --git a/src/views/resource/assetInventoryInList.vue b/src/views/resource/assetInventoryInList.vue
index 459e18e..cb7d1f0 100644
--- a/src/views/resource/assetInventoryInList.vue
+++ b/src/views/resource/assetInventoryInList.vue
@@ -99,13 +99,13 @@
               <el-table-column :label="$t('assetInventory.afterQuantity')" align="center">
                 <template slot-scope="scope">
                   <el-input-number v-model="scope.row.quantity"
-                    :placeholder="$t('assetInventory.afterQuantityPlaceholder')" style="width:70%" :min="1" />
+                    :placeholder="$t('assetInventory.afterQuantityPlaceholder')" style="width:70%" :min="1" :controls="false" />
                   <span style="margin-left:5px">{{ scope.row.unitCodeName }}</span>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('assetInventory.remark')" align="center">
                 <template slot-scope="scope">
-                  <el-input v-model="scope.row.remark" :placeholder="$t('assetInventory.itemRemarkPlaceholder')" />
+                  <el-input v-model="scope.row.remark" :placeholder="$t('assetInventory.remark')" />
                 </template>
               </el-table-column>
               <el-table-column :label="$t('assetInventory.operation')" align="center" width="120">
diff --git a/src/views/resource/assetInventoryInStockList.vue b/src/views/resource/assetInventoryInStockList.vue
index 87106ed..ac86203 100644
--- a/src/views/resource/assetInventoryInStockList.vue
+++ b/src/views/resource/assetInventoryInStockList.vue
@@ -1,70 +1,67 @@
 <template>
   <div class="asset-inventory-in-stock-container">
-    <el-row>
-      <el-col :span="24">
-        <el-card>
-          <div slot="header" class="flex justify-between">
-            <span>{{ $t('assetInventoryInStock.title') }}</span>
-            <div class="card-header-actions">
-              <el-button type="primary" size="small" @click="_printAssetInventoryInStock">
-                <i class="el-icon-printer"></i> {{ $t('assetInventoryInStock.print') }}
-              </el-button>
-              <el-button type="primary" size="small" @click="_goBack">
-                <i class="el-icon-close"></i> {{ $t('assetInventoryInStock.back') }}
-              </el-button>
-            </div>
-          </div>
 
-          <el-row>
-            <el-col :span="24">
-              <el-form label-width="120px">
-                <el-row>
-                  <el-col :span="12">
-                    <el-form-item :label="$t('assetInventoryInStock.inventoryName')">
-                      <el-input v-model="assetInventoryInStockInfo.name" readonly></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item :label="$t('assetInventoryInStock.inventoryPerson')">
-                      <el-input v-model="assetInventoryInStockInfo.staffName" readonly></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="12">
-                    <el-form-item :label="$t('assetInventoryInStock.warehouse')">
-                      <el-input v-model="assetInventoryInStockInfo.shName" readonly></el-input>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item :label="$t('assetInventoryInStock.inventoryDate')">
-                      <el-input v-model="assetInventoryInStockInfo.invTime" readonly></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="24">
-                    <el-form-item :label="$t('assetInventoryInStock.remark')">
-                      <el-input type="textarea" v-model="assetInventoryInStockInfo.remark" readonly></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row>
-                  <el-col :span="24">
-                    <el-form-item :label="$t('assetInventoryInStock.status')">
-                      <el-input v-model="assetInventoryInStockInfo.stateName" readonly></el-input>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-              </el-form>
-            </el-col>
-          </el-row>
-        </el-card>
-      </el-col>
-    </el-row>
+    <el-card>
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('assetInventoryInStock.title') }}</span>
+        <div class="card-header-actions">
+          <el-button type="primary" size="small" @click="_printAssetInventoryInStock">
+            <i class="el-icon-printer"></i> {{ $t('assetInventoryInStock.print') }}
+          </el-button>
+          <el-button type="primary" size="small" @click="_goBack">
+            <i class="el-icon-close"></i> {{ $t('assetInventoryInStock.back') }}
+          </el-button>
+        </div>
+      </div>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form label-width="120px">
+            <el-row :gutter="20" class="margin-bottom">
+              <el-col :span="12">
+                <el-form-item :label="$t('assetInventoryInStock.inventoryName')">
+                  <el-input v-model="assetInventoryInStockInfo.name" readonly></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item :label="$t('assetInventoryInStock.inventoryPerson')">
+                  <el-input v-model="assetInventoryInStockInfo.staffName" readonly></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row class="margin-bottom">
+              <el-col :span="12">
+                <el-form-item :label="$t('assetInventoryInStock.warehouse')">
+                  <el-input v-model="assetInventoryInStockInfo.shName" readonly></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item :label="$t('assetInventoryInStock.inventoryDate')">
+                  <el-input v-model="assetInventoryInStockInfo.invTime" readonly></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row class="margin-bottom">
+              <el-col :span="24">
+                <el-form-item :label="$t('assetInventoryInStock.remark')">
+                  <el-input type="textarea" v-model="assetInventoryInStockInfo.remark" readonly></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="$t('assetInventoryInStock.status')">
+                  <el-input v-model="assetInventoryInStockInfo.stateName" readonly></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+      </el-row>
+    </el-card>
 
     <el-row class="mt-20">
       <el-col :span="24">
@@ -74,21 +71,26 @@
           </div>
 
           <el-table :data="assetInventoryInStockInfo.storehouses" border style="width: 100%">
-            <el-table-column prop="shName" :label="$t('assetInventoryInStock.warehouseName')" align="center"></el-table-column>
+            <el-table-column prop="shName" :label="$t('assetInventoryInStock.warehouseName')"
+              align="center"></el-table-column>
             <el-table-column :label="$t('assetInventoryInStock.itemType')" align="center">
               <template slot-scope="scope">
                 {{ scope.row.parentRstName || '-' }} > {{ scope.row.rstName || '-' }}
               </template>
             </el-table-column>
-            <el-table-column prop="resName" :label="$t('assetInventoryInStock.itemName')" align="center"></el-table-column>
+            <el-table-column prop="resName" :label="$t('assetInventoryInStock.itemName')"
+              align="center"></el-table-column>
             <el-table-column prop="specName" :label="$t('assetInventoryInStock.specification')" align="center">
               <template slot-scope="scope">
                 {{ scope.row.specName || '-' }}
               </template>
             </el-table-column>
-            <el-table-column prop="resCode" :label="$t('assetInventoryInStock.itemCode')" align="center"></el-table-column>
-            <el-table-column prop="isFixedName" :label="$t('assetInventoryInStock.isFixedItem')" align="center"></el-table-column>
-            <el-table-column prop="timesPrice" :label="$t('assetInventoryInStock.batchPrice')" align="center"></el-table-column>
+            <el-table-column prop="resCode" :label="$t('assetInventoryInStock.itemCode')"
+              align="center"></el-table-column>
+            <el-table-column prop="isFixedName" :label="$t('assetInventoryInStock.isFixedItem')"
+              align="center"></el-table-column>
+            <el-table-column prop="timesPrice" :label="$t('assetInventoryInStock.batchPrice')"
+              align="center"></el-table-column>
             <el-table-column :label="$t('assetInventoryInStock.originalStock')" align="center">
               <template slot-scope="scope">
                 {{ scope.row.originalStock }}{{ scope.row.unitCodeName }}
@@ -105,15 +107,16 @@
       </el-col>
     </el-row>
 
-    <el-row v-if="assetInventoryInStockInfo.state === '3000' || assetInventoryInStockInfo.state === '4000'" class="mt-20">
+    <el-row v-if="assetInventoryInStockInfo.state === '3000' || assetInventoryInStockInfo.state === '4000'"
+      class="mt-20">
       <el-col :span="24">
         <el-card>
-          <div slot="header" class="clearfix">
+          <div slot="header" class="flex justify-between">
             <span>{{ $t('assetInventoryInStock.auditInfo') }}</span>
           </div>
 
           <el-form label-width="120px">
-            <el-row>
+            <el-row class="margin-bottom">
               <el-col :span="12">
                 <el-form-item :label="$t('assetInventoryInStock.auditor')">
                   <el-input v-model="assetInventoryInStockInfo.auditName" readonly></el-input>
@@ -126,7 +129,7 @@
               </el-col>
             </el-row>
 
-            <el-row>
+            <el-row class="margin-bottom">
               <el-col :span="12">
                 <el-form-item :label="$t('assetInventoryInStock.auditTime')">
                   <el-input v-model="assetInventoryInStockInfo.auditTime" readonly></el-input>
@@ -217,10 +220,10 @@ export default {
     _computeData(item) {
       item.invProfit = parseInt(item.invQuantity) - parseInt(item.quantity)
       if (item.invProfit < 0) item.invProfit = 0
-      
+
       item.invLoss = parseInt(item.quantity) - parseInt(item.invQuantity)
       if (item.invLoss < 0) item.invLoss = 0
-      
+
       item.invProfitMoney = item.invProfit * parseFloat(item.price)
       item.invLossMoney = item.invLoss * parseFloat(item.price)
     },
diff --git a/src/views/resource/printPurchaseOutApply.vue b/src/views/resource/printPurchaseOutApply.vue
new file mode 100644
index 0000000..cfaf572
--- /dev/null
+++ b/src/views/resource/printPurchaseOutApply.vue
@@ -0,0 +1,262 @@
+<template>
+  <div class="print-purchase-out-apply">
+    <div class="content-wrapper">
+      <!-- 申请单信息 -->
+      <div class="row info-row">
+        <div class="col-sm-3">
+          <span>{{ $t('purchaseApplyDetail.applyNo') }}{{ printPurchaseOutApplyInfo.applyOrderId }}</span>
+        </div>
+        <div class="col-sm-3">
+          <span>{{ $t('purchaseApplyDetail.applicant') }}{{ printPurchaseOutApplyInfo.userName }}</span>
+        </div>
+        <div class="col-sm-3">
+          <span>{{ $t('purchaseApplyDetail.contactPhone') }}{{ printPurchaseOutApplyInfo.endUserTel }}</span>
+        </div>
+        <div class="col-sm-3">
+          <span>{{ $t('purchaseApplyDetail.applyTime') }}{{ printPurchaseOutApplyInfo.createTime }}</span>
+        </div>
+      </div>
+
+      <!-- 领用明细表格 -->
+      <table class="table table-bordered margin-top">
+        <thead>
+          <tr>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.serialNumber') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.itemType') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.itemName') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.itemCode') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.warehouse') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.itemSpec') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.supplier') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.fixedItem') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.referencePrice') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.originalStock') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.currentStock') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.applyQuantity') }}</th>
+            <th scope="col" class="text-center">{{ $t('purchaseApplyDetail.receiveQuantity') }}</th>
+          </tr>
+        </thead>
+        <tbody>
+          <template v-for="(item, index) in printPurchaseOutApplyInfo.purchaseApplyDetailVo">
+            <tr :key="'detail-' + index">
+              <th scope="row" class="text-center">{{ index + 1 }}</th>
+              <td class="text-center">{{ item.parentRstName }} > {{ item.rstName }}</td>
+              <td class="text-center">{{ item.resName }}</td>
+              <td class="text-center">{{ item.resCode }}</td>
+              <td class="text-center">{{ item.shName }}</td>
+              <td class="text-center">{{ item.specName ? item.specName : '-' }}</td>
+              <td class="text-center">{{ item.supplierName ? item.supplierName : '-' }}</td>
+              <td class="text-center">{{ item.isFixedName }}</td>
+              <td class="text-center">{{ item.consultPrice ? '￥' + item.consultPrice : '-' }}</td>
+              <td class="text-center">{{ item.originalStock }}{{ item.unitCodeName }}</td>
+              <td class="text-center">{{ item.stock ? item.stock : '0' }}{{ item.unitCodeName }}</td>
+              <td class="text-center">{{ item.quantity }}{{ item.unitCodeName }}</td>
+              <td class="text-center">
+                {{ item.purchaseQuantity ? item.purchaseQuantity + item.unitCodeName : '-' }}
+              </td>
+            </tr>
+            <tr :key="'remark-' + index">
+              <th scope="row" class="text-center">{{ $t('purchaseApplyDetail.applyRemark') }}</th>
+              <td colspan="4" class="text-center">{{ item.remark }}</td>
+              <th class="text-center">{{ $t('purchaseApplyDetail.receiveRemark') }}</th>
+              <td colspan="7" class="text-center">{{ item.purchaseRemark ? item.purchaseRemark : '-' }}</td>
+            </tr>
+          </template>
+          <tr height="60px">
+            <td colspan="2" class="text-center" style="vertical-align:middle;">
+              {{ $t('purchaseApplyDetail.reviewerSignature') }}
+            </td>
+            <td colspan="4"></td>
+            <td class="text-center" style="vertical-align:middle;">
+              {{ $t('purchaseApplyDetail.time') }}
+            </td>
+            <td colspan="6"></td>
+          </tr>
+          <tr height="60px">
+            <td colspan="2" class="text-center" style="vertical-align:middle;">
+              {{ $t('purchaseApplyDetail.applicantSignature') }}
+            </td>
+            <td colspan="4"></td>
+            <td class="text-center" style="vertical-align:middle;">
+              {{ $t('purchaseApplyDetail.time') }}
+            </td>
+            <td colspan="6"></td>
+          </tr>
+        </tbody>
+      </table>
+
+      <!-- 操作按钮 -->
+      <div id="print-btn" class="button-wrapper">
+        <el-button type="warning" @click="closePage" style="margin-right:20px;">
+          {{ $t('purchaseApplyDetail.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="printPurchaseOutApplyDiv">
+          <i class="el-icon-printer"></i> {{ $t('purchaseApplyDetail.print') }}
+        </el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listPurchaseApplys } from '@/api/resource/purchaseApplyManageApi'
+import { messages } from './purchaseApplyDetailLang'
+
+export default {
+  name: 'PrintPurchaseOutApply',
+  i18n: {
+    messages
+  },
+  data() {
+    return {
+      printPurchaseOutApplyInfo: {
+        applyOrderId: '',
+        userName: '',
+        endUserTel: '',
+        createTime: '',
+        purchaseApplyDetailVo: []
+      },
+      printFlag: '0'
+    }
+  },
+  created() {
+    this.initPrintPurchaseOutApplyDateInfo()
+  },
+  methods: {
+    // 初始化采购领用申请数据
+    initPrintPurchaseOutApplyDateInfo() {
+      const applyOrderId = this.$route.query.applyOrderId
+      const resOrderType = this.$route.query.resOrderType
+
+      if (!applyOrderId) {
+        this.$message.error('缺少申请单号参数')
+        return
+      }
+
+      const params = {
+        page: 1,
+        row: 1,
+        applyOrderId: applyOrderId,
+        resOrderType: resOrderType
+      }
+
+      listPurchaseApplys(params).then(res => {
+        if (res.purchaseApplys && res.purchaseApplys.length > 0) {
+          this.printPurchaseOutApplyInfo = res.purchaseApplys[0]
+        } else {
+          this.$message.error('未找到领用申请信息')
+        }
+      }).catch(error => {
+        console.error('获取领用申请信息失败:', error)
+        this.$message.error('获取领用申请信息失败')
+      })
+    },
+
+    // 打印
+    printPurchaseOutApplyDiv() {
+      this.printFlag = '1'
+      const printBtn = document.getElementById('print-btn')
+      if (printBtn) {
+        printBtn.style.display = 'none'
+      }
+      
+      window.print()
+      
+      // 打印后关闭窗口
+      setTimeout(() => {
+        window.opener = null
+        window.close()
+      }, 100)
+    },
+
+    // 关闭页面
+    closePage() {
+      window.opener = null
+      window.close()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.print-purchase-out-apply {
+  padding: 20px;
+  background: #fff;
+}
+
+.content-wrapper {
+  margin: 0 auto;
+}
+
+.info-row {
+  margin-bottom: 20px;
+  display: flex;
+  justify-content: space-between;
+}
+
+.col-sm-3 {
+  flex: 1;
+  padding: 0 10px;
+}
+
+.col-sm-3 span {
+  font-size: 14px;
+  color: #333;
+}
+
+.margin-top {
+  margin-top: 20px;
+}
+
+/* 原生表格样式 */
+.table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 20px;
+}
+
+.table-bordered {
+  border: 1px solid #ddd;
+}
+
+.table-bordered th,
+.table-bordered td {
+  border: 1px solid #ddd;
+  padding: 8px;
+  font-size: 12px;
+}
+
+.table thead th {
+  background-color: #f5f7fa;
+  font-weight: bold;
+  color: #333;
+}
+
+.text-center {
+  text-align: center;
+}
+
+.button-wrapper {
+  text-align: right;
+  margin-top: 30px;
+  padding: 20px 0;
+}
+
+/* 打印样式 */
+@media print {
+  .print-purchase-out-apply {
+    padding: 0;
+  }
+
+  #print-btn {
+    display: none !important;
+  }
+
+  .table-bordered th,
+  .table-bordered td {
+    page-break-inside: avoid;
+    font-size: 10px;
+  }
+}
+</style>
+
diff --git a/src/views/resource/purchaseApplyDetailLang.js b/src/views/resource/purchaseApplyDetailLang.js
index e8e8763..d09df95 100644
--- a/src/views/resource/purchaseApplyDetailLang.js
+++ b/src/views/resource/purchaseApplyDetailLang.js
@@ -50,7 +50,9 @@ export const messages = {
       time: 'Time',
       manufacturerSignature: 'Manufacturer Signature',
       purchaserSignature: 'Purchaser Signature',
-      remark: 'Remark'
+      remark: 'Remark',
+      reviewerSignature: 'Reviewer Signature',
+      applicantSignature: 'Applicant Signature'
     },
     auditDiv: {
       workOrderProcessing: 'Work Order Processing',
@@ -123,7 +125,9 @@ export const messages = {
       time: '时间',
       manufacturerSignature: '厂家签字',
       purchaserSignature: '采购人员签字',
-      remark: '备注'
+      remark: '备注',
+      reviewerSignature: '审核人签字',
+      applicantSignature: '申请人签字'
     },
     auditDiv: {
       workOrderProcessing: '工单办理',
diff --git a/src/views/resource/purchaseApplyDetailManageList.vue b/src/views/resource/purchaseApplyDetailManageList.vue
index 1099e5b..9c4fc19 100644
--- a/src/views/resource/purchaseApplyDetailManageList.vue
+++ b/src/views/resource/purchaseApplyDetailManageList.vue
@@ -59,7 +59,7 @@
               </el-button>
             </el-col>
           </el-row>
-          <el-row v-show="moreCondition" :gutter="20">
+          <el-row v-show="moreCondition" :gutter="20" class="margin-bottom margin-top">
             <el-col :span="4">
               <el-select v-model="conditions.warehousingWay"
                 :placeholder="$t('purchaseApplyDetailManage.search.warehousingWay')" style="width:100%" clearable>
@@ -262,6 +262,7 @@ export default {
       await this.getDictData()
       await this._listResourceStoreTypes()
       await this._listResourceStoreSpecifications()
+      await this._listResourceSupplier()
     },
     async getDictData() {
       try {
--
libgit2 0.21.4