From dfad6a2a0faa1c2ebd31640dcc865013a2017b1b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 22 六月 2026 21:18:21 +0800
Subject: [PATCH] fix: 新增订单移除交付日期
---
src/views/salesManagement/salesLedger/index.vue | 53 +++++------------------------------------------------
1 files changed, 5 insertions(+), 48 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 349c02a..b2e9b76 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -94,19 +94,6 @@
:disabled="isReviewedEdit" />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="浜よ揣鏃ユ湡锛�"
- prop="deliveryDate">
- <el-date-picker style="width: 100%"
- v-model="form.deliveryDate"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- type="date"
- placeholder="璇烽�夋嫨"
- clearable
- :disabled="isReviewedEdit" />
- </el-form-item>
- </el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
@@ -1221,19 +1208,7 @@
:disabled="operationType === 'view' || isReviewedEdit" />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="浜よ揣鏃ユ湡锛�"
- prop="deliveryDate">
- <el-date-picker style="width: 100%"
- v-model="form.deliveryDate"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- type="date"
- placeholder="璇烽�夋嫨"
- clearable
- :disabled="operationType === 'view' || isReviewedEdit" />
- </el-form-item>
- </el-col>
+
</el-row>
<el-row :gutter="30">
<el-col :span="12">
@@ -2825,23 +2800,14 @@
customerId: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
entryPerson: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
entryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
- deliveryDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+
executionDate: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
},
});
const { form, rules } = toRefs(data);
const { form: searchForm } = useFormData(data.searchForm);
- // 鏂板鍙拌处锛氬綍鍏ユ棩鏈熷彉鏇存椂锛屼氦璐ф棩鏈熼粯璁や繚鎸佷负褰曞叆鏃ユ湡鍚庣 7 澶�
- watch(
- () => [operationType.value, form.value?.entryDate],
- () => {
- if (operationType.value !== "add") return;
- const ed = form.value?.entryDate;
- if (!ed) return;
- form.value.deliveryDate = dayjs(ed).add(7, "day").format("YYYY-MM-DD");
- }
- );
+
// 浜у搧琛ㄥ崟寮规鏁版嵁
const productFormVisible = ref(false);
const productOperationType = ref("");
@@ -4087,13 +4053,11 @@
form.value.entryPerson = Number(userStore.id);
form.value.entryDate = getCurrentDate();
form.value.executionDate = detail.executionDate || getCurrentDate();
- form.value.deliveryDate = detail.deliveryDate;
form.value.paymentMethod = detail.paymentMethod;
form.value.contractAmount = detail.contractAmount;
form.value.remarks = detail.remarks;
form.value.customerRemarks = detail.customerRemarks ?? detail.customer_remarks ?? "";
productData.value = detail.productData || [];
- form.value.deliveryDate = dayjs(form.value.entryDate).add(7, "day").format("YYYY-MM-DD");
await appendEditablePlaceholderRow();
dialogFormVisible.value = !keepPageMode;
};
@@ -4561,7 +4525,7 @@
// 娣诲姞琛ㄨ绫诲悕鏂规硶
const tableRowClassName = ({ row }) => {
- if (!row.deliveryDate) return "";
+ if (!row.deliveryDate || row.stockStatus === 0) return "";
if (row.isFh) return "";
const diff = row.deliveryDaysDiff;
@@ -4622,9 +4586,6 @@
form.value.entryDate = getCurrentDate();
form.value.executionDate = getCurrentDate();
form.value.customerRemarks = "";
- form.value.deliveryDate = dayjs(form.value.entryDate)
- .add(7, "day")
- .format("YYYY-MM-DD");
await appendEditablePlaceholderRow();
};
@@ -4742,11 +4703,7 @@
// }
// });
form.value.entryDate = getCurrentDate(); // 璁剧疆榛樿褰曞叆鏃ユ湡涓哄綋鍓嶆棩鏈�
- if (type === "add") {
- form.value.deliveryDate = dayjs(form.value.entryDate)
- .add(7, "day")
- .format("YYYY-MM-DD");
- }
+
dialogFormVisible.value = true;
};
--
Gitblit v1.9.3