From e1869c67a48da088650b0a1238ff718e5fc4138c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 29 九月 2026 09:15:21 +0800
Subject: [PATCH] refactor(data): 优化参数维护和报表数据显示格式
---
src/views/salesManagement/deliveryLedger/index.vue | 92 +++-------------------------------------------
1 files changed, 6 insertions(+), 86 deletions(-)
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index af41f00..90ca018 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -22,16 +22,6 @@
@change="handleQuery"
/>
</el-form-item>
- <el-form-item label="蹇�掑崟鍙凤細">
- <el-input
- v-model="searchForm.expressNumber"
- placeholder="璇疯緭鍏�"
- clearable
- prefix-icon="Search"
- style="width: 200px"
- @change="handleQuery"
- />
- </el-form-item>
<el-form-item label="椤圭洰鍚嶇О锛�" prop="projectId">
<el-select
v-model="searchForm.projectId"
@@ -133,16 +123,6 @@
show-overflow-tooltip
/>
<el-table-column
- label="蹇�掑叕鍙�"
- prop="expressCompany"
- show-overflow-tooltip
- />
- <el-table-column
- label="蹇�掑崟鍙�"
- prop="expressNumber"
- show-overflow-tooltip
- />
- <el-table-column
label="瀹℃牳鐘舵��"
prop="status"
align="center"
@@ -225,7 +205,6 @@
@change="handleShippingTypeChange"
>
<el-option label="璐ц溅" value="璐ц溅" />
- <el-option label="蹇��" value="蹇��" />
</el-select>
</el-form-item>
</el-col>
@@ -246,31 +225,11 @@
</el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="24" v-if="form.type === '璐ц溅'">
+ <el-col :span="24">
<el-form-item label="鍙戣揣杞︾墝鍙凤細" prop="shippingCarNumber">
<el-input
v-model="form.shippingCarNumber"
placeholder="璇疯緭鍏ュ彂璐ц溅鐗屽彿"
- clearable
- />
- </el-form-item>
- </el-col>
- <el-col :span="24" v-else>
- <el-form-item label="蹇�掑叕鍙革細" prop="expressCompany">
- <el-input
- v-model="form.expressCompany"
- placeholder="璇疯緭鍏ュ揩閫掑叕鍙�"
- clearable
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="30" v-if="form.type === '蹇��'">
- <el-col :span="24">
- <el-form-item label="蹇�掑崟鍙凤細" prop="expressNumber">
- <el-input
- v-model="form.expressNumber"
- placeholder="璇疯緭鍏ュ揩閫掑崟鍙�"
clearable
/>
</el-form-item>
@@ -377,12 +336,6 @@
}}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{
detailRow.shippingCarNumber || "--"
- }}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑叕鍙�">{{
- detailRow.expressCompany || "--"
- }}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{
- detailRow.expressNumber || "--"
}}</el-descriptions-item>
<el-descriptions-item label="鍑哄簱鍗曞彿" :span="2">{{
detailRow.outboundBatches || "--"
@@ -516,7 +469,6 @@
searchForm: {
salesContractNo: undefined,
shippingCarNumber: undefined,
- expressNumber: undefined,
projectId: undefined,
shippingDateRange: []
},
@@ -526,11 +478,9 @@
customerName: "",
specificationModel: "",
productName: "",
- type: "璐ц溅", // 璐ц溅, 蹇��
+ type: "璐ц溅",
shippingDate: "",
shippingCarNumber: "",
- expressCompany: "",
- expressNumber: "", // 蹇�掑崟鍙�
},
rules: {
salesContractNo: [
@@ -547,13 +497,6 @@
{
validator: (_, value, callback) =>
validateShippingCarNumber(value, callback),
- trigger: "blur",
- },
- ],
- expressCompany: [
- {
- validator: (_, value, callback) =>
- validateExpressCompany(value, callback),
trigger: "blur",
},
],
@@ -625,8 +568,6 @@
type: row.type || "璐ц溅",
shippingDate: row.shippingDate || getCurrentDate(),
shippingCarNumber: row.shippingCarNumber ?? "",
- expressCompany: row.expressCompany ?? "",
- expressNumber: row.expressNumber ?? "",
shippingDocument: row.shippingDocument ?? "",
isReconciled: row.isReconciled ?? 0,
statementArchivingStatus: row.statementArchivingStatus ?? "",
@@ -738,12 +679,7 @@
id: form.value.id,
type: form.value.type,
shippingDate: form.value.shippingDate,
- shippingCarNumber:
- form.value.type === "璐ц溅" ? form.value.shippingCarNumber : "",
- expressCompany:
- form.value.type === "蹇��" ? form.value.expressCompany : "",
- expressNumber:
- form.value.type === "蹇��" ? form.value.expressNumber : "",
+ shippingCarNumber: form.value.shippingCarNumber,
storageBlobDTOs: deliveryFileList.value || [],
};
deductStock(payload).then((res) => {
@@ -840,17 +776,9 @@
});
};
-// 鍙戣揣绫诲瀷鏍¢獙锛氳揣杞︽椂瑕佹眰杞︾墝锛屽揩閫掓椂瑕佹眰蹇�掑叕鍙�
+// 鍙戣揣杞︾墝鍙锋牎楠�
const validateShippingCarNumber = (value, callback) => {
- if (form.value.type === "璐ц溅") {
- if (!value) return callback(new Error("璇疯緭鍏ュ彂璐ц溅鐗屽彿"));
- }
- callback();
-};
-const validateExpressCompany = (value, callback) => {
- if (form.value.type === "蹇��") {
- if (!value) return callback(new Error("璇疯緭鍏ュ揩閫掑叕鍙�"));
- }
+ if (!value) return callback(new Error("璇疯緭鍏ュ彂璐ц溅鐗屽彿"));
callback();
};
@@ -925,15 +853,7 @@
}
}
-// 鍙戣揣绫诲瀷鍒囨崲鏃舵竻绌哄搴斿瓧娈�
-const handleShippingTypeChange = (val) => {
- if (val === "璐ц溅") {
- form.value.expressCompany = "";
- form.value.expressNumber = "";
- } else {
- form.value.shippingCarNumber = "";
- }
-};
+const handleShippingTypeChange = () => {};
// 鑾峰彇瀹℃牳鐘舵�佹枃鏈�
const getApprovalStatusText = (status) => {
--
Gitblit v1.9.3