From bd3cedb854915efc792b7e89f73b8dbdc0123621 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Wed, 5 Nov 2025 16:59:53 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=85=A5=E5=BA=93=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/inStockBill/index.ts          | 11 ++++
 src/views/wms/inStockBill/inStockEdit.vue | 74 +++++++----------------
 src/views/wms/inStockBill/index.vue       |  6 +-
 3 files changed, 35 insertions(+), 56 deletions(-)

diff --git a/src/api/wms/inStockBill/index.ts b/src/api/wms/inStockBill/index.ts
index 2577a4a..4437d04 100644
--- a/src/api/wms/inStockBill/index.ts
+++ b/src/api/wms/inStockBill/index.ts
@@ -74,3 +74,14 @@ export function getWmsInStockBillList(query) {
     params: query
   });
 }
+/**
+ * 提交物料入库并发起流程
+ * @param data
+ */
+export const submitFlowData = (data: InStockBillForm) => {
+  return request({
+    url: '/wms/inStockBill/submitFlowData',
+    method: 'post',
+    data: data
+  });
+};
diff --git a/src/views/wms/inStockBill/inStockEdit.vue b/src/views/wms/inStockBill/inStockEdit.vue
index b6cbd19..f0b73e9 100644
--- a/src/views/wms/inStockBill/inStockEdit.vue
+++ b/src/views/wms/inStockBill/inStockEdit.vue
@@ -15,7 +15,7 @@
       />
 
       <el-card shadow="never" style="height: 78vh; overflow-y: auto">
-        <el-form ref="addFormRef" :model="form" :rules="rules" label-width="120px" >
+        <el-form ref="addFormRef" :model="form" :rules="rules" label-width="120px" :disabled="true">
           <el-row>
             <el-col :span="12">
               <el-form-item label="入库单号" prop="inStockCode">
@@ -94,13 +94,12 @@
 </template>
 
 <script setup name="Leave" lang="ts">
-import { LeaveForm } from '@/api/workflow/leave/types';
 import { startWorkFlow } from '@/api/workflow/task';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import ApprovalButton from '@/components/Process/approvalButton.vue';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
-import { getInStockBill } from '@/api/wms/inStockBill';
+import { getInStockBill, submitFlowData } from '@/api/wms/inStockBill';
 import { getWmsInStockDetailsList } from '@/api/wms/inStockDetails';
 import type { ComponentInternalInstance } from 'vue';
 import { getCurrentInstance, nextTick, onMounted, reactive, ref, toRefs } from 'vue';
@@ -117,7 +116,7 @@ const leaveTime = ref<Array<string>>([]);
 //路由参数
 const routeParams = ref<Record<string, any>>({});
 // 自定义流程可不选择 直接填写flowCode 例如 'leave1'
-const flowCode = ref<string>('leave1');
+const flowCode = ref<string>('wms_in');
 //提交组件
 const submitVerifyRef = ref<InstanceType<typeof SubmitVerify>>();
 //审批记录组件
@@ -183,7 +182,7 @@ const getInfo = () => {
   buttonLoading.value = false;
 
   nextTick(async () => {
-    const id = routeParams.value.inStockBillId;
+    const id = routeParams.value.id;
     const res = await getInStockBill(id);
     Object.assign(form.value, res.data);
 
@@ -200,64 +199,32 @@ const getInfo = () => {
 
 /** 提交按钮*/
 const submitForm = (status: string, mode: boolean) => {
-  if (leaveTime.value.length === 0) {
-    proxy?.$modal.msgError('请假时间不能为空');
+  if (status === 'submit') {
+    const res = submitFlowData(form.value).finally(() => (buttonLoading.value = false));
+    form.value = res.data;
+    buttonLoading.value = false;
+    proxy?.$modal.msgSuccess('操作成功');
+    proxy.$tab.closePage(proxy.$route);
+    proxy.$router.go(-1);
+    // handleStartWorkFlow();
     return;
   }
-  try {
-    leaveFormRef.value?.validate(async (valid: boolean) => {
-      form.value.startDate = leaveTime.value[0];
-      form.value.endDate = leaveTime.value[1];
-      if (valid) {
-        buttonLoading.value = true;
-        // 设置后端发起和不等于草稿状态 直接走流程发起
-        console.log('mode', mode);
-        if (mode && status != 'draft') {
-          const res = await submitAndFlowStart(form.value).finally(() => (buttonLoading.value = false));
-          form.value = res.data;
-          buttonLoading.value = false;
-          proxy?.$modal.msgSuccess('操作成功');
-          proxy.$tab.closePage(proxy.$route);
-          proxy.$router.go(-1);
-        } else {
-          let res;
-          if (form.value.id) {
-            res = await updateLeave(form.value).finally(() => (buttonLoading.value = false));
-          } else {
-            res = await addLeave(form.value).finally(() => (buttonLoading.value = false));
-          }
-          form.value = res.data;
-          if (status === 'draft') {
-            buttonLoading.value = false;
-            proxy?.$modal.msgSuccess('暂存成功');
-            proxy.$tab.closePage(proxy.$route);
-            proxy.$router.go(-1);
-          } else {
-            await handleStartWorkFlow(res.data);
-          }
-        }
-      }
-    });
-  } finally {
-    buttonLoading.value = false;
-  }
+
+  proxy.$tab.closePage(proxy.$route);
+  proxy.$router.go(-1);
+
+  console.log('submitForm', status, mode);
 };
 
 //提交申请
-const handleStartWorkFlow = async (data: LeaveForm) => {
+const handleStartWorkFlow = async () => {
   try {
     submitFormData.value.flowCode = flowCode.value;
     submitFormData.value.businessId = data.id;
-    //流程变量
-    taskVariables.value = {
-      // leave2/6 使用的流程变量
-      leaveDays: data.leaveDays,
-      // leave4/5 使用的流程变量
-      userList: ['1', '3', '4']
-    };
+
     //流程实例业务扩展字段
     flowInstanceBizExtBo.value = {
-      businessTitle: '请假申请',
+      businessTitle: '物料入库流程',
       businessCode: data.applyCode
     };
     submitFormData.value.variables = taskVariables.value;
@@ -290,6 +257,7 @@ onMounted(() => {
     routeParams.value = proxy.$route.query;
     reset();
     loading.value = false;
+    // routeParams.value.type = 'update';
     // if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
     getInfo();
     // }
diff --git a/src/views/wms/inStockBill/index.vue b/src/views/wms/inStockBill/index.vue
index 0c80e44..e29325f 100644
--- a/src/views/wms/inStockBill/index.vue
+++ b/src/views/wms/inStockBill/index.vue
@@ -128,7 +128,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="auto">
           <template #default="scope">
-            <div style="display: flex; justify-content: center; ">
+            <div style="display: flex; justify-content: center">
               <el-tooltip content="查看" placement="top">
                 <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['wms:inStockBill:edit']"></el-button>
               </el-tooltip>
@@ -650,8 +650,8 @@ const handleView = (row?: InStockBillVO) => {
   proxy.$router.push({
     path: '/wms/inStockEdit',
     query: {
-      inStockBillId: row.inStockBillId,
-      type: 'approval'
+      id: row.inStockBillId,
+      type: row.flowStatus === 'draft' ? 'update' : 'view'
     }
   });
 };