From c8004a7b1135c96c5005f453d4e3de10d48c23c8 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Wed, 16 Jul 2025 12:17:35 +0800
Subject: [PATCH] 采购中的转增记录 使用记录处理完成

---
 src/api/resource/printAllocationStorehouseApi.js          |  33 +++++++++++++++++++++++++++++++++
 src/i18n/resourceI18n.js                                  |   3 +++
 src/router/index.js                                       |   5 +++++
 src/views/resource/allocationStorehouseDetailedList.vue   |  57 +++++++++++++++++++--------------------------------------
 src/views/resource/allocationUserStorehouseManageList.vue |   1 +
 src/views/resource/assetInventoryManageList.vue           |  34 +++++++---------------------------
 src/views/resource/printAllocationStorehouseLang.js       |  48 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/resource/printAllocationStorehouseList.vue      | 260 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/resource/resourceStoreUseRecordManageList.vue   |   1 +
 9 files changed, 377 insertions(+), 65 deletions(-)
 create mode 100644 src/api/resource/printAllocationStorehouseApi.js
 create mode 100644 src/views/resource/printAllocationStorehouseLang.js
 create mode 100644 src/views/resource/printAllocationStorehouseList.vue

diff --git a/src/api/resource/printAllocationStorehouseApi.js b/src/api/resource/printAllocationStorehouseApi.js
new file mode 100644
index 0000000..a1ab4f4
--- /dev/null
+++ b/src/api/resource/printAllocationStorehouseApi.js
@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+// 获取调拨申请单信息
+export function listAllocationStorehouseApplys(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/resourceStore.listAllocationStorehouseApplys',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 获取调拨仓库物品列表
+export function listAllocationStorehouses(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/resourceStore.listAllocationStorehouses',
+      method: 'get',
+      params
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/i18n/resourceI18n.js b/src/i18n/resourceI18n.js
index 9af7f96..2f009df 100644
--- a/src/i18n/resourceI18n.js
+++ b/src/i18n/resourceI18n.js
@@ -21,6 +21,7 @@ import { messages as resourceStoreUseRecordManageMessages } from '../views/resou
 import { messages as printEquipmentAccountLabelMessages } from '../views/resource/printEquipmentAccountLabelLang'
 import { messages as resourceDetailMessages } from '../views/resource/resourceDetailLang'
 import { messages as allocationStorehouseDetailMessages } from '../views/resource/allocationStorehouseDetailLang'
+import { messages as printAllocationStorehouseMessages } from '../views/resource/printAllocationStorehouseLang'
 
 
 export const messages = {
@@ -47,6 +48,7 @@ export const messages = {
         ...printEquipmentAccountLabelMessages.en,
         ...resourceDetailMessages.en,
         ...allocationStorehouseDetailMessages.en,
+        ...printAllocationStorehouseMessages.en,
     },
     zh: {
         ...resourceAuditFlowMessages.zh,
@@ -71,5 +73,6 @@ export const messages = {
         ...printEquipmentAccountLabelMessages.zh,
         ...resourceDetailMessages.zh,
         ...allocationStorehouseDetailMessages.zh,
+        ...printAllocationStorehouseMessages.zh,
     }
 }
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 092b25a..699b55e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -714,6 +714,11 @@ const routes = [
     name: '/pages/property/printCommonReportTable',
     component: () => import('@/views/report/printCommonReportTableList.vue')
   },
+  {
+    path:'/pages/property/printAllocationStorehouse',
+    name:'/pages/property/printAllocationStorehouse',
+    component: () => import('@/views/resource/printAllocationStorehouseList.vue')
+    },
 ]
 
 const router = new VueRouter({
diff --git a/src/views/resource/allocationStorehouseDetailedList.vue b/src/views/resource/allocationStorehouseDetailedList.vue
index 3616098..b1911a3 100644
--- a/src/views/resource/allocationStorehouseDetailedList.vue
+++ b/src/views/resource/allocationStorehouseDetailedList.vue
@@ -1,25 +1,27 @@
 <template>
-  <div class="animated fadeInRight ecommerce">
+  <div class="animated fadeInRight ecommerce padding">
     <el-row :gutter="20">
-      <el-col :span="4" >
-        <div class="border-radius">
-          <div class="margin-xs-r treeview attendance-staff">
-            <ul class="list-group text-center border-radius">
+      <el-col :span="4">
+
+        <div class="list-group-border-radius">
+          <div class=" treeview">
+            <ul class="list-group text-center ">
               <li v-for="(item, index) in allocationStorehousesInfo.applyTypes" :key="index"
-                class="list-group-item node-orgTree"
+                @click="swatchApplyType(item)"
                 :class="{ 'vc-node-selected': allocationStorehousesInfo.conditions.applyType == item.statusCd }"
-                @click="swatchApplyType(item)">
+                class="list-group-item node-orgTree">
                 {{ item.name }}
               </li>
             </ul>
           </div>
+
         </div>
       </el-col>
       <el-col :span="20">
         <el-card class="box-card">
           <div slot="header" class="flex justify-between">
             <span>{{ $t('allocationStorehouseDetailed.queryCondition') }}</span>
-            <div class="ibox-tools" >
+            <div class="ibox-tools">
               <el-button type="text" style="margin-right:10px;" @click="_moreCondition()">
                 {{ allocationStorehousesInfo.moreCondition == true ? $t('allocationStorehouseDetailed.hide') :
                   $t('allocationStorehouseDetailed.more') }}
@@ -78,15 +80,15 @@
             <el-col :span="4">
               <el-select v-model="allocationStorehousesInfo.conditions.shIda"
                 :placeholder="$t('allocationStorehouseDetailed.sourceStorePlaceholder')" style="width:100%">
-                <el-option v-for="(item, index) in allocationStorehousesInfo.storehouses" :key="index" :label="item.shName"
-                  :value="item.shId" />
+                <el-option v-for="(item, index) in allocationStorehousesInfo.storehouses" :key="index"
+                  :label="item.shName" :value="item.shId" />
               </el-select>
             </el-col>
             <el-col :span="4">
               <el-select v-model="allocationStorehousesInfo.conditions.shIdz"
                 :placeholder="$t('allocationStorehouseDetailed.targetStorePlaceholder')" style="width:100%">
-                <el-option v-for="(item, index) in allocationStorehousesInfo.storehouses" :key="index" :label="item.shName"
-                  :value="item.shId" />
+                <el-option v-for="(item, index) in allocationStorehousesInfo.storehouses" :key="index"
+                  :label="item.shName" :value="item.shId" />
               </el-select>
             </el-col>
             <el-col :span="4">
@@ -113,7 +115,7 @@
         <el-card class="box-card" style="margin-top:20px;">
           <div slot="header" class="flex justify-between">
             <span>{{ $t('allocationStorehouseDetailed.allocationDetail') }}</span>
-            <div class="ibox-tools" >
+            <div class="ibox-tools">
               <el-button type="primary" size="small" @click="_exportExcel()">
                 <i class="el-icon-download"></i>
                 {{ $t('allocationStorehouseDetailed.export') }}
@@ -143,7 +145,8 @@
             </el-table-column>
             <el-table-column :label="$t('allocationStorehouseDetailed.table.stock')" align="center">
               <template slot-scope="scope">
-                {{ scope.row.stock }}{{ scope.row.applyType == 20000 ? scope.row.miniUnitCodeName : scope.row.unitCodeName }}
+                {{ scope.row.stock }}{{ scope.row.applyType == 20000 ? scope.row.miniUnitCodeName :
+                  scope.row.unitCodeName }}
               </template>
             </el-table-column>
             <el-table-column :label="$t('allocationStorehouseDetailed.table.shaName')" align="center">
@@ -176,7 +179,7 @@
 import { listAllocationStorehouses, listStorehouses, listResourceStoreTypes, listResourceStoreSpecifications, exportData } from '@/api/resource/allocationStorehouseDetailedApi'
 import { getDict } from '@/api/community/communityApi'
 import { getCommunityId } from '@/api/community/communityApi'
-import {getUserId} from '@/api/user/userApi'
+import { getUserId } from '@/api/user/userApi'
 
 export default {
   name: 'AllocationStorehouseDetailedList',
@@ -374,6 +377,7 @@ export default {
         await exportData(params)
         this.$message.success(this.$t('allocationStorehouseDetailed.exportSuccess'))
         // 这里可以添加跳转到下载页面的逻辑
+        this.$router.push('/pages/property/downloadTempFile?tab=下载中心')
       } catch (error) {
         this.$message.error(this.$t('allocationStorehouseDetailed.exportError'))
       }
@@ -407,27 +411,4 @@ export default {
   margin-right: 5px;
 }
 
-.list-group {
-  padding-left: 0;
-  margin-bottom: 0;
-}
-
-.list-group-item {
-  position: relative;
-  display: block;
-  padding: 10px 15px;
-  margin-bottom: -1px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  cursor: pointer;
-}
-
-.list-group-item:hover {
-  background-color: #f5f5f5;
-}
-
-.vc-node-selected {
-  background-color: #409EFF;
-  color: #fff;
-}
 </style>
\ No newline at end of file
diff --git a/src/views/resource/allocationUserStorehouseManageList.vue b/src/views/resource/allocationUserStorehouseManageList.vue
index 79619fc..60c449c 100644
--- a/src/views/resource/allocationUserStorehouseManageList.vue
+++ b/src/views/resource/allocationUserStorehouseManageList.vue
@@ -447,6 +447,7 @@ export default {
         }
         await exportData(params)
         this.$message.success(this.$t('allocationUserStorehouseManage.exportSuccess'))
+        this.$router.push('/pages/property/downloadTempFile?tab=下载中心')
       } catch (error) {
         console.error('Failed to export:', error)
         this.$message.error(this.$t('allocationUserStorehouseManage.exportFailed'))
diff --git a/src/views/resource/assetInventoryManageList.vue b/src/views/resource/assetInventoryManageList.vue
index 0dd062a..a5b7f6a 100644
--- a/src/views/resource/assetInventoryManageList.vue
+++ b/src/views/resource/assetInventoryManageList.vue
@@ -2,18 +2,18 @@
   <div class="asset-inventory-manage-container">
     <el-row :gutter="20">
       <el-col :span="4" class="">
-        <el-card class="border-radius">
-          <div class=" treeview attendance-staff">
-            <ul class="list-group text-center border-radius">
-              <li v-for="(item, index) in assetInventoryManageInfo.storehouses" :key="index"
-                class="list-group-item node-orgTree"
+       
+        <div class="list-group-border-radius">
+          <div class=" treeview">
+            <ul class="list-group text-center ">
+              <li v-for="(item, index) in assetInventoryManageInfo.storehouses" :key="index" @click="swatchStorehouse(item)"
                 :class="{ 'vc-node-selected': assetInventoryManageInfo.conditions.shId == item.shId }"
-                @click="swatchStorehouse(item)">
+                class="list-group-item node-orgTree">
                 {{ item.shName }}
               </li>
             </ul>
           </div>
-        </el-card>
+        </div>
       </el-col>
       <el-col :span="20">
         <el-row>
@@ -294,26 +294,6 @@ export default {
     padding-right: 0;
   }
 
-  .list-group {
-    list-style: none;
-    padding: 0;
 
-    .list-group-item {
-      padding: 10px 15px;
-      margin-bottom: -1px;
-      background-color: #fff;
-      border: 1px solid #ddd;
-      cursor: pointer;
-
-      &:hover {
-        background-color: #f5f5f5;
-      }
-
-      &.vc-node-selected {
-        background-color: #409EFF;
-        color: #fff;
-      }
-    }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/resource/printAllocationStorehouseLang.js b/src/views/resource/printAllocationStorehouseLang.js
new file mode 100644
index 0000000..117d6c9
--- /dev/null
+++ b/src/views/resource/printAllocationStorehouseLang.js
@@ -0,0 +1,48 @@
+export const messages = {
+  en: {
+    printAllocationStorehouse:{
+    title: 'Allocation Storehouse Print',
+    applyId: 'Apply ID',
+    startUserName: 'Applicant',
+    createTime: 'Apply Time',
+    number: 'No.',
+    resName: 'Allocation Item',
+    resType: 'Item Type',
+    specName: 'Item Specification',
+    resCode: 'Item Code',
+    isFixedName: 'Fixed Item',
+    source: 'Source',
+    targetStorehouse: 'Target Storehouse',
+    originalStock: 'Original Stock',
+    allocationQuantity: 'Allocation Quantity',
+    remark: 'Remark',
+    storeManagerSign: 'Store Manager Sign',
+    allocationStaffSign: 'Allocation Staff Sign',
+    time: 'Time',
+    fetchError: 'Failed to get allocation information',
+  }
+  },
+  zh: {
+    printAllocationStorehouse:{
+    title: '调拨仓库打印',
+    applyId: '申请单号',
+    startUserName: '申请人',
+    createTime: '申请时间',
+    number: '编号',
+    resName: '调拨物品',
+    resType: '物品类型',
+    specName: '物品规格',
+    resCode: '物品编码',
+    isFixedName: '固定物品',
+    source: '来源',
+    targetStorehouse: '目标仓库',
+    originalStock: '原库存',
+    allocationQuantity: '调拨数量',
+    remark: '备注',
+    storeManagerSign: '仓库管理员签字',
+    allocationStaffSign: '调拨人员签字',
+    time: '时间',
+    fetchError: '获取调拨信息失败'
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/resource/printAllocationStorehouseList.vue b/src/views/resource/printAllocationStorehouseList.vue
new file mode 100644
index 0000000..f66edd6
--- /dev/null
+++ b/src/views/resource/printAllocationStorehouseList.vue
@@ -0,0 +1,260 @@
+<template>
+  <div class="print-allocation-storehouse-container">
+    <div>
+      <div>
+        <div class="flex justify-between">
+          <div class="col-sm-4">
+            <span>
+              <span>{{ $t('printAllocationStorehouse.applyId') }}</span>：{{ printAllocationStorehouseInfo.conditions.applyId }}
+            </span>
+          </div>
+          <div class="col-sm-4">
+            <span>
+              <span>{{ $t('printAllocationStorehouse.startUserName') }}</span>：{{ printAllocationStorehouseInfo.conditions.startUserName }}
+            </span>
+          </div>
+          <div class="col-sm-4">
+            <span>
+              <span>{{ $t('printAllocationStorehouse.createTime') }}</span>：{{ printAllocationStorehouseInfo.conditions.createTime }}
+            </span>
+          </div>
+        </div>
+        
+        <table class="table table-bordered margin-top">
+          <thead>
+            <tr>
+              <th scope="col" class="text-center">
+                <span>{{ $t('printAllocationStorehouse.number') }}</span>
+              </th>
+              <th scope="col" class="text-center">
+                <span>{{ $t('printAllocationStorehouse.resName') }}</span>
+              </th>
+              <th scope="col" class="text-center">
+                <span>{{ $t('printAllocationStorehouse.resType') }}</span>
+              </th>
+              <th scope="col" class="text-center">
+                <span>{{ $t('printAllocationStorehouse.specName') }}</span>
+              </th>
+              <th scope="col" class="text-center">
+                <span>{{ $t('printAllocationStorehouse.resCode') }}</span>
+              </th>
+              <th scope="col" class="text-center">
+                <span>{{ $t('printAllocationStorehouse.isFixedName') }}</span>
+              </th>
+              <th scope="col" class="text-center">
+                {{ printAllocationStorehouseInfo.conditions.applyType == '10000' ||
+                   printAllocationStorehouseInfo.conditions.applyType == '30000' ? 
+                   $t('printAllocationStorehouse.sourceWarehouse') : 
+                   $t('printAllocationStorehouse.returnPerson') }}
+              </th>
+              <th scope="col" class="text-center">
+                <span>{{ $t('printAllocationStorehouse.targetStorehouse') }}</span>
+              </th>
+              <th scope="col" class="text-center">
+                <span>{{ $t('printAllocationStorehouse.originalStock') }}</span>
+              </th>
+              <th scope="col" class="text-center">
+                <span>{{ $t('printAllocationStorehouse.allocationQuantity') }}</span>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr v-for="(item, index) in printAllocationStorehouseInfo.resourceStores" :key="index">
+              <th scope="row" class="text-center">{{ index + 1 }}</th>
+              <td class="text-center">{{ item.resName }}</td>
+              <td class="text-center">{{ item.parentRstName }} > {{ item.rstName }}</td>
+              <td class="text-center">{{ item.specName ? item.specName : '-' }}</td>
+              <td class="text-center">{{ item.resCode }}</td>
+              <td class="text-center">{{ item.isFixedName }}</td>
+              <td class="text-center">
+                {{ printAllocationStorehouseInfo.conditions.applyType == '10000' ||
+                   printAllocationStorehouseInfo.conditions.applyType == '30000' ? 
+                   item.shaName : printAllocationStorehouseInfo.conditions.startUserName }}
+              </td>
+              <td class="text-center">{{ item.shzName }}</td>
+              <td class="text-center">{{ item.originalStock }}{{ item.unitCodeName }}</td>
+              <td class="text-center">
+                {{ item.stock }}{{ item.applyType == 20000 ? item.miniUnitCodeName : item.unitCodeName }}
+              </td>
+            </tr>
+            <tr>
+              <th scope="row" class="text-center">
+                <span>{{ $t('printAllocationStorehouse.remark') }}</span>
+              </th>
+              <td colspan="9" style="text-align:center">{{ printAllocationStorehouseInfo.conditions.remark }}</td>
+            </tr>
+            <tr height="60px">
+              <td colspan="2" class="text-center" style="vertical-align:middle;">
+                <span>{{ $t('printAllocationStorehouse.storeManagerSign') }}</span>
+              </td>
+              <td colspan="2"></td>
+              <td class="text-center" style="vertical-align:middle;">
+                <span>{{ $t('printAllocationStorehouse.time') }}</span>
+              </td>
+              <td colspan="5"></td>
+            </tr>
+            <tr height="60px">
+              <td colspan="2" class="text-center" style="vertical-align:middle;">
+                <span>{{ $t('printAllocationStorehouse.allocationStaffSign') }}</span>
+              </td>
+              <td colspan="2"></td>
+              <td class="text-center" style="vertical-align:middle;">
+                <span>{{ $t('printAllocationStorehouse.time') }}</span>
+              </td>
+              <td colspan="5"></td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      
+      <div id="print-btn">
+        <el-button type="primary" class="float-right" @click="handlePrint">
+          <i class="el-icon-printer"></i>&nbsp;{{ $t('common.print') }}
+        </el-button>
+        <el-button type="warning" class="float-right" style="margin-right:20px;" @click="handleCancel">
+          {{ $t('common.cancel') }}
+        </el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listAllocationStorehouseApplys, listAllocationStorehouses } from '@/api/resource/printAllocationStorehouseApi'
+
+export default {
+  name: 'PrintAllocationStorehouseList',
+  data() {
+    return {
+      printAllocationStorehouseInfo: {
+        resourceStores: [],
+        conditions: {}
+      },
+      printFlag: '0'
+    }
+  },
+  created() {
+    this.initData()
+  },
+  methods: {
+    async initData() {
+      try {
+        const applyId = this.$route.query.applyId
+        const params = {
+          page: 1,
+          row: 1,
+          applyId: applyId
+        }
+        
+        const [applyRes, storeRes] = await Promise.all([
+          listAllocationStorehouseApplys(params),
+          listAllocationStorehouses(params)
+        ])
+        
+        this.printAllocationStorehouseInfo.conditions = applyRes.data[0]
+        this.printAllocationStorehouseInfo.resourceStores = storeRes.data
+      } catch (error) {
+        this.$message.error(this.$t('printAllocationStorehouse.fetchError'))
+      }
+    },
+    handlePrint() {
+      this.printFlag = '1'
+      document.getElementById("print-btn").style.display = "none"
+      window.print()
+      window.close()
+    },
+    handleCancel() {
+      window.close()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.print-allocation-storehouse-container {
+  padding: 20px;
+}
+
+.margin-top {
+  margin-top: 20px;
+}
+
+.text-center {
+  text-align: center;
+}
+
+.float-right {
+  float: right;
+}
+
+/* Bootstrap 表格样式 */
+.table {
+  width: 100%;
+  margin-bottom: 1rem;
+  color: #212529;
+  border-collapse: collapse;
+}
+
+.table-bordered {
+  border: 1px solid #dee2e6;
+}
+
+.table-bordered th,
+.table-bordered td {
+  border: 1px solid #dee2e6;
+}
+
+.table th,
+.table td {
+  padding: 0.75rem;
+  vertical-align: top;
+  border-top: 1px solid #dee2e6;
+}
+
+.table thead th {
+  vertical-align: bottom;
+  border-bottom: 2px solid #dee2e6;
+  background-color: #f8f9fa;
+  font-weight: 500;
+}
+
+/* Bootstrap 栅格系统 */
+.row {
+  display: flex;
+  flex-wrap: wrap;
+  margin-right: -15px;
+  margin-left: -15px;
+}
+
+.col-sm-4 {
+  flex: 0 0 33.333333%;
+  max-width: 33.333333%;
+  padding-right: 15px;
+  padding-left: 15px;
+}
+
+/* 打印样式 */
+@media print {
+  .print-allocation-storehouse-container {
+    padding: 0;
+  }
+  
+  #print-btn {
+    display: none !important;
+  }
+  
+  .table {
+    border: 1px solid #000;
+  }
+  
+  .table th,
+  .table td {
+    border: 1px solid #000;
+    padding: 8px;
+  }
+  
+  .table thead th {
+    background-color: #f0f0f0 !important;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/resource/resourceStoreUseRecordManageList.vue b/src/views/resource/resourceStoreUseRecordManageList.vue
index af387cb..e352659 100644
--- a/src/views/resource/resourceStoreUseRecordManageList.vue
+++ b/src/views/resource/resourceStoreUseRecordManageList.vue
@@ -332,6 +332,7 @@ export default {
         }
         await exportData(params)
         this.$message.success(this.$t('common.exportSuccess'))
+        this.$router.push('/pages/property/downloadTempFile?tab=下载中心')
       } catch (error) {
         console.error(error)
         this.$message.error(this.$t('common.exportFailed'))
--
libgit2 0.21.4