From f7f6e7ce933e07333c7fc46daf7fe8c6df79f48c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Mar 2026 20:02:15 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95=E5=92=8C=E8=A1=8C?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A8=E5=8D=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整到货通知单和行的表单结构，增强用户体验。修改了表单字段的布局和逻辑，确保数据的有效性和可用性。更新了相关组件的引用，提升代码的可读性和维护性。
---
 .../wm/arrivalnotice/ArrivalNoticeForm.vue    | 11 +++--
 .../arrivalnotice/ArrivalNoticeLineList.vue   | 47 +++++++------------
 src/views/mes/wm/arrivalnotice/index.vue      | 26 +++++++---
 3 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/views/mes/wm/arrivalnotice/ArrivalNoticeForm.vue b/src/views/mes/wm/arrivalnotice/ArrivalNoticeForm.vue
index 38060d26c..fa6939066 100644
--- a/src/views/mes/wm/arrivalnotice/ArrivalNoticeForm.vue
+++ b/src/views/mes/wm/arrivalnotice/ArrivalNoticeForm.vue
@@ -116,11 +116,14 @@
 </template>
 
 <script setup lang="ts">
-import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
-import { MesAutoCodeRuleCode, MesWmArrivalNoticeStatusEnum } from '@/views/mes/utils/constants'
 import { WmArrivalNoticeApi, WmArrivalNoticeVO } from '@/api/mes/wm/arrivalnotice'
-import ArrivalNoticeLineList from './ArrivalNoticeLineList.vue'
+import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
 import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
+import ArrivalNoticeLineList from './ArrivalNoticeLineList.vue'
+import {
+  MesAutoCodeRuleCode,
+  MesWmArrivalNoticeStatusEnum
+} from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'ArrivalNoticeForm' })
 const emit = defineEmits(['success'])
@@ -153,7 +156,6 @@ const formData = ref({
   contactTelephone: undefined,
   remark: undefined
 })
-const originalFormData = ref<string>('') // 原始表单数据快照，用于脏检查
 const formRules = reactive({
   code: [{ required: true, message: '通知单编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '通知单名称不能为空', trigger: 'blur' }],
@@ -161,6 +163,7 @@ const formRules = reactive({
   arrivalDate: [{ required: true, message: '请选择到货日期', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
+const originalFormData = ref<string>('') // 原始表单数据快照，用于脏检查
 
 /** 生成通知单编号 */
 const generateCode = async () => {
diff --git a/src/views/mes/wm/arrivalnotice/ArrivalNoticeLineList.vue b/src/views/mes/wm/arrivalnotice/ArrivalNoticeLineList.vue
index 1b9578a1c..38f275b91 100644
--- a/src/views/mes/wm/arrivalnotice/ArrivalNoticeLineList.vue
+++ b/src/views/mes/wm/arrivalnotice/ArrivalNoticeLineList.vue
@@ -16,7 +16,6 @@
         </template>
       </el-table-column>
       <el-table-column label="合格数量" align="center" prop="qualifiedQuantity" width="100" />
-      <!-- TODO @AI：是不是按需读取下； -->
       <el-table-column label="检验单号" align="center" prop="iqcCode" min-width="140" />
       <el-table-column label="备注" align="center" prop="remark" min-width="120" />
       <el-table-column v-if="isEditable" label="操作" align="center" width="120">
@@ -35,8 +34,7 @@
   </div>
 
   <!-- 添加/编辑行弹窗 -->
-  <!-- TODO @AI：一行 3 个 -->
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
     <el-form
       ref="formRef"
       :model="formData"
@@ -45,26 +43,16 @@
       v-loading="formLoading"
     >
       <el-row>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="物料" prop="itemId">
-            <!-- TODO @AI：换成选择器 -->
-            <el-select
+            <MdItemSelect
               v-model="formData.itemId"
               placeholder="请选择物料"
-              filterable
-              clearable
               class="!w-1/1"
-            >
-              <el-option
-                v-for="item in itemList"
-                :key="item.id"
-                :label="`${item.code} - ${item.name}`"
-                :value="item.id"
-              />
-            </el-select>
+            />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="到货数量" prop="arrivalQuantity">
             <el-input-number
               v-model="formData.arrivalQuantity"
@@ -75,9 +63,7 @@
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="是否检验" prop="iqcCheckFlag">
             <el-switch v-model="formData.iqcCheckFlag" />
           </el-form-item>
@@ -101,7 +87,7 @@
 <script setup lang="ts">
 import { DICT_TYPE } from '@/utils/dict'
 import { WmArrivalNoticeLineApi, WmArrivalNoticeLineVO } from '@/api/mes/wm/arrivalnotice/line'
-import { MdItemApi } from '@/api/mes/md/item'
+import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
 
 defineOptions({ name: 'ArrivalNoticeLineList' })
 
@@ -110,11 +96,11 @@ const props = defineProps<{
   formType?: string
 }>()
 
-const isEditable = computed(() => ['create', 'update'].includes(props.formType || ''))
-
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
+const isEditable = computed(() => ['create', 'update'].includes(props.formType || ''))
+
 // ==================== 列表 ====================
 const loading = ref(false) // 列表的加载中
 const list = ref<WmArrivalNoticeLineVO[]>([]) // 行列表
@@ -152,8 +138,7 @@ const handleDelete = async (id: number) => {
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中
-const dialogFormType = ref('') // 表单的类型
-const itemList = ref<any[]>([]) // 物料列表
+const lineFormType = ref('') // 行表单的类型
 const formData = ref({
   id: undefined,
   noticeId: undefined as number | undefined,
@@ -175,10 +160,9 @@ const formRef = ref() // 表单 Ref
 /** 打开表单弹窗 */
 const openForm = async (type: string, id?: number) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  dialogFormType.value = type
+  dialogTitle.value = type === 'create' ? '添加到货通知单行' : '修改到货通知单行'
+  lineFormType.value = type
   resetForm()
-  itemList.value = await MdItemApi.getItemSimpleList()
   if (id) {
     formLoading.value = true
     try {
@@ -194,8 +178,11 @@ const submitForm = async () => {
   await formRef.value.validate()
   formLoading.value = true
   try {
-    const data = { ...formData.value, noticeId: props.noticeId } as unknown as WmArrivalNoticeLineVO
-    if (dialogFormType.value === 'create') {
+    const data = {
+      ...formData.value,
+      noticeId: props.noticeId
+    } as unknown as WmArrivalNoticeLineVO
+    if (lineFormType.value === 'create') {
       await WmArrivalNoticeLineApi.createArrivalNoticeLine(data)
       message.success(t('common.createSuccess'))
     } else {
diff --git a/src/views/mes/wm/arrivalnotice/index.vue b/src/views/mes/wm/arrivalnotice/index.vue
index bd85a4a2f..fd7bf7cc9 100644
--- a/src/views/mes/wm/arrivalnotice/index.vue
+++ b/src/views/mes/wm/arrivalnotice/index.vue
@@ -48,7 +48,6 @@
           class="!w-240px"
         />
       </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>
@@ -124,7 +123,22 @@
           >
             删除
           </el-button>
-          <!-- TODO @AI：【待入库】后，需要前往哪里操作？是不是得有个提示给用户 -->
+          <el-button
+            link
+            type="warning"
+            v-if="scope.row.status === MesWmArrivalNoticeStatusEnum.PENDING_QC"
+            @click="message.alert('请前往【质量管理 - 待检任务】中进行来料检验操作')"
+          >
+            执行质检
+          </el-button>
+          <el-button
+            link
+            type="success"
+            v-if="scope.row.status === MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT"
+            @click="message.alert('请前往【仓库管理 - 采购入库】中进行入库操作')"
+          >
+            执行入库
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -167,6 +181,7 @@ const queryParams = reactive({
   arrivalDate: undefined
 })
 const queryFormRef = ref() // 搜索的表单
+const formRef = ref() // 表单弹窗
 
 /** 查询列表 */
 const getList = async () => {
@@ -180,20 +195,19 @@ const getList = async () => {
   }
 }
 
-/** 搜索 */
+/** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
   getList()
 }
 
-/** 重置 */
+/** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value.resetFields()
   handleQuery()
 }
 
-/** 新增/修改/详情 */
-const formRef = ref() // 表单弹窗
+/** 添加/修改操作 */
 const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id)
 }