From 8e6f89ee559acf0413e2c3554b0eb1f6b74ca6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 18 Mar 2026 10:24:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=9F=E4=BA=A7=E6=97=B6=E9=97=B4):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7=E5=BC=80=E5=A7=8B=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在卷材操作的各个页面中，自动将待操作任务的创建时间设置为生产开始时间。同时在生产面板中新增生产时间相关字段的显示列
---
 klp-ui/src/views/wms/coil/merge.vue            | 18 ++++++++++++++----
 klp-ui/src/views/wms/coil/panels/base.vue      | 12 ++++++++++++
 klp-ui/src/views/wms/coil/panels/stepSplit.vue |  5 ++++-
 klp-ui/src/views/wms/coil/split.vue            | 14 +++++++++++---
 klp-ui/src/views/wms/coil/typing.vue           |  5 +++++
 5 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index 61d9052b..8103ca40 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -216,14 +216,14 @@
                 </el-form-item>
               </div>
 
-              <div class="form-row">
+              <!-- <div class="form-row"> -->
                 <el-form-item label="生产开始时间" prop="productionStartTime" class="form-item-half">
                   <TimeInput v-model="targetCoil.productionStartTime" @input="calculateProductionDuration" :disabled="readonly" />
                 </el-form-item>
                 <el-form-item label="生产结束时间" prop="productionEndTime" class="form-item-half">
                   <TimeInput v-model="targetCoil.productionEndTime" @input="calculateProductionDuration" :disabled="readonly" :show-now-button="true" />
                 </el-form-item>
-              </div>
+              <!-- </div> -->
 
               <div class="form-row">
                 <el-form-item label="生产耗时" prop="productionDuration" class="form-item-half">
@@ -240,7 +240,7 @@
 
 <script>
 import { getMaterialCoil, mergeMaterialCoil } from '@/api/wms/coil';
-import { listPendingAction, completeAction, addPendingAction } from '@/api/wms/pendingAction';
+import { listPendingAction, completeAction, addPendingAction, getPendingAction } from '@/api/wms/pendingAction';
 import CoilSelector from '@/components/CoilSelector';
 import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
 import RawMaterialSelector from "@/components/KLPService/RawMaterialSelect";
@@ -329,7 +329,10 @@ export default {
       readonly: false,
       // 待合卷列表（其他待操作的合卷任务）
       pendingMergeList: [],
-      pendingLoading: false
+      pendingLoading: false,
+      // 待操作ID
+      actionId: null,
+      currentAction: {}
     };
   },
   computed: {
@@ -377,6 +380,13 @@ export default {
       this.actionId = actionId;
     }
 
+    // 获取待操作详情
+    getPendingAction(actionId).then(res => {
+      // 填写生产开始时间
+      this.currentAction = res.data
+      this.$set(this.targetCoil, 'productionStartTime', res.data.createTime)
+    })
+
     // 保存当前页面的待操作类型
     if (actionTypeCode) {
       this.actionTypeCode = actionTypeCode;
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index d017cae7..02052bc2 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -245,6 +245,18 @@
         </template>
       </el-table-column>
 
+      <el-table-column label="生产开始" align="center" prop="productionStartTime" v-if="showProductionTimeEdit" width="150">
+      </el-table-column>
+
+      <el-table-column label="生产结束" align="center" prop="productionEndTime" v-if="showProductionTimeEdit" width="150">
+      </el-table-column>
+
+      <el-table-column label="生产耗时" align="center" prop="productionDuration" v-if="showProductionTimeEdit" width="150">
+        <template slot-scope="scope">
+          {{ formatDuration(scope.row.productionDuration * 60 * 1000)}}
+        </template>
+      </el-table-column>
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index 2493ee1b..c0aa9bb6 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -327,6 +327,7 @@ export default {
         warehouseId: [{ required: true, message: '请选择所在库位', trigger: 'change' }],
       },
       buttonLoading: false,
+      currentAction: {}
     }
   },
   computed: {
@@ -404,6 +405,8 @@ export default {
           return
         }
         const action = await getPendingAction(this.actionId)
+        this.currentAction = action.data || {}
+        // this.$set(this.splitForm, 'productionStartTime', action.data.createTime)
         const coilIds = action.data.remark;
         console.log('coilIds', coilIds)
         if (!coilIds) {
@@ -461,7 +464,7 @@ export default {
         temperGrade: '',
         coatingType: '',
         remark: '',
-        productionStartTime: '',
+        productionStartTime: this.currentAction.createTime,
         productionEndTime: '',
         productionDuration: '',
         formattedDuration: '',
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index 13e8e6b3..a28b649e 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -242,7 +242,7 @@
 <script>
 import { getMaterialCoil, splitMaterialCoil } from '@/api/wms/coil';
 import { listWarehouse } from '@/api/wms/warehouse';
-import { completeAction } from '@/api/wms/pendingAction';
+import { completeAction, getPendingAction } from '@/api/wms/pendingAction';
 import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 import ProductSelect from "@/components/KLPService/ProductSelect";
@@ -318,7 +318,8 @@ export default {
       // 只读模式
       readonly: false,
       // 待操作ID
-      actionId: null
+      actionId: null,
+      currentAction: {}
     };
   },
   computed: {
@@ -335,6 +336,13 @@ export default {
     const actionId = this.$route.query.actionId;
     const readonly = this.$route.query.readonly;
 
+    // 获取待操作详情
+    getPendingAction(actionId).then(res => {
+      // 填写生产开始时间
+      this.currentAction = res.data
+      this.$set(this.splitList[0], 'productionStartTime', res.data.createTime)
+    })
+
     if (coilId) {
       await this.loadMotherCoil(coilId);
     }
@@ -490,7 +498,7 @@ export default {
         coatingType: '',
         actualLength: undefined,
         actualWidth: undefined,
-        productionStartTime: '',
+        productionStartTime: this.currentAction.createTime,
         productionEndTime: '',
         productionDuration: '',
         formattedDuration: '',
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index 140f19ac..012b19df 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -427,6 +427,11 @@ export default {
     const pendingActionRes = await getPendingAction(actionId)
     actionType = pendingActionRes.data.actionType
 
+    // 填写生产开始时间
+    this.$set(this.updateForm, 'productionStartTime', pendingActionRes.data.createTime)
+
+    this.
+
     this.isAcidRolling = actionType == 11
 
     if (this.isAcidRolling) {