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/dispatchLog/index.vue | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 000e5f6..9b04069 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -117,8 +117,8 @@
<el-table-column label="鍑哄簱鏁伴噺/浠�" prop="inboundNum" show-overflow-tooltip />
<el-table-column label="姣忎欢鏁伴噺/鏀�" prop="boxNum" 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="cartonSpecifications" width="150"></el-table-column>
- <el-table-column label="鍏ュ簱浜�" prop="createBy" width="80" show-overflow-tooltip />
<el-table-column label="鍑哄簱浜�" prop="createBy" show-overflow-tooltip />
</el-table>
<pagination
@@ -180,19 +180,19 @@
<img class="barcode-img" :src="javaApiUrl+scope.row.url"></img>
</template>
</el-table-column>
- <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" show-overflow-tooltip />
+ <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" width="150" 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">
<div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
</template>
</el-table-column>
- <el-table-column label="鍑哄簱鏁伴噺/浠�" prop="inboundNum" show-overflow-tooltip />
+ <el-table-column label="鍑哄簱鏁伴噺/浠�" prop="inboundNum" width="150" show-overflow-tooltip />
<el-table-column label="姣忎欢鏁伴噺/鏀�" prop="boxNum" width="100" show-overflow-tooltip />
- <el-table-column label="鍗曚环(鍏�)/鏀�" prop="taxInclusiveUnitPrice" width="150"></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="cartonSpecifications" width="150"></el-table-column>
- <el-table-column label="鍏ュ簱浜�" prop="createBy" width="80" show-overflow-tooltip />
- <el-table-column label="鍑哄簱浜�" prop="createBy" show-overflow-tooltip />
+ <el-table-column label="鍑哄簱浜�" prop="createBy" width="150" show-overflow-tooltip />
</el-table>
<pagination
v-show="total > 0"
@@ -229,7 +229,7 @@
<div v-for="(item, index) in printData" :key="index" class="print-page">
<div class="delivery-note">
<div class="header">
- <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+ <div class="company-name">澶╂触鍙屽鐐规湁闄愯矗浠诲叕鍙�</div>
<div class="document-title">闆跺敭鍙戣揣鍗�</div>
</div>
@@ -256,32 +256,34 @@
<thead>
<tr>
<th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
- <th>鍗曚綅</th>
- <th>鍗曚环</th>
- <th>闆跺敭鏁伴噺</th>
- <th>闆跺敭閲戦</th>
+ <th>浜у搧楂樺害</th>
+ <th>鍗曚环锛堝厓锛�/浠�</th>
+ <th>鍗曚环锛堢編鍏冿級/浠�</th>
+ <th>闆跺敭鏁伴噺/浠�</th>
+ <th>姣忎欢鏁伴噺/鏀�</th>
+ <th>绾哥瑙勬牸</th>
</tr>
</thead>
<tbody>
<tr>
- <td>{{ item.productCategory || '鐮傜伆鐮�' }}</td>
- <td>{{ item.specificationModel || '鏍囧噯' }}</td>
- <td>{{ item.unit || '鍧�' }}</td>
+ <td>{{ item.productCategory || '' }}</td>
+ <td>{{ item.specificationModel || '' }}{{ item.unit || '' }}</td>
<td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
- <td>{{ item.inboundNum || '2000' }}</td>
- <td>{{ item.taxInclusiveTotalPrice || '0' }}</td>
+ <td>{{ item.dollarPrice || '0' }}</td>
+ <td>{{ item.inboundNum || '0' }}</td>
+ <td>{{ item.boxNum || '0' }}</td>
+ <td>{{ item.cartonSpecifications || '0' }}</td>
</tr>
</tbody>
<tfoot>
- <tr>
+ <!-- <tr>
<td class="label">鍚堣</td>
<td class="total-value"></td>
<td class="total-value"></td>
<td class="total-value"></td>
<td class="total-value">{{ item.inboundNum || '2000' }}</td>
<td class="total-value">{{ item.taxInclusiveTotalPrice || '0' }}</td>
- </tr>
+ </tr> -->
</tfoot>
</table>
</div>
@@ -335,6 +337,7 @@
getStockInPageByProduct,
getStockInPageByCustom,
} from "@/api/inventoryManagement/stockIn.js";
+const javaApiUrl = __BASE_API__;
const userStore = useUserStore();
const { proxy } = getCurrentInstance();
@@ -694,39 +697,33 @@
</div>
<div class="table-section">
- <table class="product-table">
- <thead>
- <tr>
- <th>浜у搧鍚嶇О</th>
- <th>瑙勬牸鍨嬪彿</th>
- <th>鍗曚綅</th>
- <th>鍗曚环</th>
- <th>闆跺敭鏁伴噺</th>
- <th>闆跺敭閲戦</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>${item.productCategory || '鐮傜伆鐮�'}</td>
- <td>${item.specificationModel || '鏍囧噯'}</td>
- <td>${item.unit || '鍧�'}</td>
- <td>${item.taxInclusiveUnitPrice || '0'}</td>
- <td>${item.inboundNum || '2000'}</td>
- <td>${item.taxInclusiveTotalPrice || '0'}</td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td class="label">鍚堣</td>
- <td class="total-value"></td>
- <td class="total-value"></td>
- <td class="total-value"></td>
- <td class="total-value">${item.inboundNum || '2000'}</td>
- <td class="total-value">${item.taxInclusiveTotalPrice || '0'}</td>
- </tr>
- </tfoot>
- </table>
- </div>
+ <table class="product-table">
+ <thead>
+ <tr>
+ <th>浜у搧鍚嶇О</th>
+ <th>浜у搧楂樺害</th>
+ <th>鍗曚环锛堝厓锛�/浠�</th>
+ <th>鍗曚环锛堢編鍏冿級/浠�</th>
+ <th>闆跺敭鏁伴噺/浠�</th>
+ <th>姣忎欢鏁伴噺/鏀�</th>
+ <th>绾哥瑙勬牸</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>{{ item.productCategory || '' }}</td>
+ <td>{{ item.specificationModel || '' }}{{ item.unit || '' }}</td>
+ <td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
+ <td>{{ item.dollarPrice || '0' }}</td>
+ <td>{{ item.inboundNum || '0' }}</td>
+ <td>{{ item.boxNum || '0' }}</td>
+ <td>{{ item.cartonSpecifications || '0' }}</td>
+ </tr>
+ </tbody>
+ <tfoot>
+ </tfoot>
+ </table>
+ </div>
<div class="footer-section">
<div class="footer-row">
--
Gitblit v1.9.3