From cd17315666ec8099678c55329d3e5889efb23c1e Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期五, 26 十二月 2025 17:01:53 +0800
Subject: [PATCH] 天津双奇点-仓储物流相关问题修复
---
src/views/inventoryManagement/receiptManagement/index.vue | 71 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 073821e..17d2950 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -88,7 +88,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">
@@ -97,14 +97,15 @@
</el-table-column>
<el-table-column label="鍏ュ簱鏁伴噺/浠�" prop="inboundNum" width="100" 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 fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
<el-button link type="primary" size="small" @click="openForm('edit', scope.row, 'purchase');">缂栬緫</el-button>
- <el-button link type="success" size="small" @click="showQRCode(scope.row)">鐢熸垚鏉″舰鐮�</el-button>
- <el-button link type="success" size="small" @click="showERCode(scope.row)">鐢熸垚浜岀淮鐮�</el-button>
+ <!-- <el-button link type="success" size="small" @click="showQRCode(scope.row,1)">鐢熸垚鏉″舰鐮�</el-button>
+ <el-button link type="success" size="small" @click="showERCode(scope.row,1)">鐢熸垚浜岀淮鐮�</el-button> -->
</template>
</el-table-column>
</el-table>
@@ -161,9 +162,10 @@
</el-table-column>
<el-table-column label="鍏ュ簱鏁伴噺/浠�" prop="inboundNum" width="100" 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" width="150" show-overflow-tooltip />
<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, 'manual');">缂栬緫</el-button>
@@ -211,7 +213,7 @@
</el-dialog>
<el-dialog v-model="barcodeDia" title="浜у搧淇℃伅" width="40%" @close="closeBarcodeDia">
<div>
- <el-row :gutter="30">
+ <el-row v-if="barcodeDetail.url" :gutter="30">
<el-col :span="12">
<div class="barcode-item">
<div class="barcode-label">鍥剧墖</div>
@@ -228,30 +230,51 @@
</el-col>
<el-col :span="12">
<div class="barcode-item">
+ <div class="barcode-label">浜у搧楂樺害</div>
+ <div class="barcode-value">{{barcodeDetail.specificationModel}}{{barcodeDetail.unit}}</div>
+ </div>
+ </el-col>
+
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <div class="barcode-item">
<div class="barcode-label">鍗曚环</div>
- <div class="barcode-value">{{barcodeDetail.productCategory}}鍏�</div>
+ <div class="barcode-value">{{barcodeDetail.taxInclusiveUnitPrice}}鍏�/浠�</div>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">鍗曚环</div>
+ <div class="barcode-value">{{barcodeDetail.dollarPrice}}缇庡厓/浠�</div>
</div>
</el-col>
</el-row>
<el-row :gutter="30">
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">鏁伴噺/浠�</div>
+ <div class="barcode-value">{{barcodeDetail.inboundNum}}</div>
+ </div>
+ </el-col>
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">姣忎欢鏁伴噺/鏀�</div>
+ <div class="barcode-value">{{barcodeDetail.boxNum}}</div>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row :gutter="30">
+ <el-col :span="12">
+ <div class="barcode-item">
+ <div class="barcode-label">绾哥瑙勬牸</div>
+ <div class="barcode-value">{{barcodeDetail.cartonSpecifications}}</div>
+ </div>
+ </el-col>
<el-col :span="12">
<div class="barcode-item">
<div class="barcode-label">鍏ュ簱浜�</div>
<div class="barcode-value">{{barcodeDetail.createBy}}</div>
- </div>
- </el-col>
- <el-col :span="12">
- <div class="barcode-item">
- <div class="barcode-label">鏁伴噺/{{barcodeDetail.unit}}</div>
- <div class="barcode-value">{{barcodeDetail.inboundNum}}</div>
- </div>
- </el-col>
- </el-row>
- <el-row :gutter="30">
- <el-col :span="12">
- <div class="barcode-item">
- <div class="barcode-label">瑙勬牸</div>
- <div class="barcode-value">{{barcodeDetail.specificationModel}}</div>
</div>
</el-col>
</el-row>
@@ -565,7 +588,7 @@
const scanBarcodeInput = ref('');
const barcodeDetail = ref({})
// 鎵爜鍑芥暟
-const scanBarcode = (e) => {
+function scanBarcode (e){
if(!e||!e.target||!e.target.tagName){
return;
}
@@ -581,6 +604,7 @@
}
}
const getDetail = (barcode)=>{
+ console.log('barcode',barcode)
if(barcode.indexOf(",")==-1){
proxy.$modal.msgWarning("璇锋壂鎻忔纭殑鏉″舰鐮�")
return
@@ -615,6 +639,7 @@
onMounted(() => {
// 娣诲姞鎵爜鏋洃鍚簨浠�
+ document.removeEventListener('keypress',scanBarcode)
document.addEventListener('keypress', scanBarcode)
getList()
})
--
Gitblit v1.9.3