From c865f718a5866afa4c7d2ea0b10583a98b6fbcc4 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 24 四月 2026 10:58:40 +0800
Subject: [PATCH] 宝东 1.部署修改 2.发货台账修改
---
src/views/salesManagement/salesLedger/index.vue | 160 ++++++++++++++++++++++++++++++----------------------
1 files changed, 92 insertions(+), 68 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 6b2cfcf..8b7497f 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -51,12 +51,10 @@
width="100px"
align="center">
<template #default="scope">
-
- <el-tag v-if="scope.row.approveStatus === 1 && (!scope.row.shippingDate || !scope.row.shippingCarNumber)"
+ <el-tag v-if="scope.row.approveStatus === 1"
type="success">鍏呰冻</el-tag>
- <el-tag v-else-if="scope.row.approveStatus === 0 && (scope.row.shippingDate || scope.row.shippingCarNumber)"
- type="success">宸插嚭搴�</el-tag>
- <el-tag v-else type="danger">涓嶈冻</el-tag>
+ <el-tag v-else
+ type="danger">涓嶈冻</el-tag>
</template>
</el-table-column>
<el-table-column label="鍙戣揣鐘舵��" width="140" align="center">
@@ -66,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="sensitiveAmountFormatter" />
<el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" :formatter="sensitiveAmountFormatter" />
<el-table-column label="涓嶅惈绋庢�讳环(鍏�)" prop="taxExclusiveTotalPrice" :formatter="sensitiveAmountFormatter" />
<!--鎿嶄綔-->
- <el-table-column Width="60px" label="鎿嶄綔" align="center">
+ <el-table-column width="150" label="鎿嶄綔" align="center" fixed="right">
<template #default="scope">
<el-button
link
@@ -101,6 +80,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>
@@ -578,22 +565,16 @@
@close="closeDeliveryDia"
>
<el-form :model="deliveryForm" label-width="120px" label-position="top" :rules="deliveryRules" ref="deliveryFormRef">
- <el-row :gutter="30">
+ <el-row>
<el-col :span="24">
- <el-form-item label="鍙戣揣绫诲瀷锛�" prop="type">
- <el-select
- v-model="deliveryForm.type"
- placeholder="璇烽�夋嫨鍙戣揣绫诲瀷"
- style="width: 100%"
- >
- <el-option label="璐ц溅" value="璐ц溅" />
- <el-option label="蹇��" value="蹇��" />
- </el-select>
- </el-form-item>
+ <el-alert
+ title="纭鍚庡皢鐩存帴鍙戣揣锛�"
+ type="warning"
+ :closable="false"
+ show-icon
+ />
</el-col>
</el-row>
-
-
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -626,7 +607,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";
@@ -756,14 +737,8 @@
const deliveryFormVisible = ref(false);
const currentDeliveryRow = ref(null);
const deliveryFormData = reactive({
- deliveryForm: {
- type: "璐ц溅", // 璐ц溅, 蹇��
- },
- deliveryRules: {
- type: [
- { required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }
- ]
- },
+ deliveryForm: {},
+ deliveryRules: {},
});
const { deliveryForm, deliveryRules } = toRefs(deliveryFormData);
@@ -2018,11 +1993,6 @@
* @param row 琛屾暟鎹�
*/
const getShippingStatusText = (row) => {
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀�"宸插彂璐�"
- if (row.shippingDate || row.shippingCarNumber) {
- return '宸插彂璐�';
- }
-
// 鑾峰彇鍙戣揣鐘舵�佸瓧娈�
const status = row.shippingStatus;
@@ -2033,15 +2003,24 @@
// 鐘舵�佹槸瀛楃涓�
const statusStr = String(status).trim();
+
const statusTextMap = {
'寰呭彂璐�': '寰呭彂璐�',
'寰呭鏍�': '寰呭鏍�',
'瀹℃牳涓�': '瀹℃牳涓�',
+ '鍙戣揣涓�': '鍙戣揣涓�',
'瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
'瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
- '宸插彂璐�': '宸插彂璐�'
+ '宸插彂璐�': '宸插彂璐�',
+ '宸叉挙閿�': '宸叉挙閿�'
};
- return statusTextMap[statusStr] || '寰呭彂璐�';
+
+ // 濡傛灉鐘舵�佸湪鏄犲皠琛ㄤ腑锛岀洿鎺ヨ繑鍥炲搴旀枃鏈�
+ if (statusTextMap[statusStr]) {
+ return statusTextMap[statusStr];
+ }
+
+ return '寰呭彂璐�';
};
/**
@@ -2049,11 +2028,6 @@
* @param row 琛屾暟鎹�
*/
const getShippingStatusType = (row) => {
- // 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀虹豢鑹�
- if (row.shippingDate || row.shippingCarNumber) {
- return 'success';
- }
-
// 鑾峰彇鍙戣揣鐘舵�佸瓧娈�
const status = row.shippingStatus;
@@ -2064,20 +2038,29 @@
// 鐘舵�佹槸瀛楃涓�
const statusStr = String(status).trim();
+
const typeTextMap = {
'寰呭彂璐�': 'info',
'寰呭鏍�': 'info',
'瀹℃牳涓�': 'warning',
'瀹℃牳鎷掔粷': 'danger',
+ '宸叉挙閿�': 'warning',
'瀹℃牳閫氳繃': 'success',
- '宸插彂璐�': 'success'
+ '宸插彂璐�': 'success',
+ '鍙戣揣涓�': 'warning'
};
- return typeTextMap[statusStr] || 'info';
+
+ // 濡傛灉鐘舵�佸湪鏄犲皠琛ㄤ腑锛岀洿鎺ヨ繑鍥炲搴旂被鍨�
+ if (typeTextMap[statusStr]) {
+ return typeTextMap[statusStr];
+ }
+
+ return 'info';
};
/**
* 鍒ゆ柇鏄惁鍙互鍙戣揣
- * 鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐у拰瀹℃牳鎷掔粷鐨勬椂鍊欐墠鍙互鍙戣揣
+ * 鍙湁鍦ㄤ骇鍝佺姸鎬佹槸鍏呰冻锛屽彂璐х姸鎬佹槸寰呭彂璐с�佸鏍告嫆缁濆拰宸叉挙閿�鐨勬椂鍊欐墠鍙互鍙戣揣
* @param row 琛屾暟鎹�
*/
const canShip = (row) => {
@@ -2089,14 +2072,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 === '瀹℃牳鎷掔粷';
+};
+
+/**
+ * 鍒ゆ柇鏄惁鍙互鎾ら攢鍙戣揣
+ * 鍙湁褰撳彂璐ф暟閲忕瓑浜庨��璐ф暟閲忎笖閮戒笉涓�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(() => {});
};
/**
@@ -2133,13 +2158,12 @@
const submitDelivery = () => {
proxy.$refs["deliveryFormRef"].validate((valid) => {
if (valid) {
- // 淇濆瓨褰撳墠灞曞紑鐨勮ID锛屼互渚垮彂璐у悗閲嶆柊鍔犺浇瀛愯〃鏍兼暟鎹�
const currentExpandedKeys = [...expandedRowKeys.value];
const salesLedgerId = currentDeliveryRow.value.salesLedgerId;
addShippingInfo({
salesLedgerId: salesLedgerId,
salesLedgerProductId: currentDeliveryRow.value.id,
- type: deliveryForm.value.type,
+ shippingTotal: currentDeliveryRow.value.quantity,
})
.then(() => {
proxy.$modal.msgSuccess("鍙戣揣鎴愬姛");
--
Gitblit v1.9.3