From 3806a7b94bc2b069d22743c22f8d3dc54101850e Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期四, 25 十二月 2025 17:15:47 +0800
Subject: [PATCH] 天津双奇点-开发仓储物流

---
 src/views/inventoryManagement/stockManagement/index.vue |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 8732076..e66341d 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -87,7 +87,7 @@
            :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
            <el-table-column align="center" type="selection" width="55" />
            <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-           <el-table-column label="鍏ュ簱鏃堕棿" prop="inboundDate" width="100" show-overflow-tooltip />
+           <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" width="100" show-overflow-tooltip />
 						<el-table-column label="浜у搧鍚嶇О" prop="productCategory" show-overflow-tooltip />
 						<el-table-column label="浜у搧楂樺害" prop="specificationModel" width="100" show-overflow-tooltip>
 						<template #default="scope">
@@ -96,6 +96,8 @@
 						</el-table-column>
 						<el-table-column label="姣忎欢鏁伴噺/鏀�" prop="boxNum" width="100" show-overflow-tooltip />
 						<el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
+            <el-table-column label="鍗曚环(鍏�)/浠�" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
+						<el-table-column label="鍗曚环(缇庡厓)/浠�" prop="dollarPrice" width="150"></el-table-column>
 						<el-table-column label="宸插嚭搴撴暟閲�" prop="totalInboundNum" width="100" show-overflow-tooltip />
 						<el-table-column label="鍓╀綑搴撳瓨" prop="inboundNum0" width="100" show-overflow-tooltip />
             <el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="150"></el-table-column>
@@ -154,16 +156,18 @@
 							<div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
 						</template>
 						</el-table-column>
+            <el-table-column label="鍗曚环(鍏�)/浠�" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
+						<el-table-column label="鍗曚环(缇庡厓)/浠�" prop="dollarPrice" width="150"></el-table-column>
 						<el-table-column label="姣忎欢鏁伴噺/鏀�" prop="boxNum" width="100" show-overflow-tooltip />
 						<el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
 						<el-table-column label="宸插嚭搴撴暟閲�" prop="totalInboundNum" width="100" show-overflow-tooltip />
 						<el-table-column label="鍓╀綑搴撳瓨" prop="inboundNum0" width="100" show-overflow-tooltip />
             <el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="150"></el-table-column>
-            <el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
+            <!-- <el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
               <template #default="scope">
                 <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
               </template>
-            </el-table-column>
+            </el-table-column> -->
           </el-table>
           <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
             :page="page.current" :limit="page.size" @pagination="paginationChange" />
@@ -261,6 +265,7 @@
 import {
 	updateManagement, updateManagementByCustom, updateStockIn
 } from "@/api/inventoryManagement/stockIn.js";
+const javaApiUrl = __BASE_API__;
 
 // 瀵煎叆涓変釜鐙珛鐨勫脊妗嗙粍浠�
 import FormDiaProduction from './components/FormDiaProduction.vue'
@@ -505,7 +510,7 @@
   delete submitData.taxExclusiveTotalPrice
   
   console.log('鎻愪氦缁欏悗绔殑鏁版嵁锛堝凡绉婚櫎鎬讳环瀛楁锛�:', submitData)
-  
+  submitData.inboundNum = parseFloat(submitData.inboundNum)||0
   // 鏍规嵁褰撳墠鏍囩椤佃皟鐢ㄤ笉鍚岀殑鎻愪氦鎺ュ彛
   let apiCall
   if (activeTab.value === 'production') {

--
Gitblit v1.9.3