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 | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 114 insertions(+), 6 deletions(-)
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index 748480c..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">
@@ -39,7 +41,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 +54,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
@@ -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">
@@ -115,6 +125,10 @@
<div class="summary-item">
<div class="summary-label">宸插彂璐ф暟閲�</div>
<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.returnTotal || 0 }}</div>
</div>
<div class="summary-item">
<div class="summary-label">寰呭彂璐ф暟閲�</div>
@@ -169,6 +183,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.returnTotal || 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 +212,18 @@
preview-teleported
/>
</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"
+ size="small"
+ @click="handleRevokeShipping(record)">
+ 鎾ら攢鍙戣揣
+ </el-button>
</div>
</div>
</div>
@@ -244,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%"
/>
@@ -327,6 +364,7 @@
addShippingInfoDetail,
updateShippingInfoDetail,
delShippingInfoDetail,
+ getShippingInfoById,
} from "@/api/salesManagement/deliveryLedger.js";
import { delLedgerFile } from "@/api/salesManagement/salesLedger.js";
@@ -356,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: [
@@ -442,6 +482,11 @@
return;
}
+ if (type === 'edit' && isRevoked(row.status)) {
+ proxy.$modal.msgWarning("宸叉挙閿�鐘舵�佷笉鑳藉垎鎵瑰彂璐�");
+ return;
+ }
+
dialogMode.value = type === 'edit' ? 'edit' : 'view';
currentShippingOrder.value = row;
showAddForm.value = false;
@@ -452,6 +497,7 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
+ stockLocation: "",
};
shippingFileList.value = [];
@@ -487,6 +533,7 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
+ stockLocation: "",
};
shippingFileList.value = [];
};
@@ -501,6 +548,7 @@
shippingCarNumber: "",
expressCompany: "",
expressNumber: "",
+ stockLocation: "",
};
shippingFileList.value = [];
};
@@ -519,6 +567,30 @@
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(() => {});
+};
+
// 鎻愪氦鍙戣揣
const submitShipping = () => {
proxy.$refs["shippingFormRef"].validate((valid) => {
@@ -535,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 : "",
@@ -543,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();
});
@@ -741,6 +819,7 @@
'瀹℃牳涓�': '瀹℃牳涓�',
'瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
'瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
+ '宸叉挙閿�': '宸叉挙閿�',
'0': '寰呭鏍�',
'1': '瀹℃牳涓�',
'2': '瀹℃牳鎷掔粷',
@@ -769,6 +848,7 @@
'瀹℃牳涓�': 'warning',
'瀹℃牳鎷掔粷': 'danger',
'瀹℃牳閫氳繃': 'success',
+ '宸叉挙閿�': 'warning',
'0': 'info',
'1': 'warning',
'2': 'danger',
@@ -799,6 +879,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 +973,10 @@
&.shipped {
color: #67C23A;
+ }
+
+ &.returned {
+ color: #F56C6C;
}
&.waiting {
@@ -994,9 +1090,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;
--
Gitblit v1.9.3