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/deliveryLedger/index.vue | 79 +++++++++++++++++++
src/api/salesManagement/salesLedger.js | 9 ++
src/views/salesManagement/salesLedger/index.vue | 115 +++++++++++++++++++---------
src/views/salesManagement/paymentShipping/index.vue | 5 +
src/views/salesManagement/returnOrder/index.vue | 11 +-
5 files changed, 176 insertions(+), 43 deletions(-)
diff --git a/src/api/salesManagement/salesLedger.js b/src/api/salesManagement/salesLedger.js
index 6548927..4a49a67 100644
--- a/src/api/salesManagement/salesLedger.js
+++ b/src/api/salesManagement/salesLedger.js
@@ -116,4 +116,13 @@
method: "get",
params: query,
});
+}
+
+// 鎾ら攢鍙戣揣
+export function cancelDelivery(query) {
+ return request({
+ url: "/sales/product/cancelDelivery",
+ method: "post",
+ data: query,
+ });
}
\ No newline at end of file
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index 748480c..efd32a7 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -39,7 +39,7 @@
/>
</template>
</el-table-column>
- <el-table-column label="瀹℃牳鐘舵��" prop="status" align="center" width="120">
+ <el-table-column label="鐘舵��" prop="status" align="center" width="120">
<template #default="scope">
<el-tag :type="getApprovalStatusType(scope.row.status)">
{{ getApprovalStatusText(scope.row.status) }}
@@ -52,7 +52,7 @@
link
type="primary"
size="small"
- :disabled="(scope.row.waitShippingTotal || 0) <= 0"
+ :disabled="(scope.row.waitShippingTotal || 0) <= 0 || isRevoked(scope.row.status)"
@click="openForm('edit', scope.row)">鍒嗘壒鍙戣揣</el-button>
<el-button
link
@@ -117,6 +117,10 @@
<div class="summary-value shipped">{{ currentShippingOrder.shippingSuccessTotal || 0 }}</div>
</div>
<div class="summary-item">
+ <div class="summary-label">宸查��璐ф暟閲�</div>
+ <div class="summary-value returned">{{ currentShippingOrder.returnedQuantity || 0 }}</div>
+ </div>
+ <div class="summary-item">
<div class="summary-label">寰呭彂璐ф暟閲�</div>
<div class="summary-value waiting">{{ currentShippingOrder.waitShippingTotal || 0 }}</div>
</div>
@@ -169,6 +173,10 @@
<span class="info-label">鍙戣揣鏁伴噺</span>
<span class="info-value quantity">{{ record.shippingNum }}</span>
</div>
+ <div class="info-row">
+ <span class="info-label">閫�璐ф暟閲�</span>
+ <span class="info-value returned">{{ record.returnNum || 0 }}</span>
+ </div>
<div class="info-row" v-if="record.type === '璐ц溅'">
<span class="info-label">杞︾墝鍙�</span>
<span class="info-value">{{ record.shippingCarNumber || '--' }}</span>
@@ -194,6 +202,14 @@
preview-teleported
/>
</div>
+ </div>
+ <div class="record-actions" v-if="canRevokeShipping(record)">
+ <el-button
+ type="danger"
+ size="small"
+ @click="handleRevokeShipping(record)">
+ 鎾ら攢鍙戣揣
+ </el-button>
</div>
</div>
</div>
@@ -442,6 +458,11 @@
return;
}
+ if (type === 'edit' && isRevoked(row.status)) {
+ proxy.$modal.msgWarning("宸叉挙閿�鐘舵�佷笉鑳藉垎鎵瑰彂璐�");
+ return;
+ }
+
dialogMode.value = type === 'edit' ? 'edit' : 'view';
currentShippingOrder.value = row;
showAddForm.value = false;
@@ -517,6 +538,30 @@
if (!currentShippingOrder.value) return false;
const waitShipping = currentShippingOrder.value.waitShippingTotal || 0;
return waitShipping > 0;
+};
+
+// 鏄惁鍙互鎾ら攢鍙戣揣
+const canRevokeShipping = (record) => {
+ const shippingNum = record.shippingNum || 0;
+ const returnNum = record.returnNum || 0;
+ return shippingNum > 0 && returnNum > 0 && shippingNum === returnNum;
+};
+
+// 鎾ら攢鍙戣揣
+const handleRevokeShipping = (record) => {
+ ElMessageBox.confirm("姝ゆ搷浣滃皢鎾ら攢璇ュ彂璐ц褰曪紝鏄惁纭锛�", "鎾ら攢鍙戣揣", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ updateShippingInfoDetail({ ...record, status: 3 }).then((res) => {
+ proxy.$modal.msgSuccess("鎾ら攢鎴愬姛");
+ loadShippingRecords(currentShippingOrder.value.id);
+ getList();
+ });
+ })
+ .catch(() => {});
};
// 鎻愪氦鍙戣揣
@@ -741,6 +786,7 @@
'瀹℃牳涓�': '瀹℃牳涓�',
'瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
'瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
+ '宸叉挙閿�': '宸叉挙閿�',
'0': '寰呭鏍�',
'1': '瀹℃牳涓�',
'2': '瀹℃牳鎷掔粷',
@@ -769,6 +815,7 @@
'瀹℃牳涓�': 'warning',
'瀹℃牳鎷掔粷': 'danger',
'瀹℃牳閫氳繃': 'success',
+ '宸叉挙閿�': 'warning',
'0': 'info',
'1': 'warning',
'2': 'danger',
@@ -799,6 +846,18 @@
}
const statusStr = String(status).trim();
return statusStr === '瀹℃牳涓�' || statusStr === '1';
+};
+
+// 妫�鏌ョ姸鎬佹槸鍚︿负"宸叉挙閿�"
+const isRevoked = (status) => {
+ if (status === null || status === undefined || status === '') {
+ return false;
+ }
+ if (typeof status === 'number') {
+ return status === 3;
+ }
+ const statusStr = String(status).trim();
+ return statusStr === '宸叉挙閿�' || statusStr === '3';
};
onMounted(() => {
@@ -881,6 +940,10 @@
&.shipped {
color: #67C23A;
+ }
+
+ &.returned {
+ color: #F56C6C;
}
&.waiting {
@@ -994,9 +1057,21 @@
color: #409EFF;
font-size: 16px;
}
+
+ &.returned {
+ font-weight: bold;
+ color: #F56C6C;
+ font-size: 16px;
+ }
}
}
+ .record-actions {
+ margin-top: 12px;
+ padding-top: 12px;
+ border-top: 1px solid #EBEEF5;
+ }
+
.record-images {
display: flex;
gap: 8px;
diff --git a/src/views/salesManagement/paymentShipping/index.vue b/src/views/salesManagement/paymentShipping/index.vue
index 56caf3b..69b4b05 100644
--- a/src/views/salesManagement/paymentShipping/index.vue
+++ b/src/views/salesManagement/paymentShipping/index.vue
@@ -27,6 +27,7 @@
<el-option label="寰呭彂璐�" value="寰呭彂璐�"></el-option>
<el-option label="宸插彂璐�" value="宸插彂璐�"></el-option>
<el-option label="宸茬鏀�" value="宸茬鏀�"></el-option>
+ <el-option label="宸叉挙閿�" value="宸叉挙閿�"></el-option>
</el-select>
</el-col>
<el-col :span="6">
@@ -148,6 +149,7 @@
<el-option label="寰呭彂璐�" value="寰呭彂璐�"></el-option>
<el-option label="宸插彂璐�" value="宸插彂璐�"></el-option>
<el-option label="宸茬鏀�" value="宸茬鏀�"></el-option>
+ <el-option label="宸叉挙閿�" value="宸叉挙閿�"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -346,7 +348,8 @@
const statusMap = {
'寰呭彂璐�': 'warning',
'宸插彂璐�': 'primary',
- '宸茬鏀�': 'success'
+ '宸茬鏀�': 'success',
+ '宸叉挙閿�': 'warning'
}
return statusMap[status] || 'info'
}
diff --git a/src/views/salesManagement/returnOrder/index.vue b/src/views/salesManagement/returnOrder/index.vue
index 5a5aa05..588a5e8 100644
--- a/src/views/salesManagement/returnOrder/index.vue
+++ b/src/views/salesManagement/returnOrder/index.vue
@@ -120,7 +120,8 @@
const documentStatusOptions = ref([
{ label: "寰呭鐞�", value: 0 },
- { label: "宸插鐞�", value: 1 }
+ { label: "宸插鐞�", value: 1 },
+ { label: "宸叉挙閿�", value: 2 }
]);
const defaultColumns = [
@@ -144,7 +145,7 @@
{ name: "缂栬緫", disabled: (row) => row.status !== 0, type: "text", clickFun: (row) => openForm("edit", row) },
{ name: "閫�娆惧鐞�", disabled: (row) => row.status !== 0, type: "text", clickFun: (row) => handleRowHandle(row) },
{ name: "璇︽儏", type: "text", clickFun: (row) => openDetail(row) },
- { name: "鍒犻櫎", disabled: (row) => row.status !== 0, type: "text", clickFun: (row) => handleRowDelete(row) },
+ { name: "鍒犻櫎", disabled: (row) => row.status === 1 || row.status === 2, type: "text", clickFun: (row) => handleRowDelete(row) },
],
},
];
@@ -206,7 +207,8 @@
const getStatusType = (status) => {
const statusMap = {
0: "warning",
- 1: "success"
+ 1: "success",
+ 2: "warning"
};
return statusMap[status] || "info";
};
@@ -214,7 +216,8 @@
const getStatusText = (status) => {
const statusMap = {
0: "寰呭鐞�",
- 1: "宸插鐞�"
+ 1: "宸插鐞�",
+ 2: "宸叉挙閿�"
};
return statusMap[status] || "鏈煡";
};
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