From a798cdaa46f693eebabec6d999bfe32d055f4c48 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 14 八月 2026 17:23:14 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_pro_山西_晋和园
---
src/views/productionPlan/productionPlan/index.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index fd6c1a3..1acb28f 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -456,7 +456,7 @@
type: "danger",
link: true,
showHide: row => {
- return row.status == 0;
+ return row.status == 0 && row.source != "閿�鍞�";
},
clickFun: row => {
handleDelete(row);
@@ -491,9 +491,12 @@
createTime: "",
});
const mergeCreateTimeDate = computed({
- get: () => (mergeForm.createTime ? String(mergeForm.createTime).split(" ")[0] : ""),
- set: (value) => {
- mergeForm.createTime = value ? `${value} ${dayjs().format("HH:mm:ss")}` : "";
+ get: () =>
+ mergeForm.createTime ? String(mergeForm.createTime).split(" ")[0] : "",
+ set: value => {
+ mergeForm.createTime = value
+ ? `${value} ${dayjs().format("HH:mm:ss")}`
+ : "";
},
});
@@ -529,7 +532,7 @@
});
const formCreateTimeDate = computed({
get: () => (form.createTime ? String(form.createTime).split(" ")[0] : ""),
- set: (value) => {
+ set: value => {
form.createTime = value ? `${value} ${dayjs().format("HH:mm:ss")}` : "";
},
});
--
Gitblit v1.9.3