From 6f1acfd2086a1f8c2cb80afd3db4e534e44d545e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 14 八月 2026 10:33:51 +0800
Subject: [PATCH] fix: 报工明细创建日期格式化

---
 src/views/productionPlan/productionPlan/index.vue |   44 ++++++++++++++++----------------------------
 1 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/src/views/productionPlan/productionPlan/index.vue b/src/views/productionPlan/productionPlan/index.vue
index 47e6bb7..07cf781 100644
--- a/src/views/productionPlan/productionPlan/index.vue
+++ b/src/views/productionPlan/productionPlan/index.vue
@@ -139,16 +139,11 @@
                            @change="onBlur"
                            style="width: 100%" />
         </el-form-item>
-        <el-form-item label="鍒涘缓鏃堕棿">
-          <el-date-picker v-model="mergeForm.createTime"
-                          type="date"
-                          value-format="YYYY-MM-DD"
-                          style="width: 100%" />
-        </el-form-item>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
           <el-button type="primary"
+                     :loading="mergeSubmitLoading"
                      @click="handleMergeSubmit">纭畾涓嬪彂</el-button>
           <el-button @click="isShowNewModal = false">鍙栨秷</el-button>
         </span>
@@ -179,7 +174,7 @@
                       prop="mpsNo">
           <el-input v-model="form.mpsNo"
                     disabled
-                    placeholder="淇濆瓨鍚庤嚜鍔ㄧ敓鎴�" />
+                    placeholder="鏂板鍚庤嚜鍔ㄧ敓鎴�" />
         </el-form-item>
         <el-form-item label="浜у搧鍚嶇О"
                       prop="productId">
@@ -232,14 +227,6 @@
                           value-format="YYYY-MM-DD"
                           style="width: 100%"
                           placeholder="璇烽�夋嫨鎵胯鏃ユ湡" />
-        </el-form-item>
-        <el-form-item label="鍒涘缓鏃堕棿"
-                      prop="createTime">
-          <el-date-picker v-model="form.createTime"
-                          type="date"
-                          value-format="YYYY-MM-DD"
-                          style="width: 100%"
-                          placeholder="璇烽�夋嫨鍒涘缓鏃堕棿" />
         </el-form-item>
         <el-form-item label="澶囨敞"
                       prop="remark">
@@ -444,7 +431,6 @@
               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.ids = [row.id];
             sumAssignedQuantity.value =
               Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0);
@@ -481,6 +467,7 @@
 
   // 鍚堝苟涓嬪彂寮圭獥鎺у埗
   const isShowNewModal = ref(false);
+  const mergeSubmitLoading = ref(false);
   // 鍚堝苟涓嬪彂琛ㄥ崟鏁版嵁
   const mergeForm = reactive({
     productName: "",
@@ -488,7 +475,6 @@
     totalAssignedQuantity: 0,
     planCompleteTime: "",
     productId: "",
-    createTime: "",
   });
 
   // 瀵煎叆鐩稿叧
@@ -519,7 +505,6 @@
     requiredDate: "",
     promisedDeliveryDate: "",
     remark: "",
-    createTime: "",
   });
   const rules = reactive({
     productId: [{ required: true, message: "璇烽�夋嫨浜у搧", trigger: "change" }],
@@ -545,8 +530,7 @@
     });
   };
   const onBlur = value => {
-    // 闄愬埗鍥涗綅灏忔暟
-    mergeForm.totalAssignedQuantity = Number(value.toFixed(4));
+    mergeForm.totalAssignedQuantity = Number(Number(value).toFixed(10));
   };
 
   const fetchProductOptions = () => {
@@ -671,9 +655,9 @@
         };
       }
       summary[category].totalAssignedQuantity += Number(
-        (Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0)).toFixed(
-          4
-        )
+        (
+          Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0)
+        ).toFixed(10)
       );
     });
 
@@ -754,13 +738,14 @@
     // 璁＄畻鎬诲埗閫犳暟閲� (榛樿qtyRequired鐨勫拰)
     const totalAssignedQuantity = selectedRows.value.reduce((sum, row) => {
       return sum + Number(row.qtyRequired || 0) - Number(row.quantityIssued || 0);
-    }, 0);
-    sumAssignedQuantity.value = totalAssignedQuantity;
-    console.log(totalAssignedQuantity);
+    }, 0);  // 閬垮厤娴偣鏁扮簿搴﹂棶棰橈紙濡� 37.800000000000004锛�
+    const fixedTotal = Number(totalAssignedQuantity.toFixed(10));
+    sumAssignedQuantity.value = fixedTotal;
+    console.log(fixedTotal);
     // 璁剧疆琛ㄥ崟鏁版嵁
     mergeForm.productName = productName;
     mergeForm.model = firstRow.model || "";
-    mergeForm.totalAssignedQuantity = totalAssignedQuantity;
+    mergeForm.totalAssignedQuantity = fixedTotal;
     mergeForm.planCompleteTime = firstRow.requiredDate || "";
     mergeForm.productId = firstRow.productId || "";
     mergeForm.ids = selectedRows.value.map(row => row.id);
@@ -795,6 +780,7 @@
     const payload = {
       ...mergeForm,
     };
+    mergeSubmitLoading.value = true;
     productionPlanCombine(payload)
       .then(res => {
         if (res.code === 200) {
@@ -810,6 +796,9 @@
       .catch(err => {
         console.error("鍚堝苟涓嬪彂寮傚父锛�", err);
         ElMessage.error("绯荤粺寮傚父锛屽悎骞朵笅鍙戝け璐�");
+      })
+      .finally(() => {
+        mergeSubmitLoading.value = false;
       });
     // 鍙互閫夋嫨鍒锋柊鍒楄〃鎴栧叾浠栨搷浣�
   };
@@ -906,7 +895,6 @@
       requiredDate: "",
       promisedDeliveryDate: "",
       remark: "",
-      createTime: new Date().toISOString().split("T")[0],
     });
     dialogVisible.value = true;
     fetchProductOptions();

--
Gitblit v1.9.3