From 8d8a7f29cf3e2bb033a3c61203dd7fdf73773888 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Tue, 23 Jul 2024 09:39:38 +0800
Subject: [PATCH] fix

---
 src/views/mes/plan/PlanForm.vue      | 24 ++++++++++--------------
 src/views/mes/planprogress/index.vue | 10 ++--------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue
index b90d9455..4cf4b147 100644
--- a/src/views/mes/plan/PlanForm.vue
+++ b/src/views/mes/plan/PlanForm.vue
@@ -61,18 +61,12 @@
 <!--          />-->
 <!--        </el-select>-->
 <!--      </el-form-item>-->
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="成型数量" prop="planNumber">
-            <el-input-number v-model="formData.planNumber" :min="0"  class="!w-1/1"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="热压数量" prop="reyaNumber">
-            <el-input-number v-model="formData.reyaNumber" :min="0"  class="!w-1/1"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form-item label="成型数量" prop="planNumber">
+        <el-input v-model="formData.planNumber"  />
+      </el-form-item>
+      <el-form-item label="热压数量" prop="reyaNumber">
+        <el-input v-model="formData.reyaNumber" />
+      </el-form-item>
       <el-form-item label="计划开始" prop="planStartTime">
         <el-date-picker
           v-model="formData.planStartTime"
@@ -200,6 +194,8 @@ const open = async (type: string, id?: number,
   //productList.value = await ProductApi.getMesProductSimpleList()
   // 列表
   taskList.value = await TaskApi.getPlanTaskList()
+  if(taskId)
+    taskDetailList.value =await TaskApi.getTaskDetailListByTaskId(formData.value.taskId)
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -235,8 +231,8 @@ const resetForm = () => {
     productId: undefined,
     taskDetailId: undefined,
     taskId: undefined,
-    planNumber: undefined,
-    finishNumber: undefined,
+    planNumber: 0,
+    finishNumber: 0,
     status: undefined,
     planStartTime: undefined,
     planEndTime: undefined,
diff --git a/src/views/mes/planprogress/index.vue b/src/views/mes/planprogress/index.vue
index 62efcea4..d84b430b 100644
--- a/src/views/mes/planprogress/index.vue
+++ b/src/views/mes/planprogress/index.vue
@@ -146,8 +146,8 @@
       </el-table-column>
       <el-table-column label="计划编码" align="center" prop="code" min-width="140px" />
       <el-table-column label="产品" align="center" prop="productName"  min-width="150px" />
-      <el-table-column label="任务单" align="center" prop="taskCode" min-width="150px" />
-      <el-table-column label="数量" align="center" prop="planNumber" />
+      <el-table-column label="计划成型数" align="center" prop="planNumber" />
+      <el-table-column label="计划热压数" align="center" prop="reyaNumber" />
       <el-table-column label="状态" align="center" prop="status" sortable>
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_PLAN_STATUS" :value="scope.row.status" />
@@ -156,12 +156,6 @@
       <el-table-column label="计划开始时间" align="center" sortable prop="planStartTime" :formatter="dateFormatter2" width="150px"/>
       <el-table-column label="计划结束时间" align="center" sortable prop="planEndTime" :formatter="dateFormatter2" width="150px"/>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="领料人" align="center" prop="productionManagerName" />
-      <el-table-column label="制浆线" align="center" prop="feedingPipeline">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.MES_FEEDING_PIPELINE" :value="scope.row.feedingPipeline" />
-        </template>
-      </el-table-column>
 
       <el-table-column label="操作" align="center" fixed="right" width="250">
         <template #default="scope">