✨ feat(mes): 新增采购订单号字段及相关逻辑处理

src/views/mes/wm/itemreceipt/ItemReceiptForm.vue

@@ -6,10 +6,10 @@
       :rules="formRules"
       label-width="110px"
       v-loading="formLoading"
+      :disabled="isDetail"
     >
       <el-row>
         <el-col :span="8">
-          <!-- TODO 芋艿【暂时不删除】：入库单编号：新增时可自动生成，其他模式不可生成 -->
           <el-form-item label="入库单编号" prop="code">
             <el-input
               v-model="formData.code"
@@ -17,9 +17,7 @@
               :disabled="isHeaderReadonly"
             >
               <template #append>
-                <el-button @click="generateCode">
+                <el-button @click="generateCode" :disabled="isHeaderReadonly"> 生成 </el-button>
-                  生成
-                </el-button>
               </template>
             </el-input>
           </el-form-item>
@@ -86,13 +84,29 @@
       />
     </template>
     <template #footer>
-      <el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
+      <el-button v-if="isEditable" @click="submitForm" type="primary" :disabled="formLoading">
-        确 定
+        保 存
+      </el-button>
+      <el-button
+        v-if="formType === 'update' && formData.status === MesWmItemReceiptStatusEnum.PREPARE"
+        @click="handleSubmit"
+        type="warning"
+        :disabled="formLoading"
+      >
+        提 交
       </el-button>
       <el-button v-if="isStock" @click="handleStock" type="primary" :disabled="formLoading">
         执行上架
       </el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button
+        v-if="formData.status === MesWmItemReceiptStatusEnum.APPROVED"
+        @click="handleFinish"
+        type="success"
+        :disabled="formLoading"
+      >
+        执行入库
+      </el-button>
+      <el-button @click="dialogVisible = false">关 闭</el-button>
     </template>
   </Dialog>
 </template>
@@ -103,7 +117,11 @@ import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
 import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
 import WmArrivalNoticeSelect from '@/views/mes/wm/arrivalnotice/components/WmArrivalNoticeSelect.vue'
 import ItemReceiptLineList from './ItemReceiptLineList.vue'
-import { MesAutoCodeRuleCode, MesWmArrivalNoticeStatusEnum } from '@/views/mes/utils/constants'
+import {
+  MesAutoCodeRuleCode,
+  MesWmArrivalNoticeStatusEnum,
+  MesWmItemReceiptStatusEnum
+} from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'ItemReceiptForm' })
 
@@ -116,6 +134,7 @@ const formData = ref({
   id: undefined as number | undefined,
   code: undefined,
   name: undefined,
+  status: undefined as number | undefined,
   vendorId: undefined,
   noticeId: undefined,
   iqcId: undefined,
@@ -128,9 +147,9 @@ const formRules = reactive({
   vendorId: [{ required: true, message: '供应商不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
-
+const isEditable = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
-const isUpdate = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
 const isStock = computed(() => formType.value === 'stock') // 是否为上架模式
+const isDetail = computed(() => formType.value === 'detail') // 是否为详情模式
 const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value)) // 是否只读
 const dialogTitle = computed(() => {
   const titles = {
@@ -141,10 +160,13 @@ const dialogTitle = computed(() => {
   }
   return titles[formType.value] || formType.value
 })
+const originalFormData = ref<string>('') // 原始表单数据快照，用于脏检查
 
 /** 生成入库单编号 */
 const generateCode = async () => {
-  formData.value.code = await AutoCodeRecordApi.generateAutoCode(MesAutoCodeRuleCode.WM_ITEM_RECEIPT_CODE)
+  formData.value.code = await AutoCodeRecordApi.generateAutoCode(
+    MesAutoCodeRuleCode.WM_ITEM_RECEIPT_CODE
+  )
 }
 
 /** 到货通知单变化时，自动填充供应商 */
@@ -168,6 +190,8 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  // 保存原始数据快照
+  originalFormData.value = JSON.stringify(formData.value)
 }
 defineExpose({ open })
 
@@ -184,11 +208,14 @@ const submitForm = async () => {
       const res = await WmItemReceiptApi.createItemReceipt(data)
       message.success('新增成功')
       formData.value.id = res
+      formData.value.status = MesWmItemReceiptStatusEnum.PREPARE
       formType.value = 'update'
     } else {
       await WmItemReceiptApi.updateItemReceipt(data)
       message.success('修改成功')
     }
+    // 更新快照
+    originalFormData.value = JSON.stringify(formData.value)
     // 发送操作成功的事件
     emit('success')
   } finally {
@@ -196,6 +223,29 @@ const submitForm = async () => {
   }
 }
 
+/** 提交操作：表单修改过则先保存，再提交 */
+const handleSubmit = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  try {
+    await message.confirm('确认提交该采购入库单？【提交后将不能修改】')
+    formLoading.value = true
+    // 1. 表单有修改时，先保存
+    if (JSON.stringify(formData.value) !== originalFormData.value) {
+      const data = formData.value as unknown as WmItemReceiptVO
+      await WmItemReceiptApi.updateItemReceipt(data)
+    }
+    // 2. 提交入库单
+    await WmItemReceiptApi.submitItemReceipt(formData.value.id!)
+    message.success('提交成功')
+    dialogVisible.value = false
+    emit('success')
+  } catch {
+  } finally {
+    formLoading.value = false
+  }
+}
+
 /** 执行上架 */
 const handleStock = async () => {
   try {
@@ -211,12 +261,28 @@ const handleStock = async () => {
   }
 }
 
+/** 执行入库 */
+const handleFinish = async () => {
+  try {
+    await message.confirm('确认执行入库？执行后将更新库存台账。')
+    formLoading.value = true
+    await WmItemReceiptApi.finishItemReceipt(formData.value.id!)
+    message.success('入库成功')
+    dialogVisible.value = false
+    emit('success')
+  } catch {
+  } finally {
+    formLoading.value = false
+  }
+}
+
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
     id: undefined,
     code: undefined,
     name: undefined,
+    status: undefined,
     vendorId: undefined,
     noticeId: undefined,
     iqcId: undefined,

src/views/mes/wm/itemreceipt/index.vue

@@ -73,6 +73,7 @@
         </template>
       </el-table-column>
       <el-table-column label="入库单名称" align="center" prop="name" min-width="150" />
+      <el-table-column label="采购订单号" align="center" prop="purchaseOrderCode" min-width="140" />
       <el-table-column label="供应商名称" align="center" prop="vendorName" min-width="120" />
       <el-table-column
         label="入库日期"
@@ -98,15 +99,6 @@
           >
             编辑
           </el-button>
-          <el-button
-            link
-            type="warning"
-            @click="handleSubmit(scope.row.id)"
-            v-hasPermi="['mes:wm-item-receipt:update']"
-            v-if="scope.row.status === MesWmItemReceiptStatusEnum.PREPARE"
-          >
-            提交
-          </el-button>
           <el-button
             link
             type="danger"
@@ -126,16 +118,6 @@
           >
             执行上架
           </el-button>
-          <!-- 待入库：执行入库、取消 -->
-          <el-button
-            link
-            type="primary"
-            @click="handleFinish(scope.row.id)"
-            v-hasPermi="['mes:wm-item-receipt:finish']"
-            v-if="scope.row.status === MesWmItemReceiptStatusEnum.APPROVED"
-          >
-            执行入库
-          </el-button>
           <el-button
             link
             type="danger"
@@ -221,25 +203,9 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }
 
-/** 提交按钮操作 */
-const handleSubmit = async (id: number) => {
-  try {
-    await message.confirm('确认提交该采购入库单？')
-    await WmItemReceiptApi.submitItemReceipt(id)
-    message.success('提交成功')
-    await getList()
-  } catch {}
-}
 
-/** 执行入库 */
+
-const handleFinish = async (id: number) => {
+
-  try {
-    await message.confirm('确认执行入库？执行后将更新库存台账。')
-    await WmItemReceiptApi.finishItemReceipt(id)
-    message.success('入库成功')
-    await getList()
-  } catch {}
-}
 
 /** 取消 */
 const handleCancel = async (id: number) => {