From e65bfa1d46d255f307eaa057665f01c8bde0e122 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 16 六月 2026 11:14:36 +0800
Subject: [PATCH] 君歌 1.端口修改

---
 src/views/productionPlan/productionPlan/index.vue |   46 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 78d9870..416ecfb 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -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%"
@@ -377,6 +377,30 @@
       },
     },
     {
+      label: "瀹℃壒鐘舵��",
+      prop: "approvalStatus",
+      width: "100px",
+      dataType: "tag",
+      formatType: params => {
+        const typeMap = {
+          0: "info",
+          1: "warning",
+          2: "success",
+          3: "danger",
+        };
+        return typeMap[params] || "info";
+      },
+      formatData: cell => {
+        const statusMap = {
+          0: "寰呭鎵�",
+          1: "瀹℃壒涓�",
+          2: "宸查�氳繃",
+          3: "宸查┏鍥�",
+        };
+        return statusMap[cell] || "-";
+      },
+    },
+    {
       label: "宸蹭笅鍙戞暟閲�",
       prop: "quantityIssued",
       width: "120px",
@@ -444,7 +468,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);
@@ -490,6 +514,12 @@
     productId: "",
     createTime: "",
   });
+  const mergeCreateTimeDate = computed({
+    get: () => (mergeForm.createTime ? String(mergeForm.createTime).split(" ")[0] : ""),
+    set: (value) => {
+      mergeForm.createTime = value ? `${value} ${dayjs().format("HH:mm:ss")}` : "";
+    },
+  });
 
   // 瀵煎叆鐩稿叧
   const importDialogRef = ref(null);
@@ -520,6 +550,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 +799,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 +943,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 +964,7 @@
       requiredDate: row.requiredDate || "",
       promisedDeliveryDate: row.promisedDeliveryDate || "",
       remark: row.remark || "",
+      createTime: row.createTime || "",
     });
     dialogVisible.value = true;
     fetchProductOptions();

--
Gitblit v1.9.3