From 12b411cd617a1f8d4ef7d03b2d0677f23515ce2f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 30 十二月 2025 13:30:45 +0800
Subject: [PATCH] 1.双奇点-bug修改
---
src/views/inventoryManagement/receiptManagement/index.vue | 134 ++++++++++++++++++--------------------------
1 files changed, 56 insertions(+), 78 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index 073821e..24f7174 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -1,59 +1,6 @@
<template>
<div class="app-container">
<el-tabs v-model="activeTab" @tab-change="handleTabChange">
- <!-- <el-tab-pane label="閲囪喘鍏ュ簱" name="production">
- <div class="search_form">
- <div>
- <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
- <el-date-picker
- v-model="searchForm.timeStr"
- type="date"
- placeholder="璇烽�夋嫨鏃ユ湡"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- clearable
- @change="handleQuery"
- />
- <span class="search_title ml10">浜у搧澶х被锛�</span>
- <el-input
- v-model="searchForm.productCategory"
- style="width: 240px"
- placeholder="璇疯緭鍏�"
- clearable
- />
- <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
- </div>
- <div>
- <el-button @click="handleOut">瀵煎嚭</el-button>
- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
- </div>
- </div>
- <div class="table_list">
- <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
- :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary style="width: 100%"
- :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="createTime" show-overflow-tooltip />
- <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
- <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
- <el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
- <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
- <el-table-column label="鍗曚环(鍏�)" prop="unitPrice" width="150"></el-table-column>
- <el-table-column label="鎬讳环(鍏�)" prop="totalPrice" width="150"></el-table-column>
- <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, 'production');">缂栬緫</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>
- <pagination v-show="total > 0" :total="total" layout="total, sizes, prev, pager, next, jumper"
- :page="page.current" :limit="page.size" @pagination="paginationChange" />
- </div>
- </el-tab-pane> -->
-
<el-tab-pane label="閲囪喘鍏ュ簱" name="purchase">
<div class="search_form">
<div>
@@ -88,7 +35,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 +44,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 +109,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 +160,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 +177,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>
@@ -382,7 +352,7 @@
// 鍒囨崲 tab 鏃舵竻绌烘悳绱㈡潯浠�
searchForm.value.supplierName = ''
searchForm.value.customerName = ''
- searchForm.value.timeStr = ''
+ searchForm.value.timeStr = getCurrentDate() // 閲嶇疆涓哄綋鍓嶆棩鏈�
searchForm.value.productCategory = ''
getList()
}
@@ -565,7 +535,7 @@
const scanBarcodeInput = ref('');
const barcodeDetail = ref({})
// 鎵爜鍑芥暟
-const scanBarcode = (e) => {
+function scanBarcode (e){
if(!e||!e.target||!e.target.tagName){
return;
}
@@ -600,7 +570,14 @@
return
}
detailApi({id:barcodeId}).then((resp) => {
- if(resp.code!=200||!resp.data)return
+ if(!resp.data){
+ proxy.$modal.msgError("鍟嗗搧涓嶅瓨鍦�")
+ return
+ }
+ if(resp.code!=200){
+ proxy.$modal.msgError(res.msg)
+ return
+ }
barcodeDetail.value = resp.data
barcodeDia.value = true
}).catch(() => {
@@ -615,6 +592,7 @@
onMounted(() => {
// 娣诲姞鎵爜鏋洃鍚簨浠�
+ document.removeEventListener('keypress',scanBarcode)
document.addEventListener('keypress', scanBarcode)
getList()
})
--
Gitblit v1.9.3