From 9c1e0958af114e4ae2bfaaade28d49753268e9f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 06 七月 2026 13:54:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_大罗素马铃薯new' into dev_新疆_大罗素马铃薯new
---
src/views/productionPlan/productionPlan/index.vue | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 78d9870..6ad0505 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -13,7 +13,7 @@
style="width: 160px;"
@keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="閿�鍞悎鍚屽彿:"
+ <el-form-item label="璁㈠崟鍙�:"
prop="salesContractNo">
<el-input v-model="searchForm.salesContractNo"
placeholder="璇疯緭鍏�"
@@ -140,7 +140,7 @@
style="width: 100%" />
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿">
- <el-date-picker v-model="mergeForm.createTime"
+ <el-date-picker v-model="mergeCreateTimeDate"
type="date"
value-format="YYYY-MM-DD"
style="width: 100%" />
@@ -235,7 +235,7 @@
</el-form-item>
<el-form-item label="鍒涘缓鏃堕棿"
prop="createTime">
- <el-date-picker v-model="form.createTime"
+ <el-date-picker v-model="formCreateTimeDate"
type="date"
value-format="YYYY-MM-DD"
style="width: 100%"
@@ -318,13 +318,17 @@
},
},
{
- label: "閿�鍞悎鍚屽彿",
+ label: "璁㈠崟鍙�",
prop: "salesContractNo",
width: "200px",
dataType: "slot",
slot: "salesContractNo",
},
-
+ {
+ label: "閿�鍞�诲悎鍚屽彿",
+ prop: "masterContractNo",
+ width: "150px",
+ },
{
label: "浜у搧鍚嶇О",
prop: "productName",
@@ -444,7 +448,7 @@
Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0);
mergeForm.planCompleteTime = row.requiredDate || "";
mergeForm.productId = row.productId || "";
- mergeForm.createTime = new Date().toISOString().split("T")[0];
+ mergeForm.createTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
mergeForm.ids = [row.id];
sumAssignedQuantity.value =
Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0);
@@ -461,6 +465,7 @@
clickFun: row => {
handleDelete(row);
},
+ hasPermi: ['productionPlan:productionPlan:remove']
},
],
},
@@ -489,6 +494,12 @@
planCompleteTime: "",
productId: "",
createTime: "",
+ });
+ const mergeCreateTimeDate = computed({
+ get: () => (mergeForm.createTime ? String(mergeForm.createTime).split(" ")[0] : ""),
+ set: (value) => {
+ mergeForm.createTime = value ? `${value} ${dayjs().format("HH:mm:ss")}` : "";
+ },
});
// 瀵煎叆鐩稿叧
@@ -520,6 +531,12 @@
promisedDeliveryDate: "",
remark: "",
createTime: "",
+ });
+ const formCreateTimeDate = computed({
+ get: () => (form.createTime ? String(form.createTime).split(" ")[0] : ""),
+ set: (value) => {
+ form.createTime = value ? `${value} ${dayjs().format("HH:mm:ss")}` : "";
+ },
});
const rules = reactive({
productId: [{ required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" }],
@@ -763,6 +780,7 @@
mergeForm.totalAssignedQuantity = totalAssignedQuantity;
mergeForm.planCompleteTime = firstRow.requiredDate || "";
mergeForm.productId = firstRow.productId || "";
+ mergeForm.createTime = dayjs().format("YYYY-MM-DD HH:mm:ss");
mergeForm.ids = selectedRows.value.map(row => row.id);
// 鎵撳紑寮圭獥
@@ -906,7 +924,7 @@
requiredDate: "",
promisedDeliveryDate: "",
remark: "",
- createTime: new Date().toISOString().split("T")[0],
+ createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
});
dialogVisible.value = true;
fetchProductOptions();
@@ -927,6 +945,7 @@
requiredDate: row.requiredDate || "",
promisedDeliveryDate: row.promisedDeliveryDate || "",
remark: row.remark || "",
+ createTime: row.createTime || "",
});
dialogVisible.value = true;
fetchProductOptions();
--
Gitblit v1.9.3