From 3443eef779d9fa60ded99ad12a72e2710a3c8f3f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 14:11:43 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_sbjkxt

---
 src/views/financialManagement/accounting/index.vue                             |  547 ++++++++
 src/api/lavorissce/ledger.js                                                   |   55 
 src/views/inventoryManagement/stockManagement/components/FormDiaPurchase.vue   |  147 ++
 src/views/inventoryManagement/index.vue                                        |  309 ++++
 src/api/productionManagement/productionOrder.js                                |   27 
 src/api/inventoryManagement/stockIn.js                                         |   78 +
 src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue  |  300 ++++
 src/api/inventoryManagement/stockManage.js                                     |   20 
 src/api/inventoryManagement/stockWarning.js                                    |   15 
 src/api/inventoryManagement/stockReport.js                                     |   55 
 src/api/inventoryManagement/stockOut.js                                        |   12 
 src/views/financialManagement/inventoryAccounting/index.vue                    |  390 ++++++
 src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue   |  310 +++++
 src/utils/index.js                                                             |   13 
 src/views/inventoryManagement/receiptManagement/components/formDia.vue         |  401 ++++++
 src/views/inventoryManagement/stockReport/index.vue                            |  713 +++++++++++
 src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue     |  154 ++
 src/views/inventoryManagement/stockManagement/components/FormDiaProduction.vue |  147 ++
 18 files changed, 3,674 insertions(+), 19 deletions(-)

diff --git a/src/api/inventoryManagement/stockIn.js b/src/api/inventoryManagement/stockIn.js
index 5e104f7..70f07a7 100644
--- a/src/api/inventoryManagement/stockIn.js
+++ b/src/api/inventoryManagement/stockIn.js
@@ -9,6 +9,41 @@
     });
 };
 
+// 鏌ヨ鐢熶骇鍏ュ簱淇℃伅鍒楄〃
+export const getStockInPageByProduction = (params) => {
+    return request({
+        url: "/stockin/listPageByProduction",
+        method: "get",
+        params,
+    });
+};
+
+// 鍑哄簱鍙拌处-鏌ヨ鑷畾涔夊叆搴撲俊鎭垪琛�
+export const getStockInPageByCustom = (params) => {
+    return request({
+        url: "/stockmanagement/listPageByCustom",
+        method: "get",
+        params,
+    });
+};
+// 鍏ュ簱绠＄悊-鏌ヨ鑷畾涔夊叆搴撲俊鎭垪琛�
+export const getInPageByCustom = (params) => {
+    return request({
+        url: "/stockin/listPageByCustom",
+        method: "get",
+        params,
+    });
+};
+
+// 鍑哄簱鍙拌处-鏌ヨ鐢熶骇鍑哄簱淇℃伅鍒楄〃
+export const getStockInPageByProduct = (params) => {
+    return request({
+        url: "/stockmanagement/listPageByProduct",
+        method: "get",
+        params,
+    });
+};
+
 // 淇敼鍏ュ簱瀛樹俊鎭�
 export const updateStockIn = (data) => {
     return request({
@@ -26,6 +61,14 @@
         data,
     });
 };
+// 淇敼鏉愭枡搴撳瓨淇℃伅
+export const updateManagementByCustom = (data) => {
+    return request({
+        url: "/stockin/updateManagementByCustom ",
+        method: "post",
+        data,
+    });
+};
 
 // 鏂板鍟嗗搧鍏ュ簱淇℃伅
 export function addSutockIn(data) {
@@ -36,6 +79,32 @@
     })
 }
 
+// 鏂板鑷畾涔夊叆搴撲俊鎭�
+export function addStockInCustom(data) {
+    return request({
+        url: '/stockin/addCustom',
+        method: 'post',
+        data: data
+    })
+}
+
+// 缂栬緫鑷畾涔夊叆搴撲俊鎭�
+export function updateStockInCustom(data) {
+    return request({
+        url: '/stockin/updateCustom',
+        method: 'post',
+        data: data
+    })
+}
+// 缂栬緫鎴愬搧鍏ュ簱淇℃伅
+export function updateProduct(data) {
+    return request({
+        url: '/stockin/update',
+        method: 'post',
+        data: data
+    })
+}
+
 // 鍒犻櫎鍏ュ簱淇℃伅
 export function delStockIn(ids) {
     return request({
@@ -45,6 +114,15 @@
     })
 }
 
+// 鍒犻櫎鑷畾涔夊叆搴撲俊鎭�
+export function delStockInCustom(ids) {
+    return request({
+        url: '/stockin/delteCustom',
+        method: 'post',
+        data: ids
+    })
+}
+
 // 瀵煎嚭鍏ュ簱淇℃伅
 export function exportStockIn(query) {
     return request({
diff --git a/src/api/inventoryManagement/stockManage.js b/src/api/inventoryManagement/stockManage.js
index bb2081b..4f5d957 100644
--- a/src/api/inventoryManagement/stockManage.js
+++ b/src/api/inventoryManagement/stockManage.js
@@ -9,6 +9,24 @@
     });
 };
 
+// 鏌ヨ鐢熶骇鍏ュ簱搴撳瓨淇℃伅鍒楄〃
+export const getStockManagePageByProduction = (params) => {
+    return request({
+        url: "/stockin/listPageCopyByProduction",
+        method: "get",
+        params,
+    });
+};
+
+// 鏌ヨ鑷畾涔夊叆搴撳簱瀛樹俊鎭垪琛�
+export const getStockManagePageByCustom = (params) => {
+    return request({
+        url: "/stockin/listPageCopyByCustom",
+        method: "get",
+        params,
+    });
+};
+
 
 // 淇敼搴撳瓨淇℃伅
 export const updateStockManage = (data) => {
@@ -38,7 +56,7 @@
     })
 }
 
-//鍑哄簱鎺ュ彛
+// 鍑哄簱绠＄悊-棰嗙敤鎺ュ彛
 export const stockOut = (data) => {
     return request({
         url: '/stockmanagement/stockout',
diff --git a/src/api/inventoryManagement/stockOut.js b/src/api/inventoryManagement/stockOut.js
index 5d410d9..7d188af 100644
--- a/src/api/inventoryManagement/stockOut.js
+++ b/src/api/inventoryManagement/stockOut.js
@@ -1,6 +1,6 @@
 import request from "@/utils/request";
 
-//鏌ヨ鍑哄簱鍒楄〃
+// 鍑哄簱鍙拌处-閲囪喘鍑哄簱鏌ヨ鍑哄簱鍒楄〃
 export const getStockOutPage = (params) => {
     return request({
         url: "/stockmanagement/listPage",
@@ -35,13 +35,3 @@
         data: ids
     })
 }
-
-//瀵煎嚭鍑哄簱淇℃伅
-export const exportStockOut = (query) => {
-    return request({
-        url: '/stockmanagement/export',
-        method: 'get',
-        params: query,
-        responseType: 'blob'
-    })
-}
\ No newline at end of file
diff --git a/src/api/inventoryManagement/stockReport.js b/src/api/inventoryManagement/stockReport.js
new file mode 100644
index 0000000..6d1a3ce
--- /dev/null
+++ b/src/api/inventoryManagement/stockReport.js
@@ -0,0 +1,55 @@
+import request from "@/utils/request";
+
+// 鑾峰彇搴撳瓨鏃ユ姤缁熻
+export const getStockDailyReport = (params) => {
+    return request({
+        url: "/stockin/getReportList",
+        method: "get",
+        params,
+    });
+};
+// 鑾峰彇搴撳瓨鏈堟姤缁熻
+export const getStockMonthlyReport = (params) => {
+    return request({
+        url: "/stockin/getReportList",
+        method: "get",
+        params,
+    });
+};
+
+// 鑾峰彇浣滀笟鎶ヨ〃缁熻
+export const getWorkReport = (params) => {
+    return request({
+        url: "/stockin/getReportList",
+        method: "get",
+        params,
+    });
+};
+
+// 鑾峰彇搴撳瓨杩涘嚭瀛樼粺璁�
+export const getStockInOutReport = (params) => {
+    return request({
+        url: "/stockin/getReportList",
+        method: "get",
+        params,
+    });
+};
+
+// 瀵煎嚭搴撳瓨鎶ヨ〃
+export const exportStockReport = (params) => {
+    return request({
+        url: "/stockin/exportCopy",
+        method: "post",
+        params,
+        responseType: 'blob'
+    });
+};
+
+// 鑾峰彇搴撳瓨瓒嬪娍鏁版嵁
+export const getStockTrendData = (params) => {
+    return request({
+        url: "/stockreport/trend",
+        method: "get",
+        params,
+    });
+};
diff --git a/src/api/inventoryManagement/stockWarning.js b/src/api/inventoryManagement/stockWarning.js
index 092fb80..65e641a 100644
--- a/src/api/inventoryManagement/stockWarning.js
+++ b/src/api/inventoryManagement/stockWarning.js
@@ -1,11 +1,14 @@
 import request from "@/utils/request";
 
 // 鏌ヨ鍌ㄦ皵缃愰璀﹀垪琛�
-export const getStockWarningPage = (params) => {
+export const getStockWarningPage = (page, params) => {
     return request({
         url: "/gasTankWarning/listPage",
         method: "get",
-        params,
+        params: {
+            ...page,
+            ...params
+        },
     });
 };
 
@@ -14,7 +17,7 @@
     return request({
         url: "/gasTankWarning/add",
         method: "post",
-        data,
+        data: data,
     });
 };
 
@@ -22,8 +25,8 @@
 export const updateStockWarning = (data) => {
     return request({
         url: "/gasTankWarning/update",
-        method: "put",
-        data,
+        method: "post",
+        data: data,
     });
 };
 
@@ -32,7 +35,7 @@
     return request({
         url: "/gasTankWarning/delete",
         method: "delete",
-        data: { ids },
+        data: ids,
     });
 };
 
diff --git a/src/api/lavorissce/ledger.js b/src/api/lavorissce/ledger.js
new file mode 100644
index 0000000..f4f710c
--- /dev/null
+++ b/src/api/lavorissce/ledger.js
@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 鍒嗛〉鏌ヨ
+export function listPage(query) {
+    return request({
+        url: '/lavorIssue/listPage',
+        method: 'get',
+        params: query
+    })
+}
+
+// 鍒嗛〉鏌ヨ
+export function statistics(params) {
+    return request({
+        url: '/lavorIssue/statistics',
+        method: 'get',
+        params
+    })
+}
+
+export function statisticsList(params) {
+    return request({
+        url: '/lavorIssue/statisticsList',
+        method: 'get',
+        params
+    })
+}
+
+// 娣诲姞
+export function add(data) {
+    return request({
+        url: '/lavorIssue/add',
+        method: 'post',
+        data
+    })
+}
+
+// 淇敼
+export function update(data) {
+    return request({
+        url: '/lavorIssue/update',
+        method: 'post',
+        data
+    })
+}
+
+// 鍒犻櫎
+export function deleteLedger(data) {
+    return request({
+        url: '/lavorIssue/delete',
+        method: 'delete',
+        data
+    })
+}
+
diff --git a/src/api/productionManagement/productionOrder.js b/src/api/productionManagement/productionOrder.js
index ab3dc06..29cff35 100644
--- a/src/api/productionManagement/productionOrder.js
+++ b/src/api/productionManagement/productionOrder.js
@@ -4,7 +4,7 @@
 // 鍒嗛〉鏌ヨ
 export function schedulingListPage(query) {
   return request({
-    url: "/salesLedger/scheduling/listPage",
+    url: "/productionOrder/listPage",
     method: "get",
     params: query,
   });
@@ -16,4 +16,29 @@
     method: "post",
     data: query,
   });
+}
+
+// 鏂板鐢熶骇璁㈠崟
+export function addProductionOrder(query) {
+  return request({
+    url: "/productionOrder/addProductionOrder",
+    method: "post",
+    data: query,
+  });
+}
+// 淇敼鐢熶骇璁㈠崟
+export function updateProductionOrder(query) {
+  return request({
+    url: "/productionOrder/updateProductionOrder",
+    method: "post",
+    data: query,
+  });
+}
+// 鍒犻櫎鐢熶骇璁㈠崟
+export function deleteProductionOrder(query) {
+  return request({
+    url: "/productionOrder/deleteProductionOrder",
+    method: "delete",
+    data: query,
+  });
 }
\ No newline at end of file
diff --git a/src/utils/index.js b/src/utils/index.js
index e522c3c..809593f 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -396,3 +396,16 @@
 export function isEqual(obj1, obj2) {
   return JSON.stringify(obj1) === JSON.stringify(obj2);
 }
+
+/**
+ * 鑾峰彇褰撳墠鏃ユ湡骞舵牸寮忓寲涓� YYYY-MM-DD
+ * @returns {string} 鏍煎紡鍖栫殑鏃ユ湡瀛楃涓�
+ */
+export function getCurrentDate() {
+  const today = new Date();
+  const year = today.getFullYear();
+  const month = String(today.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮�
+  const day = String(today.getDate()).padStart(2, '0');
+  return `${year}-${month}-${day}`;
+}
+
diff --git a/src/views/financialManagement/accounting/index.vue b/src/views/financialManagement/accounting/index.vue
new file mode 100644
index 0000000..91588fd
--- /dev/null
+++ b/src/views/financialManagement/accounting/index.vue
@@ -0,0 +1,547 @@
+<template>
+  <div style="padding: 20px;">
+    <!-- 椤甸潰鏍囬鍜岀瓫閫夋潯浠� -->
+    <div class="w-full md:w-auto flex items-center gap-3" style="margin-bottom: 20px;">
+      <el-button
+        type="primary"
+        icon="Refresh"
+        @click="resetFilters"
+        size="default"
+      >
+        鏌ヨ
+      </el-button>
+    </div>
+
+    <main class="container mx-auto px-4 pb-10">
+      <!-- 鍥哄畾璧勪骇鎸囨爣鍗＄墖 -->
+      <div class="grid-container">
+        <!-- 璁惧鎬绘暟 -->
+        <el-card class="bg2">
+          <p>璁惧鎬绘暟</p>
+          <h3>
+            {{ assetInfo.totalEquipment }}
+          </h3>
+        </el-card>
+
+        <!-- 璧勪骇鍘熷�� -->
+        <el-card class="bg3">
+          <p>璧勪骇鍘熷��</p>
+          <h3>
+            楼{{ assetInfo.totalOriginalValue }}
+          </h3>
+        </el-card>
+
+        <!-- 绱鎶樻棫 -->
+        <el-card class="bg4">
+          <p>绱鎶樻棫</p>
+          <h3>
+            楼{{ assetInfo.totalDepreciation }}
+          </h3>
+        </el-card>
+
+        <!-- 鍑�鍊� -->
+        <el-card class="bg5">
+          <p>鍑�鍊�</p>
+          <h3>
+            楼{{ assetInfo.totalNetValue }}
+          </h3>
+        </el-card>
+      </div>
+
+      <!-- 鍥哄畾璧勪骇缁熻鍥捐〃 -->
+      <div class="grid-layout">
+        <!-- 鎸夎澶囩被鍨嬬粺璁� -->
+        <el-card style="margin-bottom: 20px;">
+          <h2 class="section-title">璁惧绫诲瀷鍒嗗竷</h2>
+          <div class="echarts">
+            <Echarts
+                :legend="typeDistributionLegend"
+                :chartStyle="chartStylePie"
+                :series="typeDistributionSeries"
+                :tooltip="pieTooltip"
+                style="height: 260px; width: 35%;">
+              <div class="chart-num">
+                <span style="font-size: 22px;">璁惧绫诲瀷</span>
+                <span style="font-size: 36px; font-weight: 500; font-family: 'MyCustomFont', sans-serif;">{{ assetInfo.totalEquipment }}</span>
+              </div>
+            </Echarts>
+            <Echarts
+                ref="chart"
+                :chartStyle="chartStyle"
+                :grid="grid"
+                :legend="lineLegend"
+                :series="typeDistributionLineSeries"
+                :tooltip="tooltip"
+                :xAxis="xAxis"
+                :yAxis="yAxis"
+                style="height: 260px; width: 64%;"></Echarts>
+          </div>
+        </el-card>
+      </div>
+      <!-- 璁惧鍙拌处琛ㄦ牸 -->
+      <el-card style="margin-bottom: 20px;">
+        <el-table
+          :data="equipmentList"
+          stripe
+          style="width: 100%"
+          :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
+        >
+          <el-table-column prop="id" label="璧勪骇缂栧彿" width="120" />
+          <el-table-column prop="deviceName" label="璁惧鍚嶇О" width="250" />
+          <el-table-column prop="deviceModel" label="鍨嬪彿瑙勬牸" min-width="150" />
+          <el-table-column prop="supplierName" label="渚涘簲鍟�" min-width="120" />
+          <el-table-column prop="unit" label="鍗曚綅" width="120" />
+          <el-table-column prop="number" label="鏁伴噺" width="120" />
+          <el-table-column prop="originalValue" label="鍘熷��(鍏�)" width="120">
+            <template #default="{ row }">
+              楼{{ formatCurrency(row.taxIncludingPriceTotal) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="depreciation" label="绱鎶樻棫(鍏�)" width="140">
+            <template #default="{ row }">
+              楼{{ formatCurrency(row.taxIncludingPriceTotal-row.unTaxIncludingPriceTotal) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="netValue" label="鍑�鍊�(鍏�)" width="120">
+            <template #default="{ row }">
+              楼{{ formatCurrency(row.unTaxIncludingPriceTotal) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="status" label="鐘舵��" width="100">
+            <template #default="{ row }">
+              <el-tag
+                :type="getStatusTagType(row.status)"
+                size="small"
+              >
+                {{ row.status }}
+              </el-tag>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <!-- 鍒嗛〉 -->
+        <div class="pagination-container">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="pagination.currentPage"
+            :page-sizes="[10, 20, 50, 100]"
+            :page-size="pagination.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="pagination.total"
+          />
+        </div>
+      </el-card>
+    </main>
+
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted, reactive } from 'vue';
+import 'element-plus/dist/index.css';
+import Echarts from "@/components/Echarts/echarts.vue";
+import { getLedgerPage } from "@/api/equipmentManagement/ledger";
+import dayjs from "dayjs";
+
+// 绛涢�夋潯浠�
+const dateRange = ref(null);
+const equipmentType = ref('');
+
+
+// 鍥哄畾璧勪骇淇℃伅
+const assetInfo = ref({
+  totalEquipment: 0,
+  totalOriginalValue: 0,
+  totalDepreciation: 0,
+  totalNetValue: 0
+});
+
+// 璁惧鍒楄〃
+const equipmentList = ref([]);
+const pagination = ref({
+  currentPage: 1,
+  pageSize: 10,
+  total: 0
+});
+
+// 鍥捐〃閰嶇疆
+const chartStyle = {
+  width: '100%',
+  height: '100%',
+  position: 'relative',
+};
+
+const grid = {
+  left: '3%',
+  right: '4%',
+  bottom: '3%',
+  containLabel: true
+};
+
+const lineLegend = {
+  show: false,
+};
+
+// 鎶樼嚎鍥炬彁绀烘
+const tooltip = reactive({
+  trigger: 'axis',
+  axisPointer: {
+    type: 'line',
+    lineStyle: { color: '#aaa' }
+  },
+  // 鑷畾涔夊唴瀹�
+  formatter: function (params) {
+    if (!params || !params.length) return '';
+    const axisLabel = params[0].axisValueLabel || params[0].axisValue || '';
+    const rows = params
+      .map(p => {
+        const colorDot = `<span style="display:inline-block;margin-right:6px;width:8px;height:8px;border-radius:50%;background:${p.color}"></span>`;
+        return `${colorDot}${p.seriesName}: ${p.value}`;
+      })
+      .join('<br/>');
+    return `<div>${axisLabel}</div><div>${rows}</div>`;
+  }
+});
+
+const xAxis = ref([
+  {
+    type: 'category',
+    axisTick: { show: true, alignWithLabel: true },
+    data: [],
+  },
+]);
+
+const yAxis = [
+  {
+    type: 'value',
+    name: '鏁伴噺/閲戦', // 宸︿晶y杞�
+    position: 'left',
+    min: 0,
+    // 鍧愭爣杞村悕绉版牱寮�
+    nameTextStyle: {
+      color: '#000',
+      fontSize: 14,
+    },
+  }
+];
+
+const chartStylePie = {
+  width: '100%',
+  height: '100%' // 璁剧疆鍥捐〃瀹瑰櫒鐨勯珮搴�
+};
+
+const pieColors = ['#F04864', '#FACC14', '#8543E0', '#1890FF', '#13C2C2', '#2FC25B']; // 鍙牴鎹疄闄呰皟鏁�
+
+// 楗煎浘鏁版嵁
+const typeDistributionData = ref([]);
+const departmentDistributionData = ref([]);
+
+// 楗煎浘鍥句緥
+const typeDistributionLegend = computed(() => ({
+  show: true,
+  top: 'center',
+  left: '60%',
+  orient: 'vertical',
+  icon: 'circle',
+  data: typeDistributionData.value.map(item => item.name),
+  formatter: function(name) {
+    const item = typeDistributionData.value.find(i => i.name === name);
+    if (!item) return name;
+    return `${name} | ${item.count} 鍙� | ${item.amount}`;
+  },
+  textStyle: {
+    color: '#333',
+    fontSize: 14,
+    lineHeight: 26,
+  }
+}));
+
+
+// 楗煎浘绯诲垪
+const typeDistributionSeries = computed(() => [
+  {
+    type: 'pie',
+    radius: ['50%', '65%'],
+    center: ['25%', '50%'],
+    avoidLabelOverlap: false,
+    itemStyle: {
+      borderColor: '#fff',
+      borderWidth: 2
+    },
+    label: {
+      show: false
+    },
+    data: typeDistributionData.value,
+    color: pieColors
+  }
+]);
+
+// 鎶樼嚎鍥炬暟鎹�
+const typeDistributionLineSeries = ref([]);
+
+
+// 楗煎浘鎻愮ず妗�
+const pieTooltip = reactive({
+  trigger: 'item',
+  formatter: function(params) {
+    // 妫�鏌ユ暟鎹槸鍚﹀瓨鍦�
+    if (!params.data) return params.name;
+    // 鎷兼帴瀹屾暣鍐呭
+    return `
+      <div>
+        <div style="color:${params.color};font-size:16px;">鈼�</div>
+        <div>${params.name}</div>
+        <div>鏁伴噺锛�${params.data.count} 鍙�</div>
+        <div>閲戦锛�${params.data.amount}</div>
+      </div>
+    `;
+  }
+});
+
+// 閫夐」鏁版嵁
+const equipmentTypeOptions = ref([]);
+
+// 鑾峰彇鏁版嵁
+const fetchData = async () => {
+  try {
+    // 鑾峰彇鍥哄畾璧勪骇姹囨�讳俊鎭�
+    const assetInfoRes = await getAssetInfo({
+      startDate: dateRange.value ? dateRange.value[0] : null,
+      endDate: dateRange.value ? dateRange.value[1] : null,
+      equipmentType: equipmentType.value
+    });
+
+    if (assetInfoRes.code === 200) {
+      assetInfo.value = assetInfoRes.data;
+    }
+
+    // 鑾峰彇璁惧鍒楄〃
+    const equipmentListRes = await getLedgerPage({
+      current: pagination.value.currentPage,
+      size: pagination.value.pageSize,
+      startDate: dateRange.value ? dateRange.value[0] : null,
+      endDate: dateRange.value ? dateRange.value[1] : null,
+      equipmentType: equipmentType.value
+    });
+
+    if (equipmentListRes.code === 200) {
+      equipmentList.value = equipmentListRes.data.records;
+      pagination.value.total = equipmentListRes.data.total;
+
+      // 鏍规嵁 equipmentList 鎸� deviceName 杩涜鍒嗙被缁熻
+      const deviceNameMap = {};
+      equipmentList.value.forEach(item => {
+        const deviceName = item.deviceName;
+        if (!deviceNameMap[deviceName]) {
+          deviceNameMap[deviceName] = {
+            name: deviceName,
+            count: 0,
+            totalValue: 0
+          };
+        }
+        deviceNameMap[deviceName].count += item.number || 1; // 鍋囪 number 涓鸿澶囨暟閲�
+        deviceNameMap[deviceName].totalValue += item.taxIncludingPriceTotal || 0; // 绱姞鍚◣鎬讳环
+      });
+
+      // 杞崲涓� typeDistributionData 鏍煎紡
+      typeDistributionData.value = Object.values(deviceNameMap).map(item => ({
+        name: item.name,
+        value: item.count,
+        count: item.count,
+        amount: `楼${formatCurrency(item.totalValue)}`
+      }));
+
+      // 鏇存柊x杞存暟鎹�
+      xAxis.value[0].data = typeDistributionData.value.map(item => item.name);
+
+      // 鏋勫缓鎶樼嚎鍥炬暟鎹�
+      typeDistributionLineSeries.value = [
+        {
+          name: '璁惧鏁伴噺',
+          type: 'line',
+          data: typeDistributionData.value.map(item => item.count)
+        }
+      ];
+    }
+  } catch (error) {
+    console.error('鑾峰彇鍥哄畾璧勪骇鏁版嵁澶辫触锛�', error);
+  }
+};
+
+// 鍒濆鍖�
+onMounted(() => {
+  // 鑾峰彇鍒楄〃鏁版嵁
+  fetchData();
+});
+
+// 鏍煎紡鍖栬揣甯�
+const formatCurrency = (value) => {
+  if (!value) return '0.00';
+  return Number(value).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+};
+
+// 鑾峰彇鐘舵�佹爣绛剧被鍨�
+const getStatusTagType = (status) => {
+  switch (status) {
+    case '鍦ㄧ敤':
+      return 'success';
+    case '闂茬疆':
+      return 'info';
+    case '缁翠慨涓�':
+      return 'warning';
+    case '鎶ュ簾':
+      return 'danger';
+    default:
+      return 'info';
+  }
+};
+
+// 閲嶇疆绛涢�夋潯浠�
+const resetFilters = () => {
+  dateRange.value = null;
+  equipmentType.value = '';
+  fetchData();
+};
+
+// 鍒嗛〉澶勭悊
+const handleSizeChange = (size) => {
+  pagination.value.pageSize = size;
+  fetchData();
+};
+
+const handleCurrentChange = (page) => {
+  pagination.value.currentPage = page;
+  fetchData();
+};
+</script>
+
+<style scoped lang="scss">
+/* 鍩虹鏍峰紡琛ュ厖 */
+:root {
+  --el-color-primary: #4f46e5;
+}
+
+.el-card {
+  position: relative;
+  border-radius: 12px;
+  padding: 14px 10px 10px 10px;
+  box-shadow: 0 2px 8px #eee;
+
+  :deep(.el-card__body) {
+    padding: 10px 20px !important;
+  }
+
+  &.bg1 {
+    background: url(@/assets/icons/png/1.png) no-repeat 100% 100% !important;
+  }
+
+  &.bg2 {
+    background: url(@/assets/icons/png/2.png) no-repeat 100% 100% !important;
+  }
+
+  &.bg3 {
+    background: url(@/assets/icons/png/3.png) no-repeat 100% 100% !important;
+  }
+
+  &.bg4 {
+    background: url(@/assets/icons/png/4.png) no-repeat 100% 100% !important;
+  }
+
+  &.bg5 {
+    background: url(@/assets/icons/png/5.png) no-repeat 100% 100% !important;
+  }
+}
+
+.grid-container {
+  /* grid 瀹瑰櫒鍩虹鏍峰紡 */
+  display: grid;
+  gap: 1rem; /* gap-4 瀵瑰簲 1rem (16px) */
+  margin-bottom: 2rem; /* mb-8 瀵瑰簲 2rem (32px) */
+
+  p {
+    font-size: 22px;
+    margin-top: 0px;
+    color: #fff;
+  }
+
+  h3 {
+    font-size: 36px;
+    font-weight: 500;
+    font-family: 'MyCustomFont', sans-serif;
+    margin: 10px 0;
+    color: #fff;
+  }
+}
+
+/* 绉诲姩绔粯璁ゆ牱寮� (grid-cols-1) */
+.grid-container {
+  grid-template-columns: repeat(1, minmax(0, 1fr));
+}
+
+/* 灏忓睆骞曞強浠ヤ笂 (sm:grid-cols-2) */
+@media (min-width: 640px) {
+  .grid-container {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+
+/* 澶у睆骞曞強浠ヤ笂 (lg:grid-cols-5) */
+@media (min-width: 1024px) {
+  .grid-container {
+    grid-template-columns: repeat(5, minmax(0, 1fr));
+  }
+}
+
+/* 鍗＄墖鎮仠鏁堟灉澧炲己 */
+.el-card:hover {
+  transform: translateY(-2px);
+}
+
+.echarts {
+  display: flex;
+  justify-content: space-between;
+}
+
+/* 鍥捐〃瀹瑰櫒鏍峰紡 */
+.el-chart {
+  width: 100%;
+  height: 100%;
+}
+
+.section-title {
+  position: relative;
+  font-size: 18px;
+  color: #333;
+  padding-left: 10px;
+  margin-bottom: 10px;
+  font-weight: 700;
+}
+
+.section-title::before {
+  position: absolute;
+  left: 0;
+  top: 0px;
+  content: '';
+  width: 4px;
+  height: 18px;
+  background-color: #002FA7;
+  border-radius: 2px;
+}
+
+.chart-num {
+  position: absolute;
+  z-index: 3;
+  top: 92px;
+  left: 92px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.pagination-container {
+  margin-top: 20px;
+  display: flex;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/financialManagement/inventoryAccounting/index.vue b/src/views/financialManagement/inventoryAccounting/index.vue
new file mode 100644
index 0000000..cca6861
--- /dev/null
+++ b/src/views/financialManagement/inventoryAccounting/index.vue
@@ -0,0 +1,390 @@
+<template>
+  <div class="inventory-statistics">
+    <!-- 绛涢�夎〃鍗� -->
+    <div class="filter-form">
+      <el-form :model="filterForm" inline>
+<!--        <el-form-item label="鏃堕棿鑼冨洿">-->
+<!--          <el-date-picker-->
+<!--            v-model="filterForm.dateRange"-->
+<!--            type="daterange"-->
+<!--            range-separator="鑷�"-->
+<!--            start-placeholder="寮�濮嬫棩鏈�"-->
+<!--            end-placeholder="缁撴潫鏃ユ湡"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="渚涘簲鍟嗗悕绉�">-->
+<!--          <el-input v-model="filterForm.supplierName" style="width: 240px" placeholder="璇疯緭鍏�" clearable prefix-icon="Search" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="浜у搧鍚嶇О">-->
+<!--          <el-input v-model="filterForm.productCategory" style="width: 240px" placeholder="璇疯緭鍏�" clearable prefix-icon="Search" />-->
+<!--        </el-form-item>-->
+        <el-form-item>
+          <el-button type="primary" @click="handleSearch">鏌ヨ</el-button>
+<!--          <el-button @click="handleReset">閲嶇疆</el-button>-->
+<!--          <el-button type="success" @click="handleExport">瀵煎嚭</el-button>-->
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <!-- 缁熻姹囨�诲崱鐗� -->
+    <div class="summary-cards">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-card class="summary-card">
+            <div class="summary-item">
+              <p class="summary-title">鎬诲簱瀛樻暟閲�</p>
+              <p class="summary-value">{{ summaryData.totalInventoryCount }}</p>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card class="summary-card">
+            <div class="summary-item">
+              <p class="summary-title">鎬诲簱瀛橀噾棰�</p>
+              <p class="summary-value">楼{{ summaryData.totalInventoryValue }}</p>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card class="summary-card">
+            <div class="summary-item">
+              <p class="summary-title">搴撳瓨鍙樺姩鏁伴噺</p>
+              <p class="summary-value">{{ summaryData.inventoryChangeCount }}</p>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card class="summary-card">
+            <div class="summary-item">
+              <p class="summary-title">搴撳瓨鍙樺姩閲戦</p>
+              <p class="summary-value">楼{{ summaryData.inventoryChangeValue }}</p>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
+
+    <!-- 鍥捐〃鍖哄煙 -->
+    <div class="chart-section">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-card class="chart-card">
+            <template #header>
+              <div class="card-header">
+                <span>搴撳瓨鍒嗙被鍗犳瘮</span>
+              </div>
+            </template>
+            <div id="category-pie-chart" style="height: 400px;"></div>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card class="chart-card">
+            <template #header>
+              <div class="card-header">
+                <span>搴撳瓨閲戦瓒嬪娍</span>
+              </div>
+            </template>
+            <div id="amount-trend-chart" style="height: 400px;"></div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
+
+    <!-- 鏁版嵁琛ㄦ牸 -->
+    <div class="table_list">
+      <el-table
+        :data="tableData"
+        v-loading="loading"
+        border
+        style="width: 100%"
+        :header-cell-style="{ background: '#f5f7fa', color: '#606266' }"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+        <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="240" show-overflow-tooltip />
+        <el-table-column label="浜у搧" prop="productCategory" min-width="100" show-overflow-tooltip />
+        <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" min-width="200" show-overflow-tooltip />
+        <el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
+        <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="90" show-overflow-tooltip />
+        <el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum0" width="90" show-overflow-tooltip />
+        <el-table-column label="鍚◣鍗曚环" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />
+        <el-table-column label="鍚◣鎬讳环" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />
+        <el-table-column label="绋庣巼(%)" prop="taxRate" width="80" show-overflow-tooltip />
+        <el-table-column label="涓嶅惈绋庢�讳环" prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip />
+        <el-table-column label="鍏ュ簱浜�" prop="createBy" width="100" show-overflow-tooltip />
+      </el-table>
+      <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper" :page="page.current" :limit="page.size" @pagination="paginationChange" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, nextTick } from 'vue'
+import * as echarts from 'echarts'
+import {getStockInPage} from "@/api/inventoryManagement/stockIn.js";
+
+// 鐘舵�佸彉閲�
+const loading = ref(false)
+const total = ref(0)
+const tableData = ref([])
+const summaryData = ref({})
+const page = reactive({
+  current: 1,
+  size: 100,
+})
+
+// 鍥捐〃瀹炰緥
+const categoryPieChart = ref(null)
+const amountTrendChart = ref(null)
+
+// 绛涢�夎〃鍗�
+const filterForm = reactive({
+  dateRange: [],
+  supplierName: '',
+  productCategory: ''
+})
+
+const paginationChange = (obj) => {
+  page.current = obj.page;
+  page.size = obj.limit;
+  loadData()
+}
+
+// 鍒濆鍖栨暟鎹�
+onMounted(() => {
+  loadSummaryData()
+  loadData()
+})
+
+// 鍔犺浇缁熻姹囨�绘暟鎹�
+const loadSummaryData = () => {
+  getStockInChartData().then(res => {
+    summaryData.value = res.data
+  })
+}
+
+// 鍔犺浇搴撳瓨鏁版嵁
+const loadData = () => {
+  loading.value = true
+  getStockInPage({ ...filterForm, ...page }).then(res => {
+    loading.value = false
+    tableData.value = res.data.records
+    total.value = res.data.total
+    console.log('res', res.data.records)
+
+    // 鏁版嵁鍔犺浇瀹屾垚鍚庢覆鏌撳浘琛�
+    nextTick(() => {
+      renderCategoryPieChart()
+      renderAmountTrendChart()
+    })
+  }).catch(() => {
+    loading.value = false
+  })
+}
+
+// 娓叉煋鍒嗙被鍗犳瘮楗煎浘
+const renderCategoryPieChart = () => {
+  if (!categoryPieChart.value) {
+    categoryPieChart.value = echarts.init(document.getElementById('category-pie-chart'))
+  }
+  // 鏍规嵁 tableData 鎸� productCategory 鍒嗙被骞惰绠� inboundNum0 鏁伴噺鎬诲拰
+  const categoryMap = tableData.value.reduce((acc, cur) => {
+    acc[cur.productCategory] = (acc[cur.productCategory] || 0) + cur.inboundNum0
+    return acc
+  }, {})
+
+  // 灏嗗垎绫荤粨鏋滆浆鎹负 ECharts 楗煎浘鎵�闇�鐨勬暟鎹牸寮�
+  const categoryData = Object.entries(categoryMap).map(([name, value]) => ({
+    name: name,
+    value: value
+  }))
+  const option = {
+    title: {
+      text: '搴撳瓨鍒嗙被鍗犳瘮',
+      left: 'center'
+    },
+    tooltip: {
+      trigger: 'item',
+      formatter: '{a} <br/>{b}: {c} ({d}%)'
+    },
+    legend: {
+      orient: 'vertical',
+      left: 'left'
+    },
+    series: [
+      {
+        name: '搴撳瓨鍒嗙被',
+        type: 'pie',
+        radius: ['40%', '70%'],
+        avoidLabelOverlap: false,
+        itemStyle: {
+          borderRadius: 10,
+          borderColor: '#fff',
+          borderWidth: 2
+        },
+        label: {
+          show: true,
+          formatter: '{b}: {d}%'
+        },
+        emphasis: {
+          label: {
+            show: true,
+            fontSize: '16',
+            fontWeight: 'bold'
+          }
+        },
+        data: categoryData
+      }
+    ]
+  }
+
+  categoryPieChart.value.setOption(option)
+}
+// 娓叉煋閲戦瓒嬪娍鎶樼嚎鍥�
+const renderAmountTrendChart = () => {
+  if (!amountTrendChart.value) {
+    amountTrendChart.value = echarts.init(document.getElementById('amount-trend-chart'))
+  }
+  // 鎸夋湀浠藉垎缁勫苟璁＄畻taxInclusiveTotalPrice鎬诲拰
+  const monthlyAmounts = tableData.value.reduce((acc, cur) => {
+    const date = new Date(cur.createTime);
+    const month = date.getMonth() + 1;
+
+    // 纭繚month鍦�1-12鑼冨洿鍐�
+    if (month >= 1 && month <= 12) {
+      acc[month] = (acc[month] || 0) + cur.taxInclusiveTotalPrice;
+    }
+    return acc;
+  }, {});
+
+  // 鐢熸垚12涓湀鐨勬暟鎹紝缂哄け鏈堜唤鐢�0浠ｆ浛
+  const amounts = [];
+  for (let i = 1; i <= 12; i++) {
+    amounts.push(monthlyAmounts[i] || 0);
+  }
+  const dates = ['1鏈�', '2鏈�', '3鏈�', '4鏈�', '5鏈�', '6鏈�', '7鏈�', '8鏈�', '9鏈�', '10鏈�', '11鏈�', '12鏈�']
+
+  const option = {
+    title: {
+      text: '搴撳瓨閲戦瓒嬪娍',
+      left: 'center'
+    },
+    tooltip: {
+      trigger: 'axis',
+      formatter: '{b}: 楼{c}'
+    },
+    xAxis: {
+      type: 'category',
+      data: dates
+    },
+    yAxis: {
+      type: 'value',
+      axisLabel: {
+        formatter: '楼{value}'
+      }
+    },
+    series: [
+      {
+        name: '搴撳瓨閲戦',
+        type: 'line',
+        data: amounts,
+        smooth: true,
+        areaStyle: {}
+      }
+    ]
+  }
+
+  amountTrendChart.value.setOption(option)
+}
+
+// 鏌ヨ鎿嶄綔
+const handleSearch = () => {
+  loadData()
+}
+
+// 閲嶇疆鎿嶄綔
+const handleReset = () => {
+  filterForm.dateRange = []
+  filterForm.supplierName = ''
+  filterForm.productCategory = ''
+  loadData()
+}
+
+// 瀵煎嚭鎿嶄綔
+const handleExport = () => {
+  console.log('瀵煎嚭鏁版嵁')
+}
+
+// 绐楀彛澶у皬鏀瑰彉鏃讹紝閲嶆柊璋冩暣鍥捐〃澶у皬
+window.addEventListener('resize', () => {
+  if (categoryPieChart.value) categoryPieChart.value.resize()
+  if (amountTrendChart.value) amountTrendChart.value.resize()
+})
+</script>
+
+<style scoped>
+.inventory-statistics {
+  padding: 20px;
+}
+
+.filter-form {
+  margin-bottom: 20px;
+}
+
+.summary-cards {
+  margin-bottom: 20px;
+}
+
+.summary-card {
+  text-align: center;
+  height: 100px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.summary-item {
+  width: 100%;
+}
+
+.summary-title {
+  font-size: 14px;
+  color: #606266;
+  margin-bottom: 5px;
+}
+
+.summary-value {
+  font-size: 24px;
+  font-weight: bold;
+  color: #303133;
+}
+
+.summary-value.warning {
+  color: #e6a23c;
+}
+
+.summary-value.danger {
+  color: #f56c6c;
+}
+
+.chart-section {
+  margin-bottom: 20px;
+}
+
+.chart-card {
+  height: 460px;
+}
+
+.card-header {
+  font-weight: bold;
+}
+
+.table_list {
+  margin-top: 20px;
+}
+
+.pagination {
+  text-align: right;
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/inventoryManagement/index.vue b/src/views/inventoryManagement/index.vue
new file mode 100644
index 0000000..f371e26
--- /dev/null
+++ b/src/views/inventoryManagement/index.vue
@@ -0,0 +1,309 @@
+<template>
+	<div class="app-container">
+		<div class="search_form">
+			<div>
+				<span class="search_title">鍙戞斁瀛ｅ害锛�</span>
+				<el-select
+					style="width: 200px;"
+					@change="handleQuery"
+					v-model="searchForm.season"
+					placeholder="璇烽�夋嫨"
+					:clearable="false"
+				>
+					<el-option :label="item.label" :value="item.value" v-for="(item,index) in jidu" :key="item.value" />
+				</el-select>
+				<span class="search_title ml10">鍛樺伐鍚嶇О锛�</span>
+				<el-input
+					v-model="searchForm.staffName"
+					style="width: 240px"
+					placeholder="璇疯緭鍏�"
+					@change="handleQuery"
+					clearable
+					prefix-icon="Search"
+				/>
+				<el-button type="primary" @click="handleQuery" style="margin-left: 10px"
+				>鎼滅储</el-button
+				>
+			</div>
+			<div>
+				<el-button type="primary" @click="add" icon="Plus"> 鏂板 </el-button>
+				<el-button @click="handleOut" icon="download">瀵煎嚭</el-button>
+				<el-button
+					type="danger"
+					icon="Delete"
+					:disabled="multipleList.length <= 0"
+					@click="deleteRow(multipleList.map((item) => item.id))"
+				>
+					鎵归噺鍒犻櫎
+				</el-button>
+			</div>
+		</div>
+		<div class="table_list">
+			<el-table
+				ref="tableRef"
+				v-loading="tableLoading"
+				:data="tableData"
+				border
+				height="calc(100vh - 21em)"
+				:header-cell-style="{ background: '#F0F1F5', color: '#333333' }"
+				style="width: 100%"
+				@selection-change="handleSelectionChange"
+			>
+				<!-- 閫夋嫨鍒� -->
+				<el-table-column
+					align="center"
+					type="selection"
+					width="55"
+					fixed="left"
+				/>
+				
+				<!-- 搴忓彿鍒� -->
+				<el-table-column
+					align="center"
+					label="搴忓彿"
+					type="index"
+					width="60"
+					fixed="left"
+				/>
+				
+				<!-- 鍥哄畾鍒楋細濮撳悕 -->
+				<el-table-column
+					label="濮撳悕"
+					prop="staffName"
+					width="100"
+					show-overflow-tooltip
+					align="center"
+					fixed="left"
+				/>
+				
+				<!-- 鍥哄畾鍒楋細宸ュ彿 -->
+				<el-table-column
+					label="宸ュ彿"
+					prop="staffNo"
+					width="100"
+					show-overflow-tooltip
+					align="center"
+					fixed="left"
+				/>
+				
+				<!-- 鍔ㄦ�佸垪锛氭牴鎹瓧鍏告覆鏌� -->
+				<el-table-column
+					v-for="(dictItem, index) in sys_lavor_issue"
+					:key="dictItem.value"
+					:label="dictItem.label"
+					:prop="dictItem.value"
+					show-overflow-tooltip
+				>
+				</el-table-column>
+				
+				<!-- 鎿嶄綔鍒� -->
+				<el-table-column
+					label="鎿嶄綔"
+					width="150"
+					align="center"
+					fixed="right"
+				>
+					<template #default="scope">
+						<el-button
+							type="primary"
+							link
+							size="small"
+							@click="edit(scope.row)"
+						>
+							缂栬緫
+						</el-button>
+						<el-button
+							type="danger"
+							link
+							size="small"
+							:disabled="!!scope.row.adoptedDate"
+							@click="adopted(scope.row)"
+						>
+							棰嗙敤
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination :total="total" layout="total, sizes, prev, pager, next, jumper"
+									:page="page.current" :limit="page.size" @pagination="paginationChange" />
+		</div>
+		<!-- <Modal ref="modalRef" @success="handleQuery"></Modal> -->
+		<!-- <files-dia ref="filesDia"></files-dia> -->
+	</div>
+</template>
+
+<script setup>
+import { ref, onMounted, reactive, toRefs, nextTick, getCurrentInstance } from 'vue'
+import dayjs from "dayjs";
+// import Modal from "./Modal.vue";
+// import FilesDia from "./filesDia.vue";
+import Pagination from "@/components/Pagination/index.vue";
+import {listPage, deleteLedger, update} from "@/api/lavorissce/ledger.js";
+import {ElMessageBox, ElMessage} from "element-plus";
+const { proxy } = getCurrentInstance();
+import { getCurrentMonth } from "@/utils/util"
+
+const page = ref({
+	current: 1,
+	size: 100,
+})
+const total = ref(0)
+// 鍝嶅簲寮忔暟鎹�
+const tableRef = ref(null)
+const tableData = ref([])
+const tableLoading = ref(false)
+const { sys_lavor_issue } = proxy.useDict("sys_lavor_issue")
+const data = reactive({
+	searchForm: {
+		season: "",
+		staffName: "",
+	},
+});
+const { searchForm } = toRefs(data);
+
+const modalRef = ref();
+// const filesDia = ref();
+const multipleList = ref([]);
+const jidu = ref([
+	{
+		value: '1',
+		label: '绗竴瀛ｅ害'
+	},
+	{
+		value: '2',
+		label: '绗簩瀛ｅ害'
+	},
+	{
+		value: '3',
+		label: '绗笁瀛ｅ害'
+	},
+	{
+		value: '4',
+		label: '绗洓瀛ｅ害'
+	}
+])
+
+/** 鎼滅储鎸夐挳鎿嶄綔 */
+const handleQuery = () => {
+	page.value.current = 1;
+	getList();
+};
+// 鑾峰彇瀛楀吀鏁版嵁
+const getList = async () => {
+	tableLoading.value = true;
+	const params = { ...searchForm.value, ...page.value };
+	listPage(params).then(res => {
+		tableLoading.value = false;
+		tableData.value = res.data.records;
+		total.value = res.data.total;
+	}).catch(err => {
+		tableLoading.value = false;
+	})
+}
+const add = () => {
+	modalRef.value.openModal();
+};
+const edit = (row) => {
+	modalRef.value.loadForm(row);
+};
+const deleteRow = (id) => {
+	ElMessageBox.confirm("姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ暟鎹�, 鏄惁缁х画?", "鎻愮ず", {
+		confirmButtonText: "纭畾",
+		cancelButtonText: "鍙栨秷",
+		type: "warning",
+	}).then(async () => {
+		const { code } = await deleteLedger(id);
+		if (code == 200) {
+			ElMessage({
+				type: "success",
+				message: "鍒犻櫎鎴愬姛",
+			});
+			await getList();
+		}
+	});
+};
+const handleOut = () => {
+	ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+		confirmButtonText: "纭",
+		cancelButtonText: "鍙栨秷",
+		type: "warning",
+	})
+		.then(() => {
+			proxy.download(`/lavorIssue/exportCopy`, {season: searchForm.value.season}, "鍔充繚鍙拌处.xlsx");
+		})
+		.catch(() => {
+			ElMessage.info("宸插彇娑�");
+		});
+};
+const adopted = (row) => {
+	ElMessageBox.confirm("鏄惁纭棰嗙敤?", "鎻愮ず", {
+		confirmButtonText: "纭畾",
+		cancelButtonText: "鍙栨秷",
+		type: "warning",
+	}).then(async () => {
+		const params = {
+			id: row.id,
+			adoptedDate: dayjs().format("YYYY-MM-DD")
+		}
+		const { code } = await update(params);
+		if (code == 200) {
+			ElMessage({
+				type: "success",
+				message: "棰嗙敤鎴愬姛",
+			});
+			await getList();
+		}
+	})
+}
+// 鎵撳紑闄勪欢寮规
+// const openFilesFormDia = (row) => {
+// 	nextTick(() => {
+// 		filesDia.value?.openDialog( row,'鏀跺叆')
+// 	})
+// };
+// 浜嬩欢澶勭悊鍑芥暟
+const handleSelectionChange = (selection) => {
+	multipleList.value = selection;
+}
+
+const paginationChange = (pagination) => {
+	page.value.current = pagination.page;
+	page.value.size = pagination.limit;
+	getList();
+}
+
+// 缁勪欢鎸傝浇鏃跺姞杞藉瓧鍏告暟鎹�
+onMounted(() => {
+	handleQuery()
+})
+</script>
+
+<style scoped>
+.dynamic-table-container {
+	width: 100%;
+}
+
+.pagination-container {
+	margin-top: 20px;
+	display: flex;
+	justify-content: flex-end;
+}
+
+:deep(.el-table .el-table__header-wrapper th) {
+	background-color: #F0F1F5 !important;
+	color: #333333;
+	font-weight: 600;
+}
+
+:deep(.el-table .el-table__body-wrapper td) {
+	padding: 8px 0;
+}
+
+:deep(.el-select) {
+	width: 100%;
+}
+
+:deep(.el-input) {
+	width: 100%;
+}
+</style>
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDia.vue b/src/views/inventoryManagement/receiptManagement/components/formDia.vue
new file mode 100644
index 0000000..a736b52
--- /dev/null
+++ b/src/views/inventoryManagement/receiptManagement/components/formDia.vue
@@ -0,0 +1,401 @@
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="getDialogTitle()" width="70%"
+    @close="closeDia">
+    <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
+      <el-form-item label="閲囪喘璁㈠崟鍙�" prop="purchaseContractNumber">
+        <el-select
+          v-model="form.purchaseContractNumber"
+          placeholder="璇烽�夋嫨閲囪喘璁㈠崟鍙�"
+          clearable
+          filterable
+          :loading="loadingPurchaseOptions"
+          @change="handlePurchaseChange"
+          :disabled="operationType === 'edit'"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in purchaseOptions"
+            :key="item.purchaseContractNumber"
+            :label="formatPurchaseOption(item)"
+            :value="item.purchaseContractNumber"
+          />
+        </el-select>
+      </el-form-item>
+      <el-table
+        :data="productList"
+        border
+        v-loading="loadingProducts"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column align="center" type="selection" width="55" />
+        <el-table-column
+          align="center"
+          label="搴忓彿"
+          type="index"
+          width="60"
+        />
+        <el-table-column label="浜у搧澶х被" prop="productCategory" />
+        <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
+        <el-table-column label="鍗曚綅" prop="unit" width="70" />
+        <!-- <el-table-column label="渚涘簲鍟�" prop="supplierName" width="100" /> -->
+        <el-table-column label="閲囪喘鏁伴噺" prop="quantity" width="100" />
+        <el-table-column label="寰呭叆搴撴暟閲�" prop="quantity0" width="100" />
+        <el-table-column label="鏈鍏ュ簱鏁伴噺" prop="quantityStock" width="150">
+          <template #default="scope">
+            <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.quantityStock" @change="() => calculateTotalPrice(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="绋庣巼(%)" prop="taxRate" width="120" />
+        <el-table-column label="鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="150">
+					<template #default="scope">
+						<el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.taxInclusiveUnitPrice" @change="() => calculateTotalPrice(scope.row)" :disabled="operationType === 'edit'"/>
+					</template>
+				</el-table-column>
+        <el-table-column
+          label="鎬讳环(鍏�)"
+					:formatter="formattedNumber"
+          prop="taxInclusiveTotalPrice"
+          width="150"
+        >
+        </el-table-column>
+      </el-table>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭</el-button>
+        <el-button @click="closeDia">鍙栨秷</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive, toRefs, getCurrentInstance } from 'vue'
+import useUserStore from '@/store/modules/user'
+import {
+  updateStockIn,
+  addSutockIn,
+  selectProductRecordListByPuechaserId
+} from "@/api/inventoryManagement/stockIn.js";
+import { purchaseListPage } from "@/api/procurementManagement/procurementLedger.js";
+import { getCurrentDate } from "@/utils/index.js";
+
+const userStore = useUserStore()
+const { proxy } = getCurrentInstance()
+const emit = defineEmits(['close', 'success'])
+
+const operationType = ref('')// 鎿嶄綔绫诲瀷: 'add' 鎴� 'edit'
+const dialogFormVisible = ref(false)// 寮规鏄剧ず鐘舵��
+const productList = ref([]);// 浜у搧鍒楄〃鏁版嵁
+const loadingProducts = ref(false);// 浜у搧鍔犺浇鐘舵��
+const selectedRows = ref([]) // 浜у搧琛ㄦ牸閫変腑琛�
+const purchaseOptions = ref([])
+const loadingPurchaseOptions = ref(false)
+const loading = ref(false);
+
+const data = reactive({
+  form: {
+    id: null,
+    purchaseContractNumber: '', // 閲囪喘璁㈠崟鍙�
+    supplierId: null,       // 渚涘簲鍟咺D
+    supplierName: '',       // 渚涘簲鍟嗗悕绉�
+    inboundTime: '',        // 鍏ュ簱鏃堕棿
+    inboundBatch: '',       // 鍏ュ簱鎵规
+    recorderId: userStore.userId, // 褰曞叆浜篒D
+    recorderName: userStore.name, // 褰曞叆浜哄鍚�
+    entryDate: getCurrentDate(),  // 褰曞叆鏃ユ湡
+    remark: '',             // 澶囨敞
+  },
+  rules: {
+    purchaseContractNumber: [{ required: true, message: "璇疯緭鍏ラ噰璐悎鍚屽彿", trigger: "blur" }],
+    supplierId: [{ required: true, message: "璇烽�夋嫨渚涘簲鍟�", trigger: "change" }],
+    inboundTime: [{ required: true, message: "璇烽�夋嫨鍏ュ簱鏃堕棿", trigger: "change" }],
+    inboundBatch: [{ required: true, message: "璇疯緭鍏ュ叆搴撴壒娆�", trigger: "blur" }]
+  }
+})
+const { form, rules } = toRefs(data)
+
+// 鍔ㄦ�佽绠楀璇濇鏍囬
+const getDialogTitle = () => {
+  return operationType.value === 'add' ? '鏂板鍏ュ簱' : '缂栬緫鍏ュ簱'
+}
+
+const formatPurchaseOption = (item = {}) => {
+  const contract = item.purchaseContractNumber || '--';
+  const supplier = item.supplierName ? ` 路 ${item.supplierName}` : '';
+  return `${contract}${supplier}`;
+};
+
+const loadPurchaseOptions = async (keyword = '') => {
+  try {
+    loadingPurchaseOptions.value = true;
+    const res = await purchaseListPage({
+      current: -1,
+      size: -1,
+      purchaseContractNumber: keyword,
+    });
+    const records = res.data?.records || [];
+    purchaseOptions.value = records;
+    if (
+      form.value.purchaseContractNumber &&
+      !purchaseOptions.value.find(
+        (item) => item.purchaseContractNumber === form.value.purchaseContractNumber
+      )
+    ) {
+      purchaseOptions.value.push({
+        purchaseContractNumber: form.value.purchaseContractNumber,
+        supplierName: form.value.supplierName,
+        supplierId: form.value.supplierId,
+      });
+    }
+  } finally {
+    loadingPurchaseOptions.value = false;
+  }
+};
+
+const handlePurchaseChange = (value) => {
+  form.value.purchaseContractNumber = value || '';
+  const matched = purchaseOptions.value.find(
+    (item) => item.purchaseContractNumber === value
+  );
+  if (matched) {
+    form.value.supplierName = matched.supplierName || form.value.supplierName;
+    form.value.supplierId = matched.supplierId || form.value.supplierId;
+  }
+  if (!value) {
+    productList.value = [];
+    return;
+  }
+  fetchProductsByContract();
+};
+
+const exceedsAddLimit = (product) => {
+  const stock = Number(product?.quantityStock ?? 0);
+  const waiting = Number(product?.quantity0 ?? 0);
+  if (!Number.isFinite(stock) || !Number.isFinite(waiting)) {
+    return false;
+  }
+  return stock > waiting;
+};
+
+const exceedsEditLimit = (product) => {
+  const stock = Number(product?.quantityStock ?? 0);
+  const waiting = Number(product?.quantity0 ?? 0);
+  const original = Number(product?.originalQuantityStock ?? 0);
+  if (!Number.isFinite(stock) || !Number.isFinite(waiting) || !Number.isFinite(original)) {
+    return false;
+  }
+  return stock > waiting + original;
+};
+
+const formattedNumber = (row, column, cellValue) => {
+  return parseFloat(cellValue).toFixed(2);
+};
+
+// 璁＄畻鎬讳环
+const calculateTotalPrice = (row) => {
+  const quantityStock = Number(row?.quantityStock ?? 0);
+  const taxInclusiveUnitPrice = Number(row?.taxInclusiveUnitPrice ?? 0);
+  
+  if (Number.isFinite(quantityStock) && Number.isFinite(taxInclusiveUnitPrice)) {
+    row.taxInclusiveTotalPrice = quantityStock * taxInclusiveUnitPrice;
+  } else {
+    row.taxInclusiveTotalPrice = 0;
+  }
+};
+
+const fetchProductsByContract = async () => {
+  if (!form.value.purchaseContractNumber) {
+    proxy.$modal.msgWarning('璇烽�夋嫨鍚堝悓鍙�')
+    return
+  }
+  try {
+    loadingProducts.value = true
+    const productRes = await selectProductRecordListByPuechaserId({
+      purchaseContractNumber: form.value.purchaseContractNumber
+    });
+    if (!productRes.data || productRes.data.length === 0) {
+      proxy.$modal.msgWarning('璇ュ悎鍚屼笅娌℃湁浜у搧璁板綍')
+      productList.value = [];
+      return
+    }
+    productList.value = productRes.data.map(item => {
+      const quantityStock = Number(item?.quantity0 ?? 0);
+      const taxInclusiveUnitPrice = Number(item?.taxInclusiveUnitPrice ?? 0);
+      return {
+        ...item,
+        quantityStock,
+        taxInclusiveUnitPrice,
+        taxInclusiveTotalPrice: quantityStock * taxInclusiveUnitPrice,
+        originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
+      };
+    })
+  } catch (error) {
+    console.error('鏌ヨ浜у搧璁板綍澶辫触:', error)
+    proxy.$modal.msgError('鏌ヨ浜у搧璁板綍澶辫触')
+    productList.value = [];
+  } finally {
+    loadingProducts.value = false
+  }
+}
+
+const updatePro = async () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$modal.msgWarning('璇峰厛閫夋嫨浜у搧');
+    return;
+  }
+  const target = selectedRows.value[0];
+  const stock = Number(target?.quantityStock ?? 0);
+  if (!Number.isFinite(stock) || stock <= 0) {
+    proxy.$modal.msgWarning('璇峰～鍐欐湁鏁堢殑鍏ュ簱鏁伴噺');
+    return;
+  }
+  if (exceedsEditLimit(target)) {
+    proxy.$modal.msgError('鏈鍏ュ簱鏁伴噺涓嶈兘瓒呰繃鍘熷叆搴撴暟閲忎笌寰呭叆搴撴暟閲忎箣鍜�');
+    return;
+  }
+  const stockInData = {
+    id: selectedRows.value[0].recordId,
+    quantityStock: Number(selectedRows.value[0].quantityStock),
+  };
+  await updateStockIn(stockInData)
+  proxy.$modal.msgSuccess('淇敼鍏ュ簱鎴愬姛')
+  closeDia()
+  emit('success')
+}
+
+const submitForm = async () => {
+  if (selectedRows.value.length === 0) {
+    proxy.$modal.msgWarning('璇峰厛閫夋嫨閲囪喘鍚堝悓骞堕�夋嫨浜у搧')
+    return
+  }
+  if(operationType.value !== 'add'){
+    await updatePro()
+    return
+  }
+  try {
+    await proxy.$refs.formRef.validate()
+    const invalidProducts = selectedRows.value.filter((product) => {
+        const stock = Number(product?.quantityStock ?? 0);
+        if (!Number.isFinite(stock) || stock <= 0) {
+          return true;
+        }
+        return exceedsAddLimit(product);
+    })
+
+    if (invalidProducts.length > 0) {
+      proxy.$modal.msgError('鏈鍏ュ簱鏁伴噺闇�澶т簬0锛屼笖涓嶈兘瓒呰繃寰呭叆搴撴暟閲�')
+      return
+    }
+
+    const stockInData = {
+      ...form.value,
+      inboundTime: formatDateTime(form.value.inboundTime),
+      nickName: userStore.nickName,
+      details: selectedRows.value.map(product => ({
+        id: product.id,
+        inboundQuantity: Number(product.quantityStock),
+				taxInclusiveUnitPrice: Number(product.taxInclusiveUnitPrice),
+				taxInclusiveTotalPrice: Number(product.taxInclusiveTotalPrice)
+      })),
+    };
+    loading.value = true
+    await addSutockIn(stockInData)
+
+    proxy.$modal.msgSuccess('鏂板鍏ュ簱鎴愬姛')
+    closeDia()
+    emit('success')
+
+  } catch (error) {
+    console.error('鎻愪氦澶辫触:', error)
+    if (!error.errors) {
+      proxy.$modal.msgError('鎿嶄綔澶辫触锛岃閲嶈瘯')
+    }
+  } finally {
+    loading.value = false
+  }
+}
+
+const closeDia = () => {
+  proxy.$refs.formRef.resetFields()
+  dialogFormVisible.value = false
+  emit('close')
+}
+
+const handleSelectionChange = (selection) => {
+  selectedRows.value = selection.filter(item => item.id);
+}
+
+function formatDateTime(date = new Date(), includeTime = true) {
+  const d = new Date(date);
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+
+  if (!includeTime) {
+    return `${year}-${month}-${day}`;
+  }
+
+  const hours = String(d.getHours()).padStart(2, '0');
+  const minutes = String(d.getMinutes()).padStart(2, '0');
+  const seconds = String(d.getSeconds()).padStart(2, '0');
+
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
+
+const openDialog = async (type, row) => {
+  operationType.value = type
+  dialogFormVisible.value = true
+  selectedRows.value = []
+  await loadPurchaseOptions();
+
+  if (type === 'add') {
+    form.value = {
+      id: null,
+      purchaseContractNumber: '',
+      supplierId: null,
+      supplierName: '',
+      inboundTime: '',
+      inboundBatch: '',
+      recorderId: userStore.userId,
+      recorderName: userStore.name,
+      entryDate: getCurrentDate(),
+      remark: ''
+    }
+    productList.value = []
+  } else {
+    form.value = JSON.parse(JSON.stringify(row))
+    try {
+      loadingProducts.value = true
+      const res = await selectProductRecordListByPuechaserId({
+        purchaseContractNumber: form.value.purchaseContractNumber,
+        id: row.id
+      });
+      productList.value = res.data.map(item => ({
+        ...item,
+        quantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? row.inboundNum ?? 0),
+        taxInclusiveUnitPrice: Number(item?.taxInclusiveUnitPrice ?? 0),
+        taxInclusiveTotalPrice: Number(item?.quantityStock ?? 0) * Number(item?.taxInclusiveUnitPrice ?? 0),
+        originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? row.inboundNum ?? 0),
+      }))
+      selectedRows.value = productList.value
+    } catch (error) {
+      console.error('鍔犺浇浜у搧澶辫触:', error)
+      proxy.$modal.msgError('鍔犺浇浜у搧澶辫触')
+      productList.value = []
+    } finally {
+      loadingProducts.value = false
+    }
+  }
+}
+
+defineExpose({
+  openDialog,
+})
+</script>
+
+<style scoped lang="scss"></style>
+
+
+
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
new file mode 100644
index 0000000..f0f9d75
--- /dev/null
+++ b/src/views/inventoryManagement/receiptManagement/components/formDiaManual.vue
@@ -0,0 +1,310 @@
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鑷畾涔夊叆搴�' : '缂栬緫鑷畾涔夊叆搴�'" width="70%"
+    @close="closeDia">
+    <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
+      <div style="margin-bottom: 10px;" v-if="operationType === 'add'">
+        <el-button type="primary" @click="addProductRow">鏂板</el-button>
+      </div>
+      <el-table
+        :data="productList"
+        border
+        v-loading="loadingProducts"
+      >
+        <el-table-column
+          align="center"
+          label="搴忓彿"
+          type="index"
+          width="60"
+        />
+        <el-table-column label="浜у搧澶х被" prop="productCategory" width="200">
+          <template #default="scope">
+            <el-input v-model="scope.row.productCategory" placeholder="璇疯緭鍏ヤ骇鍝佸ぇ绫�" />
+          </template>
+        </el-table-column>
+        <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200">
+          <template #default="scope">
+            <el-input v-model="scope.row.specificationModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+          </template>
+        </el-table-column>
+        <el-table-column label="鍗曚綅" prop="unit" width="100">
+          <template #default="scope">
+            <el-input v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�" />
+          </template>
+        </el-table-column>
+        <el-table-column label="渚涘簲鍟�" prop="supplierName" width="200">
+          <template #default="scope">
+            <el-input v-model="scope.row.supplierName" placeholder="璇疯緭鍏ヤ緵搴斿晢" />
+          </template>
+        </el-table-column>
+        <el-table-column label="鐗╁搧绫诲瀷" prop="itemType" width="150">
+          <template #default="scope">
+            <el-input v-model="scope.row.itemType" placeholder="璇疯緭鍏ョ墿鍝佺被鍨�" />
+          </template>
+        </el-table-column>
+        <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="150">
+          <template #default="scope">
+            <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.inboundNum" @change="() => calculateTotalPrice(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="鍏ュ簱鏃ユ湡" prop="inboundDate" width="180">
+          <template #default="scope">
+            <el-date-picker
+              v-model="scope.row.inboundDate"
+              type="date"
+              placeholder="璇烽�夋嫨鍏ュ簱鏃ユ湡"
+              value-format="YYYY-MM-DD"
+              format="YYYY-MM-DD"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="150">
+          <template #default="scope">
+            <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.taxInclusiveUnitPrice" @change="() => calculateTotalPrice(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column
+           label="鎬讳环(鍏�)"
+           prop="taxInclusiveTotalPrice"
+           width="150"
+         >
+        </el-table-column>
+        <el-table-column label="鎿嶄綔" width="80" v-if="operationType === 'add'">
+          <template #default="scope">
+            <el-button type="danger" size="small" @click="removeProductRow(scope.$index)">鍒犻櫎</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭</el-button>
+        <el-button @click="closeDia">鍙栨秷</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive, toRefs, getCurrentInstance } from 'vue'
+import useUserStore from '@/store/modules/user'
+import {
+  addStockInCustom,
+  updateStockInCustom,
+} from "@/api/inventoryManagement/stockIn.js";
+import { getCurrentDate } from "@/utils/index.js";
+
+const userStore = useUserStore()
+const { proxy } = getCurrentInstance()
+const emit = defineEmits(['close', 'success'])
+
+const operationType = ref('')// 鎿嶄綔绫诲瀷: 'add' 鎴� 'edit'
+const dialogFormVisible = ref(false)// 寮规鏄剧ず鐘舵��
+const productList = ref([]);// 浜у搧鍒楄〃鏁版嵁
+const loadingProducts = ref(false);// 浜у搧鍔犺浇鐘舵��
+const loading = ref(false);
+
+function formatDateTime(date = new Date(), includeTime = true) {
+  const d = new Date(date);
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+
+  if (!includeTime) {
+    return `${year}-${month}-${day}`;
+  }
+
+  const hours = String(d.getHours()).padStart(2, '0');
+  const minutes = String(d.getMinutes()).padStart(2, '0');
+  const seconds = String(d.getSeconds()).padStart(2, '0');
+
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
+
+const taxRateOptions = [
+  { label: '1', value: 1 },
+  { label: '6', value: 6 },
+  { label: '13', value: 13 },
+]
+
+const data = reactive({
+  form: {
+    id: null,
+    supplierId: null,       // 渚涘簲鍟咺D
+    supplierName: '',       // 渚涘簲鍟嗗悕绉�
+    recorderId: userStore.userId, // 褰曞叆浜篒D
+    recorderName: userStore.name, // 褰曞叆浜哄鍚�
+    entryDate: getCurrentDate(),  // 褰曞叆鏃ユ湡
+    remark: '',             // 澶囨敞
+  },
+  rules: {
+    supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }]
+  }
+})
+const { form, rules } = toRefs(data)
+
+// 鏂板浜у搧琛�
+const addProductRow = () => {
+  productList.value.push({
+    id: null,
+    productCategory: '',
+    specificationModel: '',
+    unit: '',
+    supplierName: form.value.supplierName || '',
+    itemType: '',
+    inboundNum: 0,
+    inboundDate: getCurrentDate(), // 榛樿褰撳ぉ鏃ユ湡
+    // quantityStock: 0,
+    taxInclusiveUnitPrice: 0,
+    taxInclusiveTotalPrice: 0,
+    taxRate: null,
+    taxExclusiveTotalPrice: 0,
+  });
+};
+
+// 鍒犻櫎浜у搧琛�
+const removeProductRow = (index) => {
+  productList.value.splice(index, 1);
+};
+
+// 璁＄畻鎬讳环锛堟牴鎹暟閲忋�佸崟浠峰拰鍚◣鍗曚环锛�
+const calculateTotalPrice = (row) => {
+  // 璁＄畻鏅�氭�讳环锛歩nboundNum * taxInclusiveUnitPrice
+  const quantity = Number(row.inboundNum || 0);
+  const taxInclusiveUnitPrice = Number(row.taxInclusiveUnitPrice || 0);
+  row.taxInclusiveTotalPrice = quantity * taxInclusiveUnitPrice;
+  calculateExclusivePrice(row);
+};
+
+// 璁＄畻涓嶅惈绋庢�讳环锛堟牴鎹惈绋庢�讳环鍜岀◣鐜囷級
+const calculateExclusivePrice = (row) => {
+  const taxInclusiveTotalPrice = Number(row.taxInclusiveTotalPrice || 0);
+  const taxRate = Number(row.taxRate || 0);
+  row.taxExclusiveTotalPrice = taxInclusiveTotalPrice / (1 + taxRate / 100);
+};
+
+const submitForm = async () => {
+  try {
+    await proxy.$refs.formRef.validate()
+    
+    if (!productList.value.length) {
+      proxy.$modal.msgError('璇疯嚦灏戞坊鍔犱竴鏉′骇鍝佹暟鎹�')
+      return
+    }
+
+    // 楠岃瘉鑷畾涔夋坊鍔犵殑鏁版嵁蹇呭～瀛楁
+    for (let i = 0; i < productList.value.length; i++) {
+      const product = productList.value[i];
+      if (!product.productCategory || !product.specificationModel || !product.unit) {
+        proxy.$modal.msgError(`绗�${i + 1}琛屼骇鍝佹暟鎹湭濉啓瀹屾暣锛堜骇鍝佸ぇ绫汇�佽鏍煎瀷鍙枫�佸崟浣嶄负蹇呭～锛塦)
+        return
+      }
+      if (!product.itemType) {
+        proxy.$modal.msgError(`绗�${i + 1}琛岃閫夋嫨鐗╁搧绫诲瀷`)
+        return
+      }
+      if (!product.inboundDate) {
+        proxy.$modal.msgError(`绗�${i + 1}琛岃閫夋嫨鍏ュ簱鏃ユ湡`)
+        return
+      }
+      const stock = Number(product?.inboundNum ?? 0);
+      if (!Number.isFinite(stock) || stock <= 0) {
+        proxy.$modal.msgError(`绗�${i + 1}琛屾湰娆″叆搴撴暟閲忛渶澶т簬0`)
+        return
+      }
+    }
+
+    const payloadList = productList.value.map(product => ({
+      id: product.id ?? null,
+			inboundNum: Number(product.inboundNum),
+      productCategory: product.productCategory,
+      specificationModel: product.specificationModel,
+      unit: product.unit,
+      supplierName: product.supplierName || form.value.supplierName,
+      itemType: product.itemType,
+      inboundDate: formatDateTime(product.inboundDate, false),
+      taxRate: Number(product.taxRate || 0),
+      taxExclusiveTotalPrice: Number(product.taxExclusiveTotalPrice || 0),
+			taxInclusiveUnitPrice: Number(product.taxInclusiveUnitPrice || 0),
+			taxInclusiveTotalPrice: Number(product.taxInclusiveTotalPrice || 0),
+    }));
+    loading.value = true
+    if (operationType.value === 'edit') {
+      const editPayload = payloadList[0]
+      await updateStockInCustom(editPayload)
+    } else {
+      await addStockInCustom(payloadList)
+    }
+
+    proxy.$modal.msgSuccess(operationType.value === 'edit' ? '缂栬緫鑷畾涔夊叆搴撴垚鍔�' : '鏂板鑷畾涔夊叆搴撴垚鍔�')
+    closeDia()
+    emit('success')
+
+  } catch (error) {
+    console.error('鎻愪氦澶辫触:', error)
+    if (!error.errors) {
+      proxy.$modal.msgError('鎿嶄綔澶辫触锛岃閲嶈瘯')
+    }
+  } finally {
+    loading.value = false
+  }
+}
+
+const closeDia = () => {
+  proxy.$refs.formRef.resetFields()
+  dialogFormVisible.value = false
+  productList.value = []
+  emit('close')
+}
+
+const openDialog = async (type, row) => {
+  operationType.value = type
+  dialogFormVisible.value = true
+
+  if (type === 'add') {
+    form.value = {
+      id: null,
+      supplierId: null,
+      supplierName: '',
+      recorderId: userStore.userId,
+      recorderName: userStore.name,
+      entryDate: getCurrentDate(),
+      remark: ''
+    }
+    productList.value = []
+  } else {
+    // 缂栬緫妯″紡锛氬皢琛屾暟鎹～鍏呭埌琛ㄦ牸涓互鏀寔淇敼
+    form.value = {
+      id: row?.id ?? null,
+      supplierId: row?.supplierId ?? null,
+      supplierName: row?.supplierName ?? '',
+      recorderId: userStore.userId,
+      recorderName: userStore.name,
+      entryDate: getCurrentDate(),
+      remark: row?.remark ?? ''
+    }
+    productList.value = [{
+      id: row?.id ?? null,
+      productCategory: row?.productCategory ?? '',
+      specificationModel: row?.specificationModel ?? '',
+      unit: row?.unit ?? '',
+      supplierName: row?.supplierName ?? '',
+      itemType: row?.itemType ?? '',
+      inboundNum: Number(row?.inboundNum ?? row?.inboundQuantity ?? 0),
+      inboundDate: row?.inboundDate ?? row?.createTime ?? '',
+      taxRate: Number(row?.taxRate ?? 0),
+      taxInclusiveUnitPrice: Number(row?.taxInclusiveUnitPrice ?? 0),
+      taxInclusiveTotalPrice: Number(row?.taxInclusiveTotalPrice ?? 0),
+      taxExclusiveTotalPrice: Number(row?.taxExclusiveTotalPrice ?? 0),
+    }]
+  }
+}
+
+defineExpose({
+  openDialog,
+})
+</script>
+
+<style scoped lang="scss"></style>
+
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue b/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue
new file mode 100644
index 0000000..8ac355d
--- /dev/null
+++ b/src/views/inventoryManagement/receiptManagement/components/formDiaProduct.vue
@@ -0,0 +1,300 @@
+<template>
+  <el-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板鑷畾涔夊叆搴�' : '缂栬緫鑷畾涔夊叆搴�'" width="70%"
+    @close="closeDia">
+    <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
+      <div style="margin-bottom: 10px;" v-if="operationType === 'add'">
+        <el-button type="primary" @click="addProductRow">鏂板</el-button>
+      </div>
+      <el-table
+        :data="productList"
+        border
+        v-loading="loadingProducts"
+      >
+        <el-table-column
+          align="center"
+          label="搴忓彿"
+          type="index"
+          width="60"
+        />
+        <el-table-column label="浜у搧澶х被" prop="productCategory" width="200">
+          <template #default="scope">
+            <el-input v-model="scope.row.productCategory" placeholder="璇疯緭鍏ヤ骇鍝佸ぇ绫�" />
+          </template>
+        </el-table-column>
+        <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200">
+          <template #default="scope">
+            <el-input v-model="scope.row.specificationModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
+          </template>
+        </el-table-column>
+        <el-table-column label="鍗曚綅" prop="unit" width="100">
+          <template #default="scope">
+            <el-input v-model="scope.row.unit" placeholder="璇疯緭鍏ュ崟浣�" />
+          </template>
+        </el-table-column>
+        <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="150">
+          <template #default="scope">
+            <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.inboundNum" @change="() => calculateTotalPrice(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column label="鍏ュ簱鏃ユ湡" prop="inboundDate" width="180">
+          <template #default="scope">
+            <el-date-picker
+              v-model="scope.row.inboundDate"
+              type="date"
+              placeholder="璇烽�夋嫨鍏ュ簱鏃ユ湡"
+              value-format="YYYY-MM-DD"
+              format="YYYY-MM-DD"
+              style="width: 100%"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="鍗曚环(鍏�)" prop="unitPrice" width="150">
+          <template #default="scope">
+            <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.unitPrice" @change="() => calculateTotalPrice(scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column 
+           label="鎬讳环(鍏�)" 
+           prop="totalPrice" 
+           width="150" 
+         >
+        </el-table-column>
+        <el-table-column label="鎿嶄綔" width="80" v-if="operationType === 'add'">
+          <template #default="scope">
+            <el-button type="danger" size="small" @click="removeProductRow(scope.$index)">鍒犻櫎</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭</el-button>
+        <el-button @click="closeDia">鍙栨秷</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive, toRefs, getCurrentInstance } from 'vue'
+import useUserStore from '@/store/modules/user'
+import {
+	addStockInCustom, updateProduct
+} from "@/api/inventoryManagement/stockIn.js";
+import { getCurrentDate } from "@/utils/index.js";
+
+const userStore = useUserStore()
+const { proxy } = getCurrentInstance()
+const emit = defineEmits(['close', 'success'])
+
+const operationType = ref('')// 鎿嶄綔绫诲瀷: 'add' 鎴� 'edit'
+const dialogFormVisible = ref(false)// 寮规鏄剧ず鐘舵��
+const productList = ref([]);// 浜у搧鍒楄〃鏁版嵁
+const loadingProducts = ref(false);// 浜у搧鍔犺浇鐘舵��
+const loading = ref(false);
+
+function formatDateTime(date = new Date(), includeTime = true) {
+  const d = new Date(date);
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+
+  if (!includeTime) {
+    return `${year}-${month}-${day}`;
+  }
+
+  const hours = String(d.getHours()).padStart(2, '0');
+  const minutes = String(d.getMinutes()).padStart(2, '0');
+  const seconds = String(d.getSeconds()).padStart(2, '0');
+
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+
+
+const itemTypeOptions = [
+  { label: '鐗╂枡', value: '鐗╂枡' },
+  { label: '鍘熸枡', value: '鍘熸枡' },
+  { label: '鎴愬搧', value: '鎴愬搧' },
+  { label: '鍏朵粬', value: '鍏朵粬' },
+]
+
+const taxRateOptions = [
+  { label: '1', value: 1 },
+  { label: '6', value: 6 },
+  { label: '13', value: 13 },
+]
+
+const data = reactive({
+  form: {
+    id: null,
+    supplierId: null,       // 渚涘簲鍟咺D
+    supplierName: '',       // 渚涘簲鍟嗗悕绉�
+    recorderId: userStore.userId, // 褰曞叆浜篒D
+    recorderName: userStore.name, // 褰曞叆浜哄鍚�
+    entryDate: getCurrentDate(),  // 褰曞叆鏃ユ湡
+    remark: '',             // 澶囨敞
+  },
+  rules: {
+    supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }]
+  }
+})
+const { form, rules } = toRefs(data)
+
+// 鏂板浜у搧琛�
+const addProductRow = () => {
+  productList.value.push({
+    id: null,
+    productCategory: '',
+    specificationModel: '',
+    unit: '',
+    supplierName: form.value.supplierName || '',
+    itemType: '',
+    inboundNum: 0,
+    inboundDate: '',
+    quantityStock: 0,
+    unitPrice: 0,
+    totalPrice: 0,
+    taxRate: null,
+    taxExclusiveTotalPrice: 0,
+  });
+};
+
+// 鍒犻櫎浜у搧琛�
+const removeProductRow = (index) => {
+  productList.value.splice(index, 1);
+};
+
+// 璁＄畻鎬讳环锛堟牴鎹暟閲忋�佸崟浠峰拰鍚◣鍗曚环锛�
+const calculateTotalPrice = (row) => {
+  // 璁＄畻鏅�氭�讳环锛歩nboundNum * unitPrice
+  const quantity = Number(row.inboundNum || 0);
+  const unitPrice = Number(row.unitPrice || 0);
+  row.totalPrice = quantity * unitPrice;
+  calculateExclusivePrice(row);
+};
+
+// 璁＄畻涓嶅惈绋庢�讳环锛堟牴鎹惈绋庢�讳环鍜岀◣鐜囷級
+const calculateExclusivePrice = (row) => {
+  const totalPrice = Number(row.totalPrice || 0);
+  const taxRate = Number(row.taxRate || 0);
+  row.taxExclusiveTotalPrice = totalPrice / (1 + taxRate / 100);
+};
+
+const submitForm = async () => {
+  try {
+    await proxy.$refs.formRef.validate()
+    
+    if (!productList.value.length) {
+      proxy.$modal.msgError('璇疯嚦灏戞坊鍔犱竴鏉′骇鍝佹暟鎹�')
+      return
+    }
+
+    // 楠岃瘉鑷畾涔夋坊鍔犵殑鏁版嵁蹇呭～瀛楁
+    for (let i = 0; i < productList.value.length; i++) {
+      const product = productList.value[i];
+      if (!product.productCategory || !product.specificationModel || !product.unit) {
+        proxy.$modal.msgError(`绗�${i + 1}琛屼骇鍝佹暟鎹湭濉啓瀹屾暣锛堜骇鍝佸ぇ绫汇�佽鏍煎瀷鍙枫�佸崟浣嶄负蹇呭～锛塦)
+        return
+      }
+      if (!product.inboundDate) {
+        proxy.$modal.msgError(`绗�${i + 1}琛岃閫夋嫨鍏ュ簱鏃ユ湡`)
+        return
+      }
+      const stock = Number(product?.inboundNum ?? 0);
+      if (!Number.isFinite(stock) || stock <= 0) {
+        proxy.$modal.msgError(`绗�${i + 1}琛屾湰娆″叆搴撴暟閲忛渶澶т簬0`)
+        return
+      }
+    }
+
+    const payloadList = productList.value.map(product => ({
+      id: product.id ?? null,
+			inboundNum: Number(product.inboundNum),
+      productCategory: product.productCategory,
+      specificationModel: product.specificationModel,
+      unit: product.unit,
+      supplierName: product.supplierName || form.value.supplierName,
+      itemType: product.itemType,
+      inboundDate: formatDateTime(product.inboundDate, false),
+      taxRate: Number(product.taxRate || 0),
+      taxExclusiveTotalPrice: Number(product.taxExclusiveTotalPrice || 0),
+			unitPrice: Number(product.unitPrice || 0),
+    }));
+    loading.value = true
+    if (operationType.value === 'edit') {
+      const editPayload = payloadList[0]
+      await updateProduct(editPayload)
+    } else {
+      await addStockInCustom(payloadList)
+    }
+
+    proxy.$modal.msgSuccess(operationType.value === 'edit' ? '缂栬緫鑷畾涔夊叆搴撴垚鍔�' : '鏂板鑷畾涔夊叆搴撴垚鍔�')
+    closeDia()
+    emit('success')
+
+  } catch (error) {
+    console.error('鎻愪氦澶辫触:', error)
+    if (!error.errors) {
+      proxy.$modal.msgError('鎿嶄綔澶辫触锛岃閲嶈瘯')
+    }
+  } finally {
+    loading.value = false
+  }
+}
+
+const closeDia = () => {
+  proxy.$refs.formRef.resetFields()
+  dialogFormVisible.value = false
+  productList.value = []
+  emit('close')
+}
+
+const openDialog = async (type, row) => {
+  operationType.value = type
+  dialogFormVisible.value = true
+
+  if (type === 'add') {
+    form.value = {
+      id: null,
+      supplierId: null,
+      supplierName: '',
+      recorderId: userStore.userId,
+      recorderName: userStore.name,
+      entryDate: getCurrentDate(),
+      remark: ''
+    }
+    productList.value = []
+  } else {
+    // 缂栬緫妯″紡锛氬皢琛屾暟鎹～鍏呭埌琛ㄦ牸涓互鏀寔淇敼
+    form.value = {
+      id: row?.id ?? null,
+      supplierId: row?.supplierId ?? null,
+      supplierName: row?.supplierName ?? '',
+      recorderId: userStore.userId,
+      recorderName: userStore.name,
+      entryDate: getCurrentDate(),
+      remark: row?.remark ?? ''
+    }
+    productList.value = [{
+      id: row?.id ?? null,
+      productCategory: row?.productCategory ?? '',
+      specificationModel: row?.specificationModel ?? '',
+      unit: row?.unit ?? '',
+      supplierName: row?.supplierName ?? '',
+      itemType: row?.itemType ?? '',
+      inboundNum: Number(row?.inboundNum ?? row?.inboundQuantity ?? 0),
+      inboundDate: row?.inboundDate ?? row?.createTime ?? '',
+      taxRate: Number(row?.taxRate ?? 0),
+      unitPrice: Number(row?.unitPrice ?? 0),
+      taxExclusiveTotalPrice: Number(row?.taxExclusiveTotalPrice ?? 0),
+    }]
+  }
+}
+
+defineExpose({
+  openDialog,
+})
+</script>
+
+<style scoped lang="scss"></style>
+
diff --git a/src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue b/src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue
new file mode 100644
index 0000000..d66b0e6
--- /dev/null
+++ b/src/views/inventoryManagement/stockManagement/components/FormDiaManual.vue
@@ -0,0 +1,154 @@
+<template>
+  <el-dialog :model-value="dialogFormVisible" :title="operationType === 'add' ? '鏂板鏉愭枡搴撳瓨' : '缂栬緫鏉愭枡搴撳瓨'" width="70%"
+    @update:model-value="$emit('update:dialogFormVisible', $event)" @close="closeDia">
+    <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="浜у搧澶х被锛�" prop="productCategory">
+            <el-input disabled v-model="form.productCategory" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="specificationModel">
+            <el-input disabled v-model="form.specificationModel" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="鍗曚綅锛�" prop="unit">
+            <el-input disabled v-model="form.unit" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="鐗╁搧绫诲瀷锛�" prop="itemType">
+            <el-input disabled v-model="form.itemType" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="鍏ュ簱鏃堕棿锛�" prop="createTime">
+            <el-date-picker style="width: 100%" v-model="form.createTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+                            type="date" placeholder="璇烽�夋嫨" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="搴撳瓨鏁伴噺锛�" prop="inboundNum">
+            <el-input v-model="form.inboundNum" placeholder="璇疯緭鍏�" clearable @input="calculateTotalPrice" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="宸插嚭搴撴暟閲忥細" prop="totalInboundNum">
+            <el-input disabled v-model="form.totalInboundNum" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="寰呭嚭搴撴暟閲忥細" prop="inboundNum0">
+            <el-input disabled v-model="form.inboundNum0" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="鍗曚环(鍏�)锛�" prop="taxInclusiveUnitPrice">
+            <el-input v-model="form.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable @input="calculateTotalPrice" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="鎬讳环(鍏�)锛�" prop="taxInclusiveTotalPrice">
+            <el-input disabled v-model="form.taxInclusiveTotalPrice" placeholder="鑷姩璁＄畻" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭</el-button>
+        <el-button @click="closeDia">鍙栨秷</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive, toRefs, watch } from 'vue'
+
+const props = defineProps({
+  dialogFormVisible: Boolean,
+  operationType: String,
+  formData: Object
+})
+
+const emit = defineEmits(['update:dialogFormVisible', 'submit', 'close'])
+
+const formRef = ref()
+
+const data = reactive({
+  form: {
+    productCategory: '',
+    specificationModel: '',
+    unit: '',
+    itemType: '',
+    createTime: '',
+    inboundNum: '',
+    totalInboundNum: '',
+    inboundNum0: '',
+    taxInclusiveUnitPrice: '',
+    taxInclusiveTotalPrice: ''
+  },
+  rules: {
+    productCategory: [{ required: true, message: '璇疯緭鍏ヤ骇鍝佸ぇ绫�', trigger: 'blur' }],
+    specificationModel: [{ required: true, message: '璇疯緭鍏ヨ鏍煎瀷鍙�', trigger: 'blur' }],
+    unit: [{ required: true, message: '璇疯緭鍏ュ崟浣�', trigger: 'blur' }],
+    itemType: [{ required: true, message: '璇疯緭鍏ョ墿鍝佺被鍨�', trigger: 'blur' }],
+    createTime: [{ required: true, message: '璇烽�夋嫨鍏ュ簱鏃堕棿', trigger: 'change' }],
+    inboundNum: [{ required: true, message: '璇疯緭鍏ュ簱瀛樻暟閲�', trigger: 'blur' }],
+    taxInclusiveUnitPrice: [{ required: true, message: '璇疯緭鍏ュ崟浠�', trigger: 'blur' }]
+  }
+})
+
+const { form, rules } = toRefs(data)
+
+// 璁＄畻鎬讳环锛氭�讳环 = 鍗曚环 脳 鍓╀綑搴撳瓨
+const calculateTotalPrice = () => {
+  const unitPrice = parseFloat(form.value.taxInclusiveUnitPrice) || 0
+  const stockQuantity = parseFloat(form.value.inboundNum) || 0 // 搴撳瓨鏁伴噺
+  const outboundQuantity = parseFloat(form.value.totalInboundNum) || 0 // 宸插嚭搴撴暟閲�
+  const remainingStock = stockQuantity - outboundQuantity // 鍓╀綑搴撳瓨
+  form.value.taxInclusiveTotalPrice = (unitPrice * remainingStock).toFixed(2)
+}
+
+// 鐩戝惉formData鍙樺寲
+watch(() => props.formData, (newVal) => {
+  if (newVal) {
+    form.value = { ...newVal }
+    // 鏁版嵁鍙樺寲鍚庨噸鏂拌绠楁�讳环
+    calculateTotalPrice()
+  }
+}, { immediate: true })
+
+// 鎻愪氦琛ㄥ崟
+const submitForm = () => {
+  formRef.value.validate(valid => {
+    if (valid) {
+      emit('submit', form.value)
+    }
+  })
+}
+
+// 鍏抽棴寮规
+const closeDia = () => {
+  emit('close')
+  emit('update:dialogFormVisible', false)
+}
+
+</script>
+
+<style scoped lang="scss">
+.dialog-footer {
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/inventoryManagement/stockManagement/components/FormDiaProduction.vue b/src/views/inventoryManagement/stockManagement/components/FormDiaProduction.vue
new file mode 100644
index 0000000..1653307
--- /dev/null
+++ b/src/views/inventoryManagement/stockManagement/components/FormDiaProduction.vue
@@ -0,0 +1,147 @@
+<template>
+  <el-dialog :model-value="dialogFormVisible" :title="operationType === 'add' ? '鏂板鎴愬搧搴撳瓨' : '缂栬緫鎴愬搧搴撳瓨'" width="70%"
+    @update:model-value="$emit('update:dialogFormVisible', $event)" @close="closeDia">
+    <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="浜у搧澶х被锛�" prop="productCategory">
+            <el-input disabled v-model="form.productCategory" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="specificationModel">
+            <el-input disabled v-model="form.specificationModel" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="鍗曚綅锛�" prop="unit">
+            <el-input disabled v-model="form.unit" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="鍏ュ簱鏃堕棿锛�" prop="createTime">
+            <el-date-picker style="width: 100%" v-model="form.createTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+                            type="date" placeholder="璇烽�夋嫨" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="搴撳瓨鏁伴噺锛�" prop="inboundNum">
+            <el-input v-model="form.inboundNum" placeholder="璇疯緭鍏�" clearable @input="calculateTotalPrice" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="宸插嚭搴撴暟閲忥細" prop="totalInboundNum">
+            <el-input disabled v-model="form.totalInboundNum" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="寰呭嚭搴撴暟閲忥細" prop="inboundNum0">
+            <el-input disabled v-model="form.inboundNum0" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="鍗曚环(鍏�)锛�" prop="unitPrice">
+            <el-input v-model="form.unitPrice" placeholder="璇疯緭鍏�" clearable @input="calculateTotalPrice" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="鎬讳环(鍏�)锛�" prop="totalPrice">
+            <el-input disabled v-model="form.totalPrice" placeholder="鑷姩璁＄畻" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭</el-button>
+        <el-button @click="closeDia">鍙栨秷</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive, toRefs, watch } from 'vue'
+
+const props = defineProps({
+  dialogFormVisible: Boolean,
+  operationType: String,
+  formData: Object
+})
+
+const emit = defineEmits(['update:dialogFormVisible', 'submit', 'close'])
+
+const formRef = ref()
+
+const data = reactive({
+  form: {
+    productCategory: '',
+    specificationModel: '',
+    unit: '',
+    createTime: '',
+    inboundNum: '',
+    totalInboundNum: '',
+    inboundNum0: '',
+    unitPrice: '',
+    totalPrice: ''
+  },
+  rules: {
+    productCategory: [{ required: true, message: '璇疯緭鍏ヤ骇鍝佸ぇ绫�', trigger: 'blur' }],
+    specificationModel: [{ required: true, message: '璇疯緭鍏ヨ鏍煎瀷鍙�', trigger: 'blur' }],
+    unit: [{ required: true, message: '璇疯緭鍏ュ崟浣�', trigger: 'blur' }],
+    createTime: [{ required: true, message: '璇烽�夋嫨鍏ュ簱鏃堕棿', trigger: 'change' }],
+    inboundNum: [{ required: true, message: '璇疯緭鍏ュ簱瀛樻暟閲�', trigger: 'blur' }],
+    unitPrice: [{ required: true, message: '璇疯緭鍏ュ崟浠�', trigger: 'blur' }]
+  }
+})
+
+const { form, rules } = toRefs(data)
+
+// 璁＄畻鎬讳环锛氭�讳环 = 鍗曚环 脳 鍓╀綑搴撳瓨
+const calculateTotalPrice = () => {
+  const unitPrice = parseFloat(form.value.unitPrice) || 0
+  const stockQuantity = parseFloat(form.value.inboundNum) || 0 // 搴撳瓨鏁伴噺
+  const outboundQuantity = parseFloat(form.value.totalInboundNum) || 0 // 宸插嚭搴撴暟閲�
+  const remainingStock = stockQuantity - outboundQuantity // 鍓╀綑搴撳瓨
+  form.value.totalPrice = (unitPrice * remainingStock).toFixed(2)
+}
+
+// 鐩戝惉formData鍙樺寲
+watch(() => props.formData, (newVal) => {
+  if (newVal) {
+    form.value = { ...newVal }
+    // 鏁版嵁鍙樺寲鍚庨噸鏂拌绠楁�讳环
+    calculateTotalPrice()
+  }
+}, { immediate: true })
+
+// 鎻愪氦琛ㄥ崟
+const submitForm = () => {
+  formRef.value.validate(valid => {
+    if (valid) {
+      emit('submit', form.value)
+    }
+  })
+}
+
+// 鍏抽棴寮规
+const closeDia = () => {
+  emit('close')
+  emit('update:dialogFormVisible', false)
+}
+
+</script>
+
+<style scoped lang="scss">
+.dialog-footer {
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/inventoryManagement/stockManagement/components/FormDiaPurchase.vue b/src/views/inventoryManagement/stockManagement/components/FormDiaPurchase.vue
new file mode 100644
index 0000000..5da2eee
--- /dev/null
+++ b/src/views/inventoryManagement/stockManagement/components/FormDiaPurchase.vue
@@ -0,0 +1,147 @@
+<template>
+  <el-dialog :model-value="dialogFormVisible" :title="operationType === 'add' ? '鏂板鍘熸枡搴撳瓨' : '缂栬緫鍘熸枡搴撳瓨'" width="70%"
+    @update:model-value="$emit('update:dialogFormVisible', $event)" @close="closeDia">
+    <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="浜у搧澶х被锛�" prop="productCategory">
+            <el-input disabled v-model="form.productCategory" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="specificationModel">
+            <el-input disabled v-model="form.specificationModel" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="鍗曚綅锛�" prop="unit">
+            <el-input disabled v-model="form.unit" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="鍏ュ簱鏃堕棿锛�" prop="createTime">
+            <el-date-picker style="width: 100%" v-model="form.createTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
+                            type="date" placeholder="璇烽�夋嫨" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="搴撳瓨鏁伴噺锛�" prop="inboundNum">
+            <el-input v-model="form.inboundNum" placeholder="璇疯緭鍏�" clearable @input="calculateTotalPrice" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="宸插嚭搴撴暟閲忥細" prop="totalInboundNum">
+            <el-input disabled v-model="form.totalInboundNum" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="寰呭嚭搴撴暟閲忥細" prop="inboundNum0">
+            <el-input disabled v-model="form.inboundNum0" placeholder="璇疯緭鍏�" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="鍚◣鍗曚环(鍏�)锛�" prop="taxInclusiveUnitPrice">
+            <el-input v-model="form.taxInclusiveUnitPrice" placeholder="璇疯緭鍏�" clearable @input="calculateTotalPrice" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="12">
+          <el-form-item label="鍚◣鎬讳环(鍏�)锛�" prop="taxInclusiveTotalPrice">
+            <el-input disabled v-model="form.taxInclusiveTotalPrice" placeholder="鑷姩璁＄畻" clearable />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submitForm">纭</el-button>
+        <el-button @click="closeDia">鍙栨秷</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import { ref, reactive, toRefs, watch } from 'vue'
+
+const props = defineProps({
+  dialogFormVisible: Boolean,
+  operationType: String,
+  formData: Object
+})
+
+const emit = defineEmits(['update:dialogFormVisible', 'submit', 'close'])
+
+const formRef = ref()
+
+const data = reactive({
+  form: {
+    productCategory: '',
+    specificationModel: '',
+    unit: '',
+    createTime: '',
+    inboundNum: '',
+    totalInboundNum: '',
+    inboundNum0: '',
+    taxInclusiveUnitPrice: '',
+    taxInclusiveTotalPrice: ''
+  },
+  rules: {
+    productCategory: [{ required: true, message: '璇疯緭鍏ヤ骇鍝佸ぇ绫�', trigger: 'blur' }],
+    specificationModel: [{ required: true, message: '璇疯緭鍏ヨ鏍煎瀷鍙�', trigger: 'blur' }],
+    unit: [{ required: true, message: '璇疯緭鍏ュ崟浣�', trigger: 'blur' }],
+    createTime: [{ required: true, message: '璇烽�夋嫨鍏ュ簱鏃堕棿', trigger: 'change' }],
+    inboundNum: [{ required: true, message: '璇疯緭鍏ュ簱瀛樻暟閲�', trigger: 'blur' }],
+    taxInclusiveUnitPrice: [{ required: true, message: '璇疯緭鍏ュ惈绋庡崟浠�', trigger: 'blur' }]
+  }
+})
+
+const { form, rules } = toRefs(data)
+
+// 璁＄畻鎬讳环锛氬惈绋庢�讳环 = 鍚◣鍗曚环 脳 鍓╀綑搴撳瓨
+const calculateTotalPrice = () => {
+  const unitPrice = parseFloat(form.value.taxInclusiveUnitPrice) || 0
+  const stockQuantity = parseFloat(form.value.inboundNum) || 0 // 搴撳瓨鏁伴噺
+  const outboundQuantity = parseFloat(form.value.totalInboundNum) || 0 // 宸插嚭搴撴暟閲�
+  const remainingStock = stockQuantity - outboundQuantity // 鍓╀綑搴撳瓨
+  form.value.taxInclusiveTotalPrice = (unitPrice * remainingStock).toFixed(2)
+}
+
+// 鐩戝惉formData鍙樺寲
+watch(() => props.formData, (newVal) => {
+  if (newVal) {
+    form.value = { ...newVal }
+    // 鏁版嵁鍙樺寲鍚庨噸鏂拌绠楁�讳环
+    calculateTotalPrice()
+  }
+}, { immediate: true })
+
+// 鎻愪氦琛ㄥ崟
+const submitForm = () => {
+  formRef.value.validate(valid => {
+    if (valid) {
+      emit('submit', form.value)
+    }
+  })
+}
+
+// 鍏抽棴寮规
+const closeDia = () => {
+  emit('close')
+  emit('update:dialogFormVisible', false)
+}
+
+</script>
+
+<style scoped lang="scss">
+.dialog-footer {
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/inventoryManagement/stockReport/index.vue b/src/views/inventoryManagement/stockReport/index.vue
new file mode 100644
index 0000000..728c1ab
--- /dev/null
+++ b/src/views/inventoryManagement/stockReport/index.vue
@@ -0,0 +1,713 @@
+<template>
+  <div class="app-container">
+    <!-- 鎼滅储琛ㄥ崟 -->
+    <div class="search_form">
+      <div class="search_left">
+        <span class="search_title">鎶ヨ〃绫诲瀷锛�</span>
+        <el-select
+          v-model="searchForm.reportType"
+          style="width: 150px;"
+          placeholder="璇烽�夋嫨"
+          @change="handleReportTypeChange"
+        >
+          <el-option label="鏃ユ姤" value="daily" />
+          <el-option label="鏈堟姤" value="monthly" />
+          <el-option label="浣滀笟鎶ヨ〃" value="work" />
+          <el-option label="杩涘嚭瀛樻姤琛�" value="inout" />
+        </el-select>
+        
+        <span class="search_title ml10">鏃堕棿鑼冨洿锛�</span>
+         <el-date-picker
+           v-if="searchForm.reportType === 'daily'"
+           v-model="searchForm.singleDate"
+           type="date"
+           placeholder="璇烽�夋嫨鏃ユ湡"
+           format="YYYY-MM-DD"
+           value-format="YYYY-MM-DD"
+           style="width: 200px;"
+         />
+        <el-date-picker
+          v-else-if="searchForm.reportType === 'monthly'"
+          v-model="searchForm.monthRange"
+          type="monthrange"
+          range-separator="鑷�"
+          start-placeholder="寮�濮嬫湀浠�"
+          end-placeholder="缁撴潫鏈堜唤"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          style="width: 240px;"
+        />
+        <el-date-picker
+          v-else
+          v-model="searchForm.dateRange"
+          type="daterange"
+          range-separator="鑷�"
+          start-placeholder="寮�濮嬫棩鏈�"
+          end-placeholder="缁撴潫鏃ユ湡"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          style="width: 240px;"
+        />
+        
+        <el-button type="primary" @click="handleQuery" style="margin-left: 10px">
+          鏌ヨ
+        </el-button>
+        <el-button @click="handleReset">閲嶇疆</el-button>
+      </div>
+      
+      <div class="search_right">
+        <el-button type="success" @click="handleExport" icon="Download">
+          瀵煎嚭鎶ヨ〃
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 缁熻鍗＄墖 -->
+    <div class="stats_cards" v-if="reportData.summary">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-card class="stats_card">
+            <div class="stats_content">
+              <div class="stats_icon in">
+                <el-icon><TrendCharts /></el-icon>
+              </div>
+              <div class="stats_info">
+                <div class="stats_value">{{ reportData.summary.totalIn || 0 }}</div>
+                <div class="stats_label">鎬诲叆搴撻噺</div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card class="stats_card">
+            <div class="stats_content">
+              <div class="stats_icon out">
+                <el-icon><TrendCharts /></el-icon>
+              </div>
+              <div class="stats_info">
+                <div class="stats_value">{{ reportData.summary.totalOut || 0 }}</div>
+                <div class="stats_label">鎬诲嚭搴撻噺</div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card class="stats_card">
+            <div class="stats_content">
+              <div class="stats_icon stock">
+                <el-icon><Box /></el-icon>
+              </div>
+              <div class="stats_info">
+                <div class="stats_value">{{ reportData.summary.currentStock || 0 }}</div>
+                <div class="stats_label">褰撳墠搴撳瓨</div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+        <el-col :span="6">
+          <el-card class="stats_card">
+            <div class="stats_content">
+              <div class="stats_icon turnover">
+                <el-icon><Refresh /></el-icon>
+              </div>
+              <div class="stats_info">
+                <div class="stats_value">{{ reportData.summary.turnoverRate || 0 }}%</div>
+                <div class="stats_label">鍛ㄨ浆鐜�</div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
+
+    <!-- 鍥捐〃鍖哄煙 -->
+    <div class="chart_section" v-if="reportData.chartData">
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-card>
+            <template #header>
+              <span>搴撳瓨瓒嬪娍鍥�</span>
+            </template>
+            <div ref="trendChart" style="height: 300px;"></div>
+          </el-card>
+        </el-col>
+        <el-col :span="12">
+          <el-card>
+            <template #header>
+              <span>杩涘嚭搴撳姣�</span>
+            </template>
+            <div ref="comparisonChart" style="height: 300px;"></div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </div>
+
+    <!-- 璇︾粏鏁版嵁琛ㄦ牸 -->
+    <div class="table_section">
+      <el-card>
+        <template #header>
+          <span>{{ getTableTitle() }}</span>
+        </template>
+         <el-table
+           v-loading="tableLoading"
+           :data="reportData.tableData"
+           border
+           height="400"
+           style="width: 100%"
+           :header-cell-style="{ background: '#F0F1F5', color: '#333333' }"
+         >
+          <el-table-column
+            align="center"
+            label="搴忓彿"
+            type="index"
+            width="60"
+          />
+           <el-table-column
+             v-if="searchForm.reportType === 'daily'"
+             label="鏃ユ湡"
+             prop="createTime"
+             width="100"
+             align="center"
+           />
+           <el-table-column
+             v-if="searchForm.reportType === 'monthly'"
+             label="鏈堜唤"
+             prop="createTime"
+             width="100"
+             align="center"
+           />
+           <el-table-column
+             label="鍏ュ簱鏃堕棿"
+             prop="createTime"
+             width="100"
+             show-overflow-tooltip
+           />
+           <el-table-column
+             label="鍏ュ簱鎵规"
+             prop="inboundBatches"
+             width="160"
+             show-overflow-tooltip
+           />
+           <el-table-column
+             label="浜у搧澶х被"
+             prop="productCategory"
+             width="100"
+             show-overflow-tooltip
+           />
+           <el-table-column
+             label="瑙勬牸鍨嬪彿"
+             prop="specificationModel"
+             min-width="200"
+             show-overflow-tooltip
+           />
+           <el-table-column
+             label="鍗曚綅"
+             prop="unit"
+             width="70"
+             show-overflow-tooltip
+           />
+           <!-- <el-table-column
+             label="鏈熷垵搴撳瓨"
+             prop="beginStock"
+             width="100"
+             align="center"
+           /> -->
+           <el-table-column
+             label="鍏ュ簱鏁伴噺"
+             prop="inboundNum"
+             width="100"
+             align="center"
+           />
+           <!-- <el-table-column
+             label="鍑哄簱鏁伴噺"
+             prop=""
+             width="100"
+             align="center"
+           /> -->
+           <el-table-column
+             label="鐜板湪搴撳瓨"
+             prop="inboundNum0"
+             width="100"
+             align="center"
+           />
+           <el-table-column
+             label="鍚◣鍗曚环"
+             prop="taxInclusiveUnitPrice"
+             width="100"
+             show-overflow-tooltip
+           />
+           <el-table-column
+             label="鍚◣鎬讳环"
+             prop="taxInclusiveTotalPrice"
+             width="100"
+             show-overflow-tooltip
+           />
+           <el-table-column
+             label="绋庣巼(%)"
+             prop="taxRate"
+             width="80"
+             show-overflow-tooltip
+           />
+           <el-table-column
+             label="涓嶅惈绋庢�讳环"
+             prop="taxExclusiveTotalPrice"
+             width="100"
+             show-overflow-tooltip
+           />
+           <el-table-column
+             label="鍏ュ簱浜�"
+             prop="createBy"
+             width="80"
+             show-overflow-tooltip
+           />
+           <el-table-column
+             v-if="searchForm.reportType === 'work'"
+             label="鎿嶄綔浜哄憳"
+             prop="operator"
+             width="80"
+             align="center"
+           />
+           <el-table-column
+             v-if="searchForm.reportType === 'work'"
+             label="鎿嶄綔鏃堕棿"
+             prop="operateTime"
+             width="150"
+             align="center"
+           />
+        </el-table>
+      </el-card>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted, nextTick } from 'vue'
+import { ElMessage } from 'element-plus'
+import * as echarts from 'echarts'
+import {
+  getStockDailyReport,
+  getStockMonthlyReport,
+  getWorkReport,
+  getStockInOutReport,
+  exportStockReport
+} from '@/api/inventoryManagement/stockReport'
+
+
+const { proxy } = getCurrentInstance()
+// 鍝嶅簲寮忔暟鎹�
+const tableLoading = ref(false)
+const trendChart = ref(null)
+const comparisonChart = ref(null)
+
+const searchForm = reactive({
+  reportType: 'daily',
+  singleDate: '',
+  dateRange: [],
+  monthRange: []
+})
+
+const reportData = ref({
+  summary: null,
+  chartData: null,
+  tableData: []
+})
+
+// 鑾峰彇琛ㄦ牸鏍囬
+const getTableTitle = () => {
+  const typeMap = {
+    daily: '鏃ユ姤璇︾粏鏁版嵁',
+    monthly: '鏈堟姤璇︾粏鏁版嵁',
+    work: '浣滀笟鎶ヨ〃璇︾粏鏁版嵁',
+    inout: '杩涘嚭瀛樻姤琛ㄨ缁嗘暟鎹�'
+  }
+  return typeMap[searchForm.reportType] || '鎶ヨ〃璇︾粏鏁版嵁'
+}
+
+// 鎶ヨ〃绫诲瀷鏀瑰彉
+const handleReportTypeChange = () => {
+  reportData.value = {
+    summary: null,
+    chartData: null,
+    tableData: []
+  }
+}
+
+// 鏌ヨ鏁版嵁
+const handleQuery = async () => {
+  if (!validateSearchForm()) {
+    return
+  }
+  
+  tableLoading.value = true
+  try {
+    const params = getQueryParams()
+    let response
+    
+    switch (searchForm.reportType) {
+      case 'daily':
+        response = await getStockDailyReport(params)
+        break
+      case 'monthly':
+        response = await getStockMonthlyReport(params)
+        break
+      case 'work':
+        response = await getWorkReport(params)
+        break
+      case 'inout':
+        response = await getStockInOutReport(params)
+        break
+      default:
+        throw new Error('鏈煡鐨勬姤琛ㄧ被鍨�')
+    }
+    
+    if (response.code === 200) {
+      // generateMockData()
+      reportData.value.tableData = response.data.tableData
+      reportData.value.summary = response.data.summary
+      reportData.value.chartData = response.data.chartData
+      nextTick(() => {
+        initCharts()
+      })
+      
+    }
+  } catch (error) {
+    ElMessage.error('鏌ヨ澶辫触锛�' + error.message)
+  } finally {
+    tableLoading.value = false
+  }
+}
+// // 鐢熸垚鍋囨暟鎹�
+// const generateMockData = () => {
+//   // 鐢熸垚缁熻鍗＄墖鍋囨暟鎹�
+//   const summary = {
+//     totalIn: 1000,
+//     totalOut: 600,
+//     currentStock: 400,
+//     turnoverRate: 30
+//   }
+
+//   // 鐢熸垚鍥捐〃鍋囨暟鎹�
+//   const trendDates = ['2025-09-15', '2025-09-16', '2025-09-17', '2025-09-18', '2025-09-19']
+//   const trendValues = [300, 350, 400, 380, 420]
+//   const comparisonDates = ['2025-09-15', '2025-09-16', '2025-09-17']
+//   const inValues = [100, 150, 200]
+//   const outValues = [80, 120, 100]
+
+//   const chartData = {
+//     trendDates,
+//     trendValues,
+//     comparisonDates,
+//     inValues,
+//     outValues
+//   }
+
+//   reportData.value = {
+//     summary,
+//     chartData,
+//     tableData: []
+//   }
+// }
+// 楠岃瘉鎼滅储琛ㄥ崟
+const validateSearchForm = () => {
+  if (searchForm.reportType === 'daily') {
+    if (!searchForm.singleDate) {
+      ElMessage.warning('璇烽�夋嫨鏃ユ湡')
+      return false
+    }
+  } else if (searchForm.reportType === 'work' || searchForm.reportType === 'inout') {
+    if (!searchForm.dateRange || searchForm.dateRange.length !== 2) {
+      ElMessage.warning('璇烽�夋嫨鏃ユ湡鑼冨洿')
+      return false
+    }
+  } else if (searchForm.reportType === 'monthly') {
+    if (!searchForm.monthRange || searchForm.monthRange.length !== 2) {
+      ElMessage.warning('璇烽�夋嫨鏈堜唤鑼冨洿')
+      return false
+    }
+  }
+  return true
+}
+
+// 鑾峰彇鏌ヨ鍙傛暟
+const getQueryParams = () => {
+  const params = {
+    reportType: searchForm.reportType,
+    reportDate: "",
+    startMonth: "",
+    endMonth: "",
+    startDate: "",
+    endDate: ""
+  }
+  
+  if (searchForm.reportType === 'daily') {
+    params.reportDate = searchForm.singleDate
+  } else if (searchForm.reportType === 'monthly') {
+    params.startMonth = searchForm.monthRange[0]
+    params.endMonth = searchForm.monthRange[1]
+  } else {
+    params.startDate = searchForm.dateRange[0]
+    params.endDate = searchForm.dateRange[1]
+  }
+  
+  return params
+}
+
+// 閲嶇疆鎼滅储
+const handleReset = () => {
+  searchForm.reportType = 'daily'
+  searchForm.singleDate = ''
+  searchForm.dateRange = []
+  searchForm.monthRange = []
+  reportData.value = {
+    summary: null,
+    chartData: null,
+    tableData: []
+  }
+}
+
+// 瀵煎嚭鎶ヨ〃
+const handleExport = async () => {
+  if (!validateSearchForm()) {
+    return
+  }
+  
+  try {
+    const params = getQueryParams()
+    // const response = await exportStockReport(params)
+    proxy.download("/stockin/exportCopy", params, '搴撳瓨鎶ヨ〃.xlsx')
+    // 鍒涘缓涓嬭浇閾炬帴
+    // const blob = new Blob([response], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
+    // const url = window.URL.createObjectURL(blob)
+    // const link = document.createElement('a')
+    // link.href = url
+    // link.download = `${getTableTitle()}_${new Date().getTime()}.xlsx`
+    // document.body.appendChild(link)
+    // link.click()
+    // document.body.removeChild(link)
+    // window.URL.revokeObjectURL(url)
+    
+    // ElMessage.success('瀵煎嚭鎴愬姛')
+  } catch (error) {
+    ElMessage.error('瀵煎嚭澶辫触锛�' + error.message)
+  }
+}
+
+// 鍒濆鍖栧浘琛�
+const initCharts = () => {
+  if (!reportData.value.chartData) return
+  
+  initTrendChart()
+  initComparisonChart()
+}
+
+// 鍒濆鍖栬秼鍔垮浘
+const initTrendChart = () => {
+  if (!trendChart.value) return
+  
+  const chart = echarts.init(trendChart.value)
+  const option = {
+    title: {
+      text: '搴撳瓨鍙樺寲瓒嬪娍',
+      left: 'center'
+    },
+    tooltip: {
+      trigger: 'axis'
+    },
+    legend: {
+      data: ['搴撳瓨閲�'],
+      top: 30
+    },
+    xAxis: {
+      type: 'category',
+      data: reportData.value.chartData.trendDates || []
+    },
+    yAxis: {
+      type: 'value'
+    },
+    series: [{
+      name: '搴撳瓨閲�',
+      type: 'line',
+      data: reportData.value.chartData.trendValues || [],
+      smooth: true,
+      itemStyle: {
+        color: '#409EFF'
+      }
+    }]
+  }
+  chart.setOption(option)
+}
+
+// 鍒濆鍖栧姣斿浘
+const initComparisonChart = () => {
+  if (!comparisonChart.value) return
+  
+  const chart = echarts.init(comparisonChart.value)
+  const option = {
+    title: {
+      text: '杩涘嚭搴撳姣�',
+      left: 'center'
+    },
+    tooltip: {
+      trigger: 'axis'
+    },
+    legend: {
+      data: ['鍏ュ簱', '鍑哄簱'],
+      top: 30
+    },
+    xAxis: {
+      type: 'category',
+      data: reportData.value.chartData.comparisonDates || []
+    },
+    yAxis: {
+      type: 'value'
+    },
+    series: [
+      {
+        name: '鍏ュ簱',
+        type: 'bar',
+        data: reportData.value.chartData.inValues || [],
+        itemStyle: {
+          color: '#67C23A'
+        }
+      },
+      {
+        name: '鍑哄簱',
+        type: 'bar',
+        data: reportData.value.chartData.outValues || [],
+        itemStyle: {
+          color: '#F56C6C'
+        }
+      }
+    ]
+  }
+  chart.setOption(option)
+}
+
+// 缁勪欢鎸傝浇鏃惰缃粯璁ゆ椂闂�
+onMounted(() => {
+  const today = new Date()
+  searchForm.singleDate = today.toISOString().split('T')[0]
+  
+  const yesterday = new Date(today.getTime() - 24 * 60 * 60 * 1000)
+  searchForm.dateRange = [
+    yesterday.toISOString().split('T')[0],
+    today.toISOString().split('T')[0]
+  ]
+})
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+
+.search_form {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+  padding: 20px;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
+
+.search_left {
+  display: flex;
+  align-items: center;
+}
+
+.search_title {
+  font-weight: 500;
+  color: #333;
+  margin-right: 8px;
+}
+
+.ml10 {
+  margin-left: 10px;
+}
+
+.stats_cards {
+  margin-bottom: 20px;
+}
+
+.stats_card {
+  border-radius: 8px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.stats_content {
+  display: flex;
+  align-items: center;
+  padding: 10px 0;
+}
+
+.stats_icon {
+  width: 50px;
+  height: 50px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 15px;
+  font-size: 24px;
+  color: #fff;
+}
+
+.stats_icon.in {
+  background: linear-gradient(135deg, #67C23A, #85CE61);
+}
+
+.stats_icon.out {
+  background: linear-gradient(135deg, #F56C6C, #F78989);
+}
+
+.stats_icon.stock {
+  background: linear-gradient(135deg, #409EFF, #66B1FF);
+}
+
+.stats_icon.turnover {
+  background: linear-gradient(135deg, #E6A23C, #EEBE77);
+}
+
+.stats_info {
+  flex: 1;
+}
+
+.stats_value {
+  font-size: 24px;
+  font-weight: bold;
+  color: #333;
+  line-height: 1;
+  margin-bottom: 5px;
+}
+
+.stats_label {
+  font-size: 14px;
+  color: #666;
+}
+
+.chart_section {
+  margin-bottom: 20px;
+}
+
+.table_section {
+  margin-bottom: 20px;
+}
+
+:deep(.el-card__header) {
+  background: #f8f9fa;
+  border-bottom: 1px solid #e9ecef;
+  font-weight: 500;
+}
+
+:deep(.el-table .el-table__header-wrapper th) {
+  background-color: #F0F1F5 !important;
+  color: #333333;
+  font-weight: 600;
+}
+
+:deep(.el-table .el-table__body-wrapper td) {
+  padding: 8px 0;
+}
+</style>

--
Gitblit v1.9.3