From c8b65690b946b28b179796fbe2f020e732043c58 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 08 一月 2026 18:10:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业
---
src/views/inventoryManagement/dispatchLog/index.vue | 78 ++-------------------------------------
1 files changed, 4 insertions(+), 74 deletions(-)
diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index 5f73d91..427d505 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -128,71 +128,6 @@
/>
</div>
</el-tab-pane>
-
- <el-tab-pane label="鏉愭枡鍑哄簱" name="manual">
- <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>
- <el-button type="primary" plain @click="handlePrint">鎵撳嵃</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 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"
- :total="total"
- layout="total, sizes, prev, pager, next, jumper"
- :page="page.current"
- :limit="page.size"
- @pagination="paginationChange"
- />
- </div>
- </el-tab-pane>
</el-tabs>
<!-- 鎵撳嵃棰勮寮圭獥 -->
@@ -218,7 +153,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>
@@ -322,7 +257,6 @@
} from "@/api/inventoryManagement/stockOut.js";
import {
getStockInPageByProduct,
- getStockInPageByCustom,
} from "@/api/inventoryManagement/stockIn.js";
const userStore = useUserStore();
@@ -347,7 +281,7 @@
supplierName: "",
customerName: "",
productCategory:'',
- timeStr: getCurrentDate(),
+ timeStr: '',
},
form: {
supplierId: null,
@@ -397,8 +331,6 @@
// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
const apiCall = activeTab.value === 'production'
? getStockInPageByProduct(params)
- : activeTab.value === 'manual'
- ? getStockInPageByCustom(params)
: getStockOutPage(params)
apiCall
@@ -414,7 +346,7 @@
const unitPrice = Number(item.unitPrice) || 0;
item.totalPrice = (unitPrice * inboundNum).toFixed(2);
} else {
- // 鍘熸枡鍜屾潗鏂欏嚭搴擄細鎬讳环 = taxInclusiveUnitPrice 脳 inboundNum
+ // 鍘熸枡鍑哄簱锛氭�讳环 = taxInclusiveUnitPrice 脳 inboundNum
const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0;
item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * inboundNum).toFixed(2);
}
@@ -465,8 +397,6 @@
let exportUrl = "/stockmanagement/export"
if (activeTab.value === 'production') {
exportUrl = "/stockmanagement/exportone"
- } else if (activeTab.value === 'manual') {
- exportUrl = "/stockmanagement/exportTwo"
}
proxy.download(exportUrl, {}, "鍑哄簱鍙拌处.xlsx");
})
@@ -661,7 +591,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>
--
Gitblit v1.9.3