From 859d732d9d3f3871be7ce59069f87ea00e0e24cb Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 17 三月 2026 16:53:44 +0800
Subject: [PATCH] 军泰伟业 1.仓储物流需要加上库位，库位暂时分为外购、自制、委外三种类型 2.生产订单加上库存数量，方便实时查看 3.产品发货后，若部分产品退回，可修改订单发货数量（减去退回的产品数量），若订单产品全部退回，可对发货的订单进行取消撤回操作
---
src/views/salesManagement/salesLedger/index.vue | 115 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 79 insertions(+), 36 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index fcc9cf4..4ec95ea 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -64,34 +64,15 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip />
- <el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip />
- <el-table-column label="鍙戣揣杞︾墝" minWidth="100px" align="center">
- <template #default="scope">
- <div>
- <el-tag type="success" v-if="scope.row.shippingCarNumber">{{ scope.row.shippingCarNumber }}</el-tag>
- <el-tag v-else type="info">-</el-tag>
- </div>
- </template>
- </el-table-column>
- <el-table-column label="鍙戣揣鏃ユ湡"
- minWidth="100px"
- align="center">
- <template #default="scope">
- <div>
- <div v-if="scope.row.shippingDate">{{ scope.row.shippingDate }}</div>
- <el-tag v-else
- type="info">-</el-tag>
- </div>
- </template>
- </el-table-column>
+ <el-table-column label="宸插彂璐ф暟閲�" prop="shippingNum" align="center" />
+ <el-table-column label="宸查��璐ф暟閲�" prop="returnNum" align="center" />
<el-table-column label="鏁伴噺" prop="quantity" />
<el-table-column label="绋庣巼(%)" prop="taxRate" />
<el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" :formatter="formattedNumber" />
<el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="formattedNumber" />
<el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="formattedNumber" />
<!--鎿嶄綔-->
- <el-table-column width="100" label="鎿嶄綔" align="center" fixed="right">
+ <el-table-column width="150" label="鎿嶄綔" align="center" fixed="right">
<template #default="scope">
<el-button
link
@@ -100,6 +81,14 @@
:disabled="!canShip(scope.row)"
@click="openDeliveryForm(scope.row)">
鍙戣揣
+ </el-button>
+ <el-button
+ link
+ type="danger"
+ size="small"
+ :disabled="!canRevokeShipping(scope.row)"
+ @click="handleRevokeShipping(scope.row)">
+ 鎾ら攢鍙戣揣
</el-button>
</template>
</el-table-column>
@@ -650,7 +639,7 @@
delLedger,
addOrUpdateSalesLedgerProduct,
delProduct,
- delLedgerFile, getProductInventory,
+ delLedgerFile, getProductInventory, cancelDelivery,
} from "@/api/salesManagement/salesLedger.js";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import useFormData from "@/hooks/useFormData.js";
@@ -1964,11 +1953,6 @@
* @param row 琛屾暟鎹�
*/
const getShippingStatusText = (row) => {
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀�"宸插彂璐�"
- if (row.shippingDate || row.shippingCarNumber) {
- return '宸插彂璐�';
- }
-
// 鑾峰彇鍙戣揣鐘舵�佸瓧娈�
const status = row.shippingStatus;
@@ -1979,6 +1963,17 @@
// 鐘舵�佹槸瀛楃涓�
const statusStr = String(status).trim();
+
+ // 濡傛灉鐘舵�佹槸"宸叉挙閿�"锛岀洿鎺ヨ繑鍥�
+ if (statusStr === '宸叉挙閿�') {
+ return '宸叉挙閿�';
+ }
+
+ // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀�"宸插彂璐�"
+ if (row.shippingDate || row.shippingCarNumber) {
+ return '宸插彂璐�';
+ }
+
const statusTextMap = {
'寰呭彂璐�': '寰呭彂璐�',
'寰呭鏍�': '寰呭鏍�',
@@ -1996,11 +1991,6 @@
* @param row 琛屾暟鎹�
*/
const getShippingStatusType = (row) => {
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀虹豢鑹�
- if (row.shippingDate || row.shippingCarNumber) {
- return 'success';
- }
-
// 鑾峰彇鍙戣揣鐘舵�佸瓧娈�
const status = row.shippingStatus;
@@ -2011,12 +2001,23 @@
// 鐘舵�佹槸瀛楃涓�
const statusStr = String(status).trim();
+
+ // 濡傛灉鐘舵�佹槸"宸叉挙閿�"锛屾樉绀烘鑹�
+ if (statusStr === '宸叉挙閿�') {
+ return 'warning';
+ }
+
+ // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀虹豢鑹�
+ if (row.shippingDate || row.shippingCarNumber) {
+ return 'success';
+ }
+
const typeTextMap = {
'寰呭彂璐�': 'info',
'寰呭鏍�': 'info',
'瀹℃牳涓�': 'warning',
'瀹℃牳鎷掔粷': 'danger',
- '宸叉挙閿�': 'danger',
+ '宸叉挙閿�': 'warning',
'瀹℃牳閫氳繃': 'success',
'宸插彂璐�': 'success'
};
@@ -2037,14 +2038,56 @@
// 鑾峰彇鍙戣揣鐘舵��
const shippingStatus = row.shippingStatus;
+ // 濡傛灉鐘舵�佷负绌烘垨鏈畾涔夛紝榛樿涓�"寰呭彂璐�"
+ if (shippingStatus === null || shippingStatus === undefined || shippingStatus === '') {
+ return true;
+ }
+
+ // 鐘舵�佹槸瀛楃涓�
+ const statusStr = String(shippingStatus).trim();
+
+ // 濡傛灉鐘舵�佹槸"宸叉挙閿�"锛屽厑璁稿彂璐�
+ if (statusStr === '宸叉挙閿�') {
+ return true;
+ }
+
// 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屼笉鑳藉啀娆″彂璐�
if (row.shippingDate || row.shippingCarNumber) {
return false;
}
// 鍙戣揣鐘舵�佸繀椤绘槸"寰呭彂璐�"銆�"瀹℃牳鎷掔粷"鎴�"宸叉挙閿�"
- const statusStr = shippingStatus ? String(shippingStatus).trim() : '';
- return statusStr === '寰呭彂璐�' || statusStr === '瀹℃牳鎷掔粷' || statusStr === '宸叉挙閿�';
+ return statusStr === '寰呭彂璐�' || statusStr === '瀹℃牳鎷掔粷';
+};
+
+/**
+ * 鍒ゆ柇鏄惁鍙互鎾ら攢鍙戣揣
+ * 鍙湁褰撳彂璐ф暟閲忕瓑浜庨��璐ф暟閲忎笖閮戒笉涓�0鏃舵墠鍙互鎾ら攢
+ * @param row 琛屾暟鎹�
+ */
+const canRevokeShipping = (row) => {
+ const shippingNum = row.shippingNum || 0;
+ const returnNum = row.returnNum || 0;
+ return shippingNum > 0 && returnNum > 0 && shippingNum === returnNum;
+};
+
+/**
+ * 鎾ら攢鍙戣揣
+ * @param row 琛屾暟鎹�
+ */
+const handleRevokeShipping = (row) => {
+ ElMessageBox.confirm("姝ゆ搷浣滃皢鎾ら攢璇ュ彂璐ц褰曪紝鏄惁纭锛�", "鎾ら攢鍙戣揣", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ cancelDelivery({ id: row.id }).then(() => {
+ proxy.$modal.msgSuccess("鎾ら攢鎴愬姛");
+ getList();
+ });
+ })
+ .catch(() => {});
};
/**
--
Gitblit v1.9.3