From b04162dab0b938b7929ecd6596a910fa7b23edcd Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 10 Mar 2026 20:15:19 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=88mes=EF=BC=89:=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=E7=9A=84=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4=EF=BC=9A=20=201.=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A8=E6=80=81=E7=9B=98=E7=82=B9=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BF=87=E6=BB=A4=E5=8A=9F=E8=83=BD=20=202.=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=20=203.=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20=204?=
 =?UTF-8?q?.=20=E5=89=8D=E7=AB=AF=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/wm/stocktaking/task/index.ts      | 10 ++----
 .../wm/stocktaking/task/StockTakingForm.vue   | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/api/mes/wm/stocktaking/task/index.ts b/src/api/mes/wm/stocktaking/task/index.ts
index 2081936bf..a33d38d8e 100644
--- a/src/api/mes/wm/stocktaking/task/index.ts
+++ b/src/api/mes/wm/stocktaking/task/index.ts
@@ -13,11 +13,9 @@ export interface StockTakingTaskVO {
   planName?: string
   blindFlag?: boolean
   frozenFlag?: boolean
-  snapshotTime?: string
   startTime?: string
   endTime?: string
   status?: number
-  adjustedFlag?: boolean
   remark?: string
   createTime?: string
 }
@@ -47,12 +45,8 @@ export const StockTakingApi = {
     return await request.delete({ url: '/mes/wm/stocktaking-task/delete?id=' + id })
   },
 
-  startStockTaking: async (data: StockTakingTaskActionReqVO) => {
-    return await request.put({ url: '/mes/wm/stocktaking-task/start', data })
-  },
-
-  finishStockTaking: async (data: StockTakingTaskActionReqVO) => {
-    return await request.put({ url: '/mes/wm/stocktaking-task/finish', data })
+  submitStockTaking: async (data: StockTakingTaskActionReqVO) => {
+    return await request.put({ url: '/mes/wm/stocktaking-task/submit', data })
   },
 
   cancelStockTaking: async (data: StockTakingTaskActionReqVO) => {
diff --git a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
index 66662b9da..fc92c88fd 100644
--- a/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
+++ b/src/views/mes/wm/stocktaking/task/StockTakingForm.vue
@@ -48,6 +48,30 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8" v-if="formData.type === MesWmStockTakingTypeEnum.DYNAMIC">
+          <el-form-item label="开始时间" prop="startTime">
+            <el-date-picker
+              v-model="formData.startTime"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="请选择开始时间"
+              class="!w-full"
+              :disabled="isDetail"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="formData.type === MesWmStockTakingTypeEnum.DYNAMIC">
+          <el-form-item label="结束时间" prop="endTime">
+            <el-date-picker
+              v-model="formData.endTime"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="请选择结束时间"
+              class="!w-full"
+              :disabled="isDetail"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="盘点日期" prop="takingDate">
             <el-date-picker
@@ -104,6 +128,7 @@ import { StockTakingApi, type StockTakingTaskVO } from '@/api/mes/wm/stocktaking
 import { type StockTakingPlanVO } from '@/api/mes/wm/stocktaking/plan/index'
 import StockTakingPlanSelect from '@/views/mes/wm/stocktaking/plan/components/StockTakingPlanSelect.vue'
 import UserSelect from '@/views/system/user/components/UserSelect.vue'
+import { MesWmStockTakingTypeEnum } from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'StockTakingForm' })
 
@@ -133,6 +158,8 @@ const formData = ref<StockTakingTaskVO>({
   userId: undefined,
   userNickname: undefined,
   planId: undefined,
+  startTime: undefined,
+  endTime: undefined,
   blindFlag: false,
   frozenFlag: false,
   remark: undefined
@@ -140,6 +167,7 @@ const formData = ref<StockTakingTaskVO>({
 const formRules = reactive({
   code: [{ required: true, message: '任务编码不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
+  planId: [{ required: true, message: '盘点方案不能为空', trigger: 'change' }],
   type: [{ required: true, message: '盘点类型不能为空', trigger: 'change' }],
   takingDate: [{ required: true, message: '盘点日期不能为空', trigger: 'change' }],
   blindFlag: [{ required: true, message: '是否盲盘不能为空', trigger: 'change' }],
@@ -200,6 +228,8 @@ const resetForm = () => {
     userId: undefined,
     userNickname: undefined,
     planId: undefined,
+    startTime: undefined,
+    endTime: undefined,
     blindFlag: false,
     frozenFlag: false,
     remark: undefined
@@ -213,6 +243,8 @@ const handlePlanChange = (plan?: StockTakingPlanVO) => {
     return
   }
   formData.value.type = plan.type
+  formData.value.startTime = plan.startTime
+  formData.value.endTime = plan.endTime
   formData.value.blindFlag = !!plan.blindFlag
   formData.value.frozenFlag = !!plan.frozenFlag
 }