From 01a0dbc37d2df7557f6bab27a8f3f78970b8251e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 01 四月 2026 17:39:03 +0800
Subject: [PATCH] 军泰伟业 1.军泰伟业-库存管理增加库位 2.军泰伟业-生产入库要审核，加个入库审核菜单，入库数量，库位，通过不通过
---
src/views/salesManagement/deliveryLedger/index.vue | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index efd32a7..ae655fa 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -29,6 +29,8 @@
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column label="閿�鍞鍗�" prop="salesContractNo" show-overflow-tooltip />
<el-table-column label="鍙戣揣璁㈠崟鍙�" prop="shippingNo" 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="customerName" show-overflow-tooltip />
<el-table-column label="鍙戣揣杩涘害" align="center" width="150">
<template #default="scope">
@@ -106,6 +108,14 @@
<span class="label">鍙戣揣璁㈠崟鍙�</span>
<span class="value">{{ currentShippingOrder.shippingNo || '--' }}</span>
</div>
+ <div class="info-item">
+ <span class="label">浜у搧鍚嶇О</span>
+ <span class="value">{{ currentShippingOrder.productCategory || '--' }}</span>
+ </div>
+ <div class="info-item">
+ <span class="label">鍥剧焊缂栧彿</span>
+ <span class="value">{{ currentShippingOrder.specificationModel || '--' }}</span>
+ </div>
<el-divider />
<div class="quantity-summary">
<div class="summary-item">
@@ -118,7 +128,7 @@
</div>
<div class="summary-item">
<div class="summary-label">宸查��璐ф暟閲�</div>
- <div class="summary-value returned">{{ currentShippingOrder.returnedQuantity || 0 }}</div>
+ <div class="summary-value returned">{{ currentShippingOrder.returnTotal || 0 }}</div>
</div>
<div class="summary-item">
<div class="summary-label">寰呭彂璐ф暟閲�</div>
@@ -175,7 +185,7 @@
</div>
<div class="info-row">
<span class="info-label">閫�璐ф暟閲�</span>
- <span class="info-value returned">{{ record.returnNum || 0 }}</span>
+ <span class="info-value returned">{{ record.returnTotal || 0 }}</span>
</div>
<div class="info-row" v-if="record.type === '璐ц溅'">
<span class="info-label">杞︾墝鍙�</span>
@@ -203,6 +213,10 @@
/>
</div>
</div>
+ <div class="info-row">
+ <span class="info-label">搴撲綅</span>
+ <span class="info-value">{{ record.stockLocation || '--' }}</span>
+ </div>
<div class="record-actions" v-if="canRevokeShipping(record)">
<el-button
type="danger"
@@ -260,11 +274,18 @@
</el-row>
<el-row :gutter="20">
<el-col :span="24">
+ <el-form-item label="搴撲綅" prop="stockLocation">
+ <el-input v-model="shippingForm.stockLocation" placeholder="璇疯緭鍏ュ簱浣�" clearable/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="24">
<el-form-item label="鍙戣揣鏃ユ湡" prop="shippingDate">
- <el-date-picker
- v-model="shippingForm.shippingDate"
- value-format="YYYY-MM-DD HH:mm:ss"
- type="datetime"
+ <el-date-picker
+ v-model="shippingForm.shippingDate"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="datetime"
placeholder="璇烽�夋嫨"
style="width: 100%"
/>
@@ -343,6 +364,7 @@
addShippingInfoDetail,
updateShippingInfoDetail,
delShippingInfoDetail,
+ getShippingInfoById,
} from "@/api/salesManagement/deliveryLedger.js";
import { delLedgerFile } from "@/api/salesManagement/salesLedger.js";
@@ -372,9 +394,11 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
+ stockLocation: "",
});
const shippingRules = {
shippingNum: [{ required: true, message: "璇疯緭鍏ュ彂璐ф暟閲�", trigger: "blur" }],
+ stockLocation: [{ required: true, message: "璇疯緭鍏ュ簱浣�", trigger: "blur" }],
type: [{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }],
shippingDate: [{ required: true, message: "璇烽�夋嫨鍙戣揣鏃ユ湡", trigger: "change" }],
shippingCarNumber: [
@@ -473,6 +497,7 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
+ stockLocation: "",
};
shippingFileList.value = [];
@@ -508,6 +533,7 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
+ stockLocation: "",
};
shippingFileList.value = [];
};
@@ -522,6 +548,7 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
+ stockLocation: "",
};
shippingFileList.value = [];
};
@@ -580,6 +607,7 @@
shippingNum: shippingForm.value.shippingNum,
type: shippingForm.value.type,
shippingDate: shippingForm.value.shippingDate,
+ stockLocation: shippingForm.value.stockLocation,
shippingCarNumber: shippingForm.value.type === "璐ц溅" ? shippingForm.value.shippingCarNumber : "",
expressCompany: shippingForm.value.type === "蹇��" ? shippingForm.value.expressCompany : "",
expressNumber: shippingForm.value.type === "蹇��" ? shippingForm.value.expressNumber : "",
@@ -588,6 +616,11 @@
addShippingInfoDetail(payload).then((res) => {
proxy.$modal.msgSuccess("鍙戣揣鎴愬姛");
hideAddShippingForm();
+ getShippingInfoById(currentShippingOrder.value.id).then((infoRes) => {
+ if (infoRes.code === 200) {
+ currentShippingOrder.value = infoRes.data;
+ }
+ });
loadShippingRecords(currentShippingOrder.value.id);
getList();
});
--
Gitblit v1.9.3