From fc4a3427aa022b33cb70defe4e50c4b34cb97a6c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 08 一月 2026 11:56:29 +0800
Subject: [PATCH] 产品维护-编辑产品规格型号时投机交易名称数据类型处理
---
src/views/inventoryManagement/dispatchLog/index.vue | 162 +++++++++++++++++++++++++----------------------------
1 files changed, 77 insertions(+), 85 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index a58c62e..5f73d91 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-tabs v-model="activeTab" @tab-change="handleTabChange">
- <!-- <el-tab-pane label="閲囪喘鍑哄簱" name="production">
+ <el-tab-pane label="鎴愬搧鍑哄簱" name="production">
<div class="search_form">
<div>
<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
@@ -44,7 +44,8 @@
>
<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" min-width="120" show-overflow-tooltip />
+ <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" width="120" show-overflow-tooltip />
+ <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" 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="80" show-overflow-tooltip />
@@ -62,9 +63,9 @@
@pagination="paginationChange"
/>
</div>
- </el-tab-pane> -->
+ </el-tab-pane>
- <el-tab-pane label="閲囪喘鍑哄簱" name="purchase">
+ <el-tab-pane label="鍘熸枡鍑哄簱" name="purchase">
<div class="search_form">
<div>
<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
@@ -107,18 +108,15 @@
>
<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" 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="boxNum" width="100" show-overflow-tooltip />
- <el-table-column label="鍗曚环(鍏�)/鏀�" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
- <el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="150"></el-table-column>
- <el-table-column label="鍑哄簱浜�" prop="createBy" show-overflow-tooltip />
+ <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" width="120" show-overflow-tooltip />
+ <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" width="180" 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="80" 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="taxInclusiveTotalPrice" width="150"></el-table-column>
+ <el-table-column label="鍑哄簱浜�" prop="createBy" width="80" show-overflow-tooltip />
</el-table>
<pagination
v-show="total > 0"
@@ -131,7 +129,7 @@
</div>
</el-tab-pane>
- <el-tab-pane label="鎴愬搧鍑哄簱" name="manual">
+ <el-tab-pane label="鏉愭枡鍑哄簱" name="manual">
<div class="search_form">
<div>
<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
@@ -174,23 +172,16 @@
>
<el-table-column align="center" type="selection" width="55" />
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
- <el-table-column label="浜у搧鍥剧墖" width="100" align="center">
- <template #default="scope">
- <img class="barcode-img" :src="javaApiUrl+scope.row.url"></img>
- </template>
- </el-table-column>
- <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" 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="cartonSpecifications" width="150"></el-table-column>
- <el-table-column label="鍑哄簱浜�" prop="createBy" width="150" show-overflow-tooltip />
+ <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" show-overflow-tooltip width="130"/>
+ <el-table-column label="鎵规鍙�" prop="code" width="130" 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" show-overflow-tooltip />
+ <el-table-column label="鐗╁搧绫诲瀷" prop="itemType" show-overflow-tooltip />
+ <el-table-column label="鍑哄簱鏁伴噺" prop="inboundNum" show-overflow-tooltip />
+ <el-table-column label="鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
+ <el-table-column label="鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>
+ <el-table-column label="鍑哄簱浜�" prop="createBy" show-overflow-tooltip />
</el-table>
<pagination
v-show="total > 0"
@@ -227,7 +218,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>
@@ -240,7 +231,7 @@
<div>
<span class="label">瀹㈡埛鍚嶇О锛�</span>
- <span class="value">{{ item.supplierName }}</span>
+ <span class="value">{{ item.supplierName || '寮犵埍鏈�' }}</span>
</div>
</div>
<div class="info-row">
@@ -254,32 +245,32 @@
<thead>
<tr>
<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 || '' }}{{ item.unit || '' }}</td>
+ <td>{{ item.productCategory || '鐮傜伆鐮�' }}</td>
+ <td>{{ item.specificationModel || '鏍囧噯' }}</td>
+ <td>{{ item.unit || '鍧�' }}</td>
<td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
- <td>{{ item.inboundNum || '0' }}</td>
- <td>{{ item.boxNum || '0' }}</td>
- <td>{{ item.cartonSpecifications || '0' }}</td>
+ <td>{{ item.inboundNum || '2000' }}</td>
+ <td>{{ item.taxInclusiveTotalPrice || '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>
@@ -333,12 +324,11 @@
getStockInPageByProduct,
getStockInPageByCustom,
} from "@/api/inventoryManagement/stockIn.js";
-const javaApiUrl = __BASE_API__;
const userStore = useUserStore();
const { proxy } = getCurrentInstance();
const tableData = ref([]);
-const activeTab = ref('purchase');
+const activeTab = ref('production');
const selectedRows = ref([]);
const tableLoading = ref(false);
const page = reactive({
@@ -440,7 +430,7 @@
page.current = 1
searchForm.value.supplierName = ''
searchForm.value.customerName = ''
- searchForm.value.timeStr = getCurrentDate() // 閲嶇疆涓哄綋鍓嶆棩鏈�
+ searchForm.value.timeStr = ''
selectedRows.value = []
searchForm.value.productCategory = ''
getList()
@@ -671,7 +661,7 @@
<div 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>
@@ -683,41 +673,49 @@
</div>
<div>
<span class="label">瀹㈡埛鍚嶇О锛�</span>
- <span class="value">${item.supplierName}</span>
+ <span class="value">${item.supplierName || '寮犵埍鏈�'}</span>
</div>
</div>
<div class="info-row">
<span class="label">鍗曞彿锛�</span>
- <span class="value">${item.code}</span>
+ <span class="value">${item.code || ''}</span>
</div>
</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 || '' }}{{ item.unit || '' }}</td>
- <td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
- <td>{{ item.inboundNum || '0' }}</td>
- <td>{{ item.boxNum || '0' }}</td>
- <td>{{ item.cartonSpecifications || '0' }}</td>
- </tr>
- </tbody>
- <tfoot>
- </tfoot>
- </table>
- </div>
+ <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>
<div class="footer-section">
<div class="footer-row">
@@ -970,12 +968,6 @@
.print-page:last-child {
page-break-after: avoid;
}
-}
-.barcode-img{
- width: 80px;
- height: 80px;
- border-radius: 5px;
- background-color: #F5F5F5;
}
</style>
--
Gitblit v1.9.3