From e6a88d23d33eeaad0b176e5a0b004a8d9c25c1e7 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Mon, 15 Jul 2024 16:29:10 +0800
Subject: [PATCH] fix bugs

---
 src/api/mes/plan/index.ts                     |  1 +
 src/views/erp/stock/record/index.vue          | 21 ++++---
 .../components/ItemRequisitionDetailList.vue  |  3 +-
 src/views/mes/machine/index.vue               | 40 +-------------
 src/views/mes/organization/WorkerIndex.vue    |  4 +-
 .../organization/components/OrgWorkerForm.vue |  4 +-
 src/views/mes/organization/index.vue          |  2 +-
 src/views/mes/orgworker/OrgWorkerForm.vue     | 12 ++--
 src/views/mes/orgworker/index.vue             |  2 +-
 src/views/mes/plan/PlanForm.vue               | 23 +++++---
 src/views/mes/plan/index.vue                  |  5 +-
 src/views/mes/producereport/AdminIndex.vue    |  2 +-
 .../ProduceReportDetailIndex.vue              | 36 ++++++------
 src/views/mes/task/components/PlanForm.vue    | 18 ++++--
 src/views/mes/task/components/PlanPlan.vue    | 14 ++---
 .../mes/task/components/TaskDetailForm.vue    |  7 ++-
 .../mes/task/components/TaskDetailList.vue    | 55 +++++++++++++------
 src/views/mes/workteam/index.vue              |  4 +-
 18 files changed, 137 insertions(+), 116 deletions(-)

diff --git a/src/api/mes/plan/index.ts b/src/api/mes/plan/index.ts
index a8715659..0e292abb 100644
--- a/src/api/mes/plan/index.ts
+++ b/src/api/mes/plan/index.ts
@@ -11,6 +11,7 @@ export interface PlanVO {
   productName: number // 产品
   taskCode: number // 任务单
   planNumber: number // 数量
+  reyaNumber: number // 数量
   finishNumber: number // 成品数量
   status: number // 状态
   planStartTime: Date // 计划开始时间
diff --git a/src/views/erp/stock/record/index.vue b/src/views/erp/stock/record/index.vue
index d6cf2da5..e72e5e24 100644
--- a/src/views/erp/stock/record/index.vue
+++ b/src/views/erp/stock/record/index.vue
@@ -123,13 +123,6 @@
         </template>
       </el-table-column>
       <el-table-column label="出入库单号" align="center" prop="bizNo" width="200" />
-      <el-table-column
-        label="出入库日期"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
       <el-table-column
         label="出入库数量"
         align="center"
@@ -142,6 +135,20 @@
         prop="totalCount"
         :formatter="erpCountTableColumnFormatter"
       />
+<!--      <el-table-column-->
+<!--        label="出入库日期"-->
+<!--        align="center"-->
+<!--        prop="createTime"-->
+<!--        :formatter="dateFormatter"-->
+<!--        width="180px"-->
+<!--      />-->
+      <el-table-column
+        label="创建日期"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
       <el-table-column label="操作人" align="center" prop="creatorName" />
     </el-table>
     <!-- 分页 -->
diff --git a/src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue b/src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue
index 5a942632..82e3a499 100644
--- a/src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue
+++ b/src/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue
@@ -8,7 +8,7 @@
       <el-table-column label="已下料" align="center" prop="finishNumber"  width="120px"/>
       <el-table-column label="进度" align="center" >
         <template #default="scope">
-          <el-progress :percentage="(scope.row.finishNumber/scope.row.number)*100" :stroke-width="15" striped striped-flow />
+          <el-progress :percentage="erpPriceInputFormatter((scope.row.finishNumber/scope.row.number)*100)" :stroke-width="15" striped striped-flow />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center"/>
@@ -18,6 +18,7 @@
 <script setup lang="ts">
 import { ItemRequisitionApi } from '@/api/mes/itemrequisition'
 import {DICT_TYPE} from "@/utils/dict";
+import {erpPriceInputFormatter} from "@/utils";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
diff --git a/src/views/mes/machine/index.vue b/src/views/mes/machine/index.vue
index 97876bd4..547b2a71 100644
--- a/src/views/mes/machine/index.vue
+++ b/src/views/mes/machine/index.vue
@@ -17,17 +17,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="父级装备" prop="parentId">
-        <el-input
-          v-model="queryParams.parentId"
-          placeholder="请输入父级装备"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-
-      <el-form-item label="装备SN号" prop="serialCode">
+      <el-form-item label="SN号" prop="serialCode">
         <el-input
           v-model="queryParams.serialCode"
           placeholder="请输入装备SN号"
@@ -57,15 +47,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -96,21 +77,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="机台类型" prop="machineType">
-        <el-select
-          v-model="queryParams.machineType"
-          placeholder="类型"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -152,7 +118,7 @@
       <el-tab-pane label="品检" name="pinjian" />
       <el-tab-pane label="打包" name="dabao" />
       <el-tab-pane label="贴标" name="tiebiao" />
-      <el-tab-pane label="品印" name="pinjian" />
+      <el-tab-pane label="品印" name="pinyin" />
       <el-tab-pane label="塑封" name="sufeng" />
     </el-tabs>
 
@@ -343,7 +309,7 @@ onMounted(() => {
 /** tab 切换 */
 let activeName = ''
 const handleTabClick = (tab: TabsPaneContext) => {
-  queryParams.orgType = tab.paneName
+  queryParams.machineType = tab.paneName
   handleQuery()
 }
 </script>
diff --git a/src/views/mes/organization/WorkerIndex.vue b/src/views/mes/organization/WorkerIndex.vue
index 0a4efe31..0fc050a9 100644
--- a/src/views/mes/organization/WorkerIndex.vue
+++ b/src/views/mes/organization/WorkerIndex.vue
@@ -83,7 +83,7 @@
     <el-tab-pane label="品检" name="pinjian" />
     <el-tab-pane label="打包" name="dabao" />
     <el-tab-pane label="贴标" name="tiebiao" />
-    <el-tab-pane label="品印" name="pinjian" />
+    <el-tab-pane label="品印" name="pinyin" />
     <el-tab-pane label="塑封" name="sufeng" />
   </el-tabs>
 
@@ -102,7 +102,7 @@
           @current-change="handleCurrentChange"
         >
           <el-table-column align="center" label="组织名称" prop="name" width="180px"/>
-          <el-table-column align="center" label="关联机台" prop="machineName" />
+<!--          <el-table-column align="center" label="关联机台" prop="machineName" />-->
           <el-table-column align="center" label="组织等级" prop="orgClass">
             <template #default="scope">
               <dict-tag v-if="notEmpty(scope.row.orgClass)" :type="DICT_TYPE.MES_ORG_CLASS" :value="scope.row.orgClass" />
diff --git a/src/views/mes/organization/components/OrgWorkerForm.vue b/src/views/mes/organization/components/OrgWorkerForm.vue
index 7ba3c49c..723718c1 100644
--- a/src/views/mes/organization/components/OrgWorkerForm.vue
+++ b/src/views/mes/organization/components/OrgWorkerForm.vue
@@ -38,7 +38,7 @@
           value-format="YYYY-MM-DD HH:mm:ss"
           type="dates"
           placeholder="请选择工作日期"
-          class="!w-300px"
+
         />
       </el-form-item>
       <el-form-item v-if="formData.groupType && formData.orgId " label="工人" prop="workerId">
@@ -47,7 +47,7 @@
           clearable
           filterable
           placeholder="请选择工人"
-          class="!w-240px"
+
         >
           <el-option
             v-for="item in userList"
diff --git a/src/views/mes/organization/index.vue b/src/views/mes/organization/index.vue
index bc3e3237..35ba03c8 100644
--- a/src/views/mes/organization/index.vue
+++ b/src/views/mes/organization/index.vue
@@ -123,7 +123,7 @@
       <el-tab-pane label="品检" name="pinjian" />
       <el-tab-pane label="打包" name="dabao" />
       <el-tab-pane label="贴标" name="tiebiao" />
-      <el-tab-pane label="品印" name="pinjian" />
+      <el-tab-pane label="品印" name="pinyin" />
       <el-tab-pane label="塑封" name="sufeng" />
     </el-tabs>
     <el-table
diff --git a/src/views/mes/orgworker/OrgWorkerForm.vue b/src/views/mes/orgworker/OrgWorkerForm.vue
index b9320ce8..e5133591 100644
--- a/src/views/mes/orgworker/OrgWorkerForm.vue
+++ b/src/views/mes/orgworker/OrgWorkerForm.vue
@@ -14,7 +14,6 @@
           :props="defaultProps"
           check-strictly
           default-expand-all
-          @change="handleSelectChange"
           placeholder="请选择工位"
         />
 
@@ -40,7 +39,7 @@
           class="!w-300px"
         />
       </el-form-item>
-      <el-form-item v-if="formData.groupType && formData.orgId " label="工人" prop="workerId">
+      <el-form-item v-if="formData.groupType" label="工人" prop="workerId">
         <el-select
           v-model="formData.workerId"
           clearable
@@ -166,10 +165,13 @@ const getOrganizationTree = async () => {
 
 /** 工序类型变化，可选负责人跟着变化 */
 const handleSelectChange = async () => {
-  if(formData.value.orgId && formData.value.groupType){
+  // if(formData.value.orgId && formData.value.groupType){
+  //   // 获得用户列表
+  //   userList.value = await WorkTeamApi.getUserList2(formData.value.orgId, formData.value.groupType)
+  // }
+  if(formData.value.groupType){
     // 获得用户列表
-    userList.value = await WorkTeamApi.getUserList2(formData.value.orgId, formData.value.groupType)
+    userList.value = await WorkTeamApi.getUserList2(1, formData.value.groupType)
   }
-
 }
 </script>
diff --git a/src/views/mes/orgworker/index.vue b/src/views/mes/orgworker/index.vue
index 711f97ed..8098727d 100644
--- a/src/views/mes/orgworker/index.vue
+++ b/src/views/mes/orgworker/index.vue
@@ -110,7 +110,7 @@
       <el-tab-pane label="品检" name="pinjian" />
       <el-tab-pane label="打包" name="dabao" />
       <el-tab-pane label="贴标" name="tiebiao" />
-      <el-tab-pane label="品印" name="pinjian" />
+      <el-tab-pane label="品印" name="pinyin" />
       <el-tab-pane label="塑封" name="sufeng" />
       <el-tab-pane label="制浆" name="zhijiang" />
     </el-tabs>
diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue
index e6d7f690..ded3f5ab 100644
--- a/src/views/mes/plan/PlanForm.vue
+++ b/src/views/mes/plan/PlanForm.vue
@@ -44,10 +44,12 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="计划数量" prop="planNumber">
-        <el-input-number v-model="formData.planNumber" :min="0" :precision="2" class="!w-1/1"/>
+      <el-form-item label="成型数量" prop="planNumber">
+        <el-input-number v-model="formData.planNumber" :min="0"  class="!w-1/1"/>
+      </el-form-item>
+      <el-form-item label="热压数量" prop="reyaNumber">
+        <el-input-number v-model="formData.reyaNumber" :min="0"  class="!w-1/1"/>
       </el-form-item>
-
       <el-form-item label="计划开始" prop="planStartTime">
         <el-date-picker
           v-model="formData.planStartTime"
@@ -67,7 +69,7 @@
 
 
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" placeholder="请输入备注" />
+        <el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -105,6 +107,7 @@ const formData = ref({
   taskDetailId: undefined,
   taskId: undefined,
   planNumber: undefined,
+  reyaNumber: undefined,
   finishNumber: undefined,
   status: undefined,
   planStartTime: undefined,
@@ -118,7 +121,8 @@ const formData = ref({
 const formRules = reactive({
   productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
   taskId: [{ required: true, message: '任务单不能为空', trigger: 'blur' }],
-  planNumber: [{ required: true, message: '计划数量不能为空', trigger: 'blur' }],
+  planNumber: [{ required: true, message: '成型数量不能为空', trigger: 'blur' }],
+  reyaNumber: [{ required: true, message: '热压数量不能为空', trigger: 'blur' }],
   planStartTime: [{ required: true, message: '计划开始时间不能为空', trigger: 'blur' }],
   planEndTime: [{ required: true, message: '计划结束时间不能为空', trigger: 'blur' }],
 })
@@ -126,7 +130,7 @@ const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number,
-                    taskId?: number, productId?: number, number?: number) => {
+                    taskId?: number, productId?: number, number?: number, taskDetailId?:number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
@@ -135,8 +139,13 @@ const open = async (type: string, id?: number,
     formData.value.taskId = taskId
   if(productId)
     formData.value.productId = productId
-  if(number)
+  if(number){
     formData.value.planNumber = number
+    formData.value.reyaNumber = number
+  }
+  if(taskDetailId){
+    formData.value.taskDetailId = taskDetailId
+  }
   if(type==='update'){
     editDisable.value = true
   }
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index 30b1d9be..fcb6363d 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -150,9 +150,10 @@
         </template>
       </el-table-column>
       <el-table-column label="计划编码" align="center" prop="code" min-width="150px" />
-      <el-table-column label="产品" align="center" prop="productName"  min-width="150px" sortable/>
+      <el-table-column label="产品" align="center" prop="productName"  min-width="200px" sortable/>
       <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" />
diff --git a/src/views/mes/producereport/AdminIndex.vue b/src/views/mes/producereport/AdminIndex.vue
index 4410eb37..9673345f 100644
--- a/src/views/mes/producereport/AdminIndex.vue
+++ b/src/views/mes/producereport/AdminIndex.vue
@@ -87,7 +87,7 @@
       <el-tab-pane label="品检" name="pinjian" />
       <el-tab-pane label="打包" name="dabao" />
       <el-tab-pane label="贴标" name="tiebiao" />
-      <el-tab-pane label="品印" name="pinjian" />
+      <el-tab-pane label="品印" name="pinyin" />
       <el-tab-pane label="塑封" name="sufeng" />
     </el-tabs>
 
diff --git a/src/views/mes/producereport/ProduceReportDetailIndex.vue b/src/views/mes/producereport/ProduceReportDetailIndex.vue
index 819dacb1..23604a8c 100644
--- a/src/views/mes/producereport/ProduceReportDetailIndex.vue
+++ b/src/views/mes/producereport/ProduceReportDetailIndex.vue
@@ -64,22 +64,22 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['mes:produce-report-detail:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 报工
-        </el-button>
-        <el-button
-          type="warning"
-          plain
-          @click="openReplaceForm('replace')"
-          v-hasPermi="['mes:produce-report-detail:replace']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 代报工
-        </el-button>
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          @click="openForm('create')"-->
+<!--          v-hasPermi="['mes:produce-report-detail:create']"-->
+<!--        >-->
+<!--          <Icon icon="ep:plus" class="mr-5px" /> 报工-->
+<!--        </el-button>-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          @click="openReplaceForm('replace')"-->
+<!--          v-hasPermi="['mes:produce-report-detail:replace']"-->
+<!--        >-->
+<!--          <Icon icon="ep:plus" class="mr-5px" /> 代报工-->
+<!--        </el-button>-->
         <el-button
           type="success"
           plain
@@ -121,8 +121,8 @@
       <el-table-column label="成品率%" align="center" prop="qualityRate" :formatter="erpCountTableColumnFormatter"/>
       <el-table-column label="打包数量" align="center" prop="packageNumber" />
 
-      <el-table-column label="总时长" align="center" prop="totalTime" />
-      <el-table-column label="计件时长" align="center" prop="reportTime" />
+<!--      <el-table-column label="总时长" align="center" prop="totalTime" />-->
+<!--      <el-table-column label="计件时长" align="center" prop="reportTime" />-->
       <el-table-column label="废品原因" align="center" prop="wasteReason" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="类型" align="center" fixed="right" prop="reportType" width="90px">
diff --git a/src/views/mes/task/components/PlanForm.vue b/src/views/mes/task/components/PlanForm.vue
index f839d1e8..3b7872ab 100644
--- a/src/views/mes/task/components/PlanForm.vue
+++ b/src/views/mes/task/components/PlanForm.vue
@@ -10,7 +10,7 @@
   >
     <el-table :data="formData" class="-mt-10px" :stripe="true"  :show-overflow-tooltip="true">
       <el-table-column label="序号" type="index" width="60" />
-      <el-table-column disabled label="计划编码" min-width="170">
+      <el-table-column disabled label="计划编码" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.code`" :rules="formRules.code" class="mb-0px!">
             <el-input disabled v-model="row.code" placeholder="请输入计划编码" />
@@ -27,14 +27,20 @@
           </el-form-item>
         </template>
       </el-table-column>
-       <el-table-column label="数量" min-width="120">
+       <el-table-column label="成型数量" min-width="120">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.planNumber`" :rules="formRules.planNumber" class="mb-0px!">
             <el-input v-model="row.planNumber" placeholder="请输入数量" />
           </el-form-item>
         </template>
       </el-table-column>
-
+      <el-table-column label="热压数量" min-width="120">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.reyaNumber`" :rules="formRules.reyaNumber" class="mb-0px!">
+            <el-input v-model="row.planNumber" placeholder="请输入数量" />
+          </el-form-item>
+        </template>
+      </el-table-column>
       <el-table-column prop="sort_date" sortable  label="计划开始时间" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.planStartTime`" :rules="formRules.planStartTime" class="mb-0px!">
@@ -60,7 +66,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="备注" min-width="150">
+      <el-table-column label="备注" min-width="250">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.remark`" :rules="formRules.remark" class="mb-0px!">
             <el-input v-model="row.remark" placeholder="" />
@@ -94,7 +100,7 @@ const formData = ref([])
 const formRules = reactive({
   productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
   taskId: [{ required: true, message: '任务单不能为空', trigger: 'blur' }],
-  planNumber: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+  planNumber: [{ required: true, message: '成型数量不能为空', trigger: 'blur' }],
   planStartTime: [{ required: true, message: '计划开始时间不能为空', trigger: 'blur' }],
   planEndTime: [{ required: true, message: '计划结束时间不能为空', trigger: 'blur' }],
 
@@ -143,6 +149,7 @@ const handleCopy = (row) => {
     productId: undefined,
     productName: undefined,
     planNumber: undefined,
+    reyaNumber: undefined,
     planStartTime: undefined,
     planEndTime: undefined,
     remark: undefined,
@@ -156,6 +163,7 @@ const handleCopy = (row) => {
   newRow.planStartTime = row.planStartTime
   newRow.planEndTime = row.planEndTime
   newRow.planNumber= row.planNumber
+  newRow.reyaNumber= row.reyaNumber
   newRow.productName = row.productName
   newRow.priorityNum = 1
   formData.value.push(newRow)
diff --git a/src/views/mes/task/components/PlanPlan.vue b/src/views/mes/task/components/PlanPlan.vue
index 5adebbb3..ca3e3cc8 100644
--- a/src/views/mes/task/components/PlanPlan.vue
+++ b/src/views/mes/task/components/PlanPlan.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="1300px" v-loading="formLoading">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width="1400px" v-loading="formLoading">
     <el-form
       ref="formRef"
       :model="formData"
@@ -92,6 +92,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 
 const formData = ref({
   taskId: undefined,
+  taskDetailId: undefined,
   taskCode: undefined,
   sizeOfPlan: 0,
   productsOfPlan: 20000,
@@ -111,17 +112,16 @@ const subTabsName = ref('plan')
 const planFormRef = ref()
 
 /** 打开弹窗 */
-const open = async (taskDetailId: number, productId: number, productName:string, num:number,finishNumber:number) => {
+const open = async (taskId: number, taskDetailId: number, productId: number, productName:string, num:number,finishNumber:number) => {
   dialogVisible.value = true
   dialogTitle.value = "产品排产：" + productName
-
-  formData.value.taskId = taskDetailId
+  formData.value.taskId = taskId
+  formData.value.taskDetailId = taskDetailId
   formData.value.taskCode = productName
   formData.value.number = num
   formData.value.planNumber = 0
-  if(num){
-    if(finishNumber)
-      formData.value.planNumber = num-finishNumber
+  if(num>-1 && finishNumber>-1){
+    formData.value.planNumber = num-finishNumber
   }
 }
 defineExpose({open}) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/mes/task/components/TaskDetailForm.vue b/src/views/mes/task/components/TaskDetailForm.vue
index ff598850..ca6404ab 100644
--- a/src/views/mes/task/components/TaskDetailForm.vue
+++ b/src/views/mes/task/components/TaskDetailForm.vue
@@ -96,12 +96,12 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="工厂完成" prop="finishDate">
+          <el-form-item label="交货日期" prop="finishDate">
             <el-date-picker
               v-model="formData.finishDate"
               type="date"
               value-format="x"
-              placeholder="选择工厂完成日期"
+              placeholder="选择交货日期"
             />
           </el-form-item>
         </el-col>
@@ -190,6 +190,9 @@ const open = async (type: string, id?: number, taskId: number) => {
     formLoading.value = true
     try {
       formData.value = await TaskApi.getTaskDetail(id)
+      if(formData.value.remark === null || formData.value.remark === undefined){
+        formData.value.remark =''
+      }
     } finally {
       formLoading.value = false
     }
diff --git a/src/views/mes/task/components/TaskDetailList.vue b/src/views/mes/task/components/TaskDetailList.vue
index d8272a21..bd7974fc 100644
--- a/src/views/mes/task/components/TaskDetailList.vue
+++ b/src/views/mes/task/components/TaskDetailList.vue
@@ -10,25 +10,24 @@
       <Icon icon="ep:plus" class="mr-5px" /> 新增
     </el-button>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="产品" align="center" prop="productName" width="140px" sortable/>
-      <el-table-column label="单位" align="center" prop="unitName" />
-       <el-table-column label="数量" align="center" prop="number" />
+      <el-table-column label="产品"  prop="productName" width="220px" sortable/>
+<!--      <el-table-column label="单位" align="center" prop="unitName" />-->
+       <el-table-column label="数量/个" align="center" prop="number" />
       <el-table-column label="已计划" align="center" prop="planNumber" />
-      <el-table-column label="每包/个" align="center" prop="packageSize" />
+<!--      <el-table-column label="每包/个" align="center" prop="packageSize" />-->
       <el-table-column label="交货日期" align="center" prop="finishDate" :formatter="dateFormatter2"/>
       <el-table-column label="项目名称" align="center" prop="projectName" />
       <el-table-column label="技术要求" align="center" prop="techRequirements" />
-      <el-table-column label="备注" align="center" prop="remark" >
-        <template #default="scope">
-          <el-link @click="openFormView('detail', scope.row.id)" v-if="scope.row.remark" type="warning">
-            查看详情
-          </el-link>
-        </template>
-
-      </el-table-column>
+<!--      <el-table-column label="备注" align="center" prop="remark" >-->
+<!--        <template #default="scope">-->
+<!--          <el-link @click="openFormView('detail', scope.row.id)" v-if="scope.row.remark" type="warning">-->
+<!--            查看详情-->
+<!--          </el-link>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 <!--      <el-table-column label="订单单号" align="center" prop="saleOrderCode" />-->
 
-      <el-table-column label="操作" align="center" width="250px">
+      <el-table-column label="操作" align="center" width="300px">
         <template #default="scope">
           <el-button
             link
@@ -43,11 +42,19 @@
           >
             物料
           </el-button>
+          <el-button
+            link
+            type="warning"
+            @click="addPlanForm(scope.row.taskId,scope.row.id, scope.row.productId, scope.row.number-scope.row.planNumber)"
+            v-hasPermi="['mes:task:plan']"
+          >
+            新增计划
+          </el-button>
           <el-button
             v-if="props.taskStatus>1"
             link
             type="success"
-            @click="openTaskPlanForm(scope.row.id, scope.row.productId, scope.row.productName, scope.row.number, scope.row.planNumber)"
+            @click="openTaskPlanForm(scope.row.taskId,scope.row.id, scope.row.productId, scope.row.productName, scope.row.number, scope.row.planNumber)"
             v-hasPermi="['mes:task:plan']"
           >
             排产
@@ -88,7 +95,8 @@
   <ItemNeedIndex ref="itemNeedFormRef" @success="getList" />
   <!-- 排程弹窗 -->
   <TaskPlanForm ref="taskPlanFormRef" @success="getList" />
-
+  <!-- 新增计划表单弹窗：添加 -->
+  <PlanForm ref="planFormRef" @success="getList" />
 </template>
 <script setup lang="ts">
 import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
@@ -97,6 +105,7 @@ import TaskDetailForm from './TaskDetailForm.vue'
 import TaskDetailView from './TaskDetailView.vue'
 import ItemNeedIndex from "@/views/mes/bom/ItemNeedIndex.vue";
 import TaskPlanForm from "@/views/mes/task/components/PlanPlan.vue";
+import PlanForm from "@/views/mes/plan/PlanForm.vue";
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -183,9 +192,21 @@ const openItemNeed = (productName:string, productId: number, number:number) => {
   number = number>0 ? number : 0;
   itemNeedFormRef.value.open("product",productName, productId, number)
 }
+/** 添加/修改操作 */
+const planFormRef = ref()
+const addPlanForm = (taskId: number,taskDetailId: number, productId: number, number?: number) => {
+  if (!props.taskId) {
+    message.error('请选择一个生产任务单')
+    return
+  }
+  planFormRef.value.open("create",null,taskId, productId, number, taskDetailId)
+}
+
 /** 单个计划排产 */
 const taskPlanFormRef = ref()
-const openTaskPlanForm = (taskDetailId: number, productId: number, productName:string, num:number,finishNumber:number) => {
-  taskPlanFormRef.value.open(taskDetailId,productId, productName, num, finishNumber )
+const openTaskPlanForm = (taskId:number, taskDetailId: number, productId: number,
+                          productName:String, num:number, planNumber:number) => {
+  taskPlanFormRef.value.open(taskId,taskDetailId,productId, productName, num, planNumber )
 }
+
 </script>
diff --git a/src/views/mes/workteam/index.vue b/src/views/mes/workteam/index.vue
index 5946f8b7..bdd7f56b 100644
--- a/src/views/mes/workteam/index.vue
+++ b/src/views/mes/workteam/index.vue
@@ -72,6 +72,7 @@
       <el-tab-pane label="所有" name="" />
       <el-tab-pane label="白班" name="1" />
       <el-tab-pane label="夜班" name="2" />
+      <el-tab-pane label="长白班" name="3" />
     </el-tabs>
     <el-table
       v-loading="loading"
@@ -172,6 +173,7 @@ const queryParams = reactive({
   teamName: undefined,
   teamLeaderId: undefined,
   teamType: undefined,
+  groupType: undefined,
   remark: undefined,
   isEnable: undefined,
   createTime: [],
@@ -250,7 +252,7 @@ onMounted(() => {
 /** tab 切换 */
 let activeName = ''
 const handleTabClick = (tab: TabsPaneContext) => {
-  queryParams.status = tab.paneName
+  queryParams.groupType = tab.paneName
   handleQuery()
 }
 </script>