refactor(mes): 调整供应商退货模块字段映射

refactor(mes): 同步供应商退货字段变更

src/api/mes/wm/returnvendor/detail/index.ts

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 // MES 供应商退货明细 VO
 export interface WmReturnVendorDetailVO {
   id?: number
-  returnVendorId: number
+  returnId: number
   lineId: number
   materialStockId: number
   itemId: number

src/api/mes/wm/returnvendor/index.ts

@@ -5,11 +5,11 @@ export interface WmReturnVendorVO {
   id?: number
   code?: string
   name: string
-  poCode?: string
+  purchaseOrderCode?: string
   vendorId?: number
+  vendorCode?: string
   vendorName?: string
   vendorNickname?: string
-  batchCode?: string
   returnDate?: string
   returnReason?: string
   transportCode?: string

src/api/mes/wm/returnvendor/line/index.ts

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 // MES 供应商退货单行 VO
 export interface WmReturnVendorLineVO {
   id?: number
-  returnVendorId: number
+  returnId: number
   itemId: number
   itemCode?: string
   itemName?: string

src/views/mes/wm/returnvendor/ReturnVendorDetailForm.vue

@@ -56,7 +56,7 @@ import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehou
 defineOptions({ name: 'ReturnVendorDetailForm' })
 
 const props = defineProps<{
-  returnVendorId: number
+  returnId: number
 }>()
 
 const emit = defineEmits(['success'])
@@ -73,7 +73,7 @@ const formRef = ref() // 表单 Ref
 const formData = ref({
   id: undefined as number | undefined,
   lineId: undefined as number | undefined,
-  returnVendorId: undefined as number | undefined,
+  returnId: undefined as number | undefined,
   itemId: undefined as number | undefined,
   quantity: undefined as number | undefined,
   batchCode: undefined as string | undefined,
@@ -119,7 +119,7 @@ const submitForm = async () => {
   try {
     const data = {
       ...formData.value,
-      returnVendorId: props.returnVendorId,
+      returnId: props.returnId,
       lineId: currentLineId.value
     } as unknown as WmReturnVendorDetailVO
     if (formType.value === 'create') {
@@ -142,7 +142,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     lineId: undefined,
-    returnVendorId: undefined,
+    returnId: undefined,
     itemId: undefined,
     quantity: undefined,
     batchCode: undefined,

src/views/mes/wm/returnvendor/ReturnVendorDetailList.vue

@@ -34,7 +34,7 @@ import {
 defineOptions({ name: 'ReturnVendorDetailList' })
 
 const props = defineProps<{
-  returnVendorId: number
+  returnId: number
   lineId: number
   itemId: number
   formType: string

src/views/mes/wm/returnvendor/ReturnVendorForm.vue

@@ -33,21 +33,19 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="供应商" prop="vendorId">
+          <el-form-item label="采购订单号" prop="purchaseOrderCode">
-            <MdVendorSelect v-model="formData.vendorId" :disabled="isHeaderReadonly" />
-          </el-form-item>
-        </el-col>
-        <!-- TODO @AI：字段完整拼写 -->
-        <el-col :span="8">
-          <el-form-item label="采购订单号" prop="poCode">
             <el-input
-              v-model="formData.poCode"
+              v-model="formData.purchaseOrderCode"
               placeholder="请输入采购订单号"
               :disabled="isHeaderReadonly"
             />
           </el-form-item>
         </el-col>
-        <!-- TODO @AI：供应商 select（必填） -->
+        <el-col :span="8">
+          <el-form-item label="供应商" prop="vendorId">
+            <MdVendorSelect v-model="formData.vendorId" :disabled="isHeaderReadonly" />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="退货日期" prop="returnDate">
             <el-date-picker
@@ -60,36 +58,25 @@
             />
           </el-form-item>
         </el-col>
-        <!-- TODO @AI：不需要批次号 -->
+        <el-col :span="24">
-        <el-col :span="8">
-          <el-form-item label="批次号" prop="batchCode">
-            <el-input
-              v-model="formData.batchCode"
-              placeholder="请输入批次号"
-              :disabled="isHeaderReadonly"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item label="退货原因" prop="returnReason">
             <el-input
               v-model="formData.returnReason"
+              type="textarea"
               placeholder="请输入退货原因"
               :disabled="isHeaderReadonly"
             />
           </el-form-item>
         </el-col>
-        <!-- TODO @AI：运单号 -->
         <el-col :span="8">
-          <el-form-item label="物流单号" prop="transportCode">
+          <el-form-item label="运单号" prop="transportCode">
             <el-input
               v-model="formData.transportCode"
-              placeholder="请输入物流单号"
+              placeholder="请输入运单号"
               :disabled="isHeaderReadonly"
             />
           </el-form-item>
         </el-col>
-        <!-- TODO @AI：联系人 -->
         <el-col :span="8">
           <el-form-item label="联系电话" prop="transportTelephone">
             <el-input
@@ -114,7 +101,7 @@
     <!-- 非新建模式展示行项目信息（退货物料） -->
     <template v-if="formData.id">
       <el-divider content-position="center">物料信息</el-divider>
-      <ReturnVendorLineList :return-vendor-id="formData.id" :form-type="formType" />
+      <ReturnVendorLineList :return-id="formData.id" :form-type="formType" />
     </template>
     <template #footer>
       <el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
@@ -145,9 +132,9 @@ const formData = ref({
   id: undefined as number | undefined,
   code: undefined,
   name: undefined,
-  poCode: undefined,
+  purchaseOrderCode: undefined,
   vendorId: undefined,
-  batchCode: undefined,
+
   returnDate: undefined,
   returnReason: undefined,
   transportCode: undefined,
@@ -157,6 +144,7 @@ const formData = ref({
 const formRules = reactive({
   code: [{ required: true, message: '退货单编号不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '退货单名称不能为空', trigger: 'blur' }],
+  vendorId: [{ required: true, message: '供应商不能为空', trigger: 'change' }],
   returnDate: [{ required: true, message: '退货日期不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
@@ -246,9 +234,9 @@ const resetForm = () => {
     id: undefined,
     code: undefined,
     name: undefined,
-    poCode: undefined,
+    purchaseOrderCode: undefined,
     vendorId: undefined,
-    batchCode: undefined,
+
     returnDate: undefined,
     returnReason: undefined,
     transportCode: undefined,

src/views/mes/wm/returnvendor/ReturnVendorLineList.vue

@@ -16,7 +16,7 @@
         <template #default="scope">
           <ReturnVendorDetailList
             :ref="(el: any) => setDetailListRef(scope.row.id, el)"
-            :return-vendor-id="props.returnVendorId"
+            :return-id="props.returnId"
             :line-id="scope.row.id"
             :item-id="scope.row.itemId"
             :form-type="props.formType"
@@ -32,7 +32,7 @@
       <el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
       <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
       <el-table-column label="退货数量" align="center" prop="quantity" width="100" />
-      <!-- TODO @AI：批次号 -->
+      <el-table-column label="批次号" align="center" prop="batchId" width="80" />
       <el-table-column
         v-if="isUpdate || isStock"
         label="操作"
@@ -50,6 +50,7 @@
           <el-button v-if="isStock" link type="success" @click="handlePicking(scope.row.id)">
             拣货
           </el-button>
+          <!-- TODO @芋艿：【标签打印】后续在加； -->
         </template>
       </el-table-column>
     </el-table>
@@ -92,6 +93,7 @@
             />
           </el-form-item>
         </el-col>
+        <!-- TODO @芋艿：这里差一个批次号的选择器；【暂不处理】 -->
       </el-row>
       <el-row>
         <el-col :span="24">
@@ -110,7 +112,7 @@
   <!-- 拣货明细添加/编辑弹窗 -->
   <ReturnVendorDetailForm
     ref="detailFormRef"
-    :return-vendor-id="props.returnVendorId"
+    :return-id="props.returnId"
     @success="onDetailFormSuccess"
   />
 </template>
@@ -124,7 +126,7 @@ import ReturnVendorDetailForm from './ReturnVendorDetailForm.vue'
 defineOptions({ name: 'ReturnVendorLineList' })
 
 const props = defineProps<{
-  returnVendorId: number
+  returnId: number
   formType: string
 }>()
 
@@ -141,14 +143,14 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  returnVendorId: undefined as number | undefined
+  returnId: undefined as number | undefined
 })
 
 /** 查询行列表 */
 const getList = async () => {
   loading.value = true
   try {
-    queryParams.returnVendorId = props.returnVendorId
+    queryParams.returnId = props.returnId
     const data = await WmReturnVendorLineApi.getReturnVendorLinePage(queryParams)
     list.value = data.list
     total.value = data.total
@@ -174,7 +176,7 @@ const formLoading = ref(false) // 表单的加载中
 const lineFormType = ref('') // 行表单的类型
 const formData = ref({
   id: undefined,
-  returnVendorId: undefined as number | undefined,
+  returnId: undefined as number | undefined,
   itemId: undefined,
   quantity: undefined,
   remark: undefined
@@ -215,7 +217,7 @@ const submitForm = async () => {
   try {
     const data = {
       ...formData.value,
-      returnVendorId: props.returnVendorId
+      returnId: props.returnId
     } as unknown as WmReturnVendorLineVO
     if (lineFormType.value === 'create') {
       await WmReturnVendorLineApi.createReturnVendorLine(data)
@@ -235,7 +237,7 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    returnVendorId: undefined,
+    returnId: undefined,
     itemId: undefined,
     quantity: undefined,
     remark: undefined

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

@@ -25,34 +25,17 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!-- TODO @AI：采购订单编号 -->
+      <el-form-item label="采购订单编号" prop="purchaseOrderCode">
-      <!-- TODO @AI：供应商筛选 -->
+        <el-input
-      <!-- TODO @AI：去掉 returnDate、status；包括前后端； -->
+          v-model="queryParams.purchaseOrderCode"
-      <el-form-item label="退货日期" prop="returnDate">
+          placeholder="请输入采购订单编号"
-        <el-date-picker
+          clearable
-          v-model="queryParams.returnDate"
+          @keyup.enter="handleQuery"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="单据状态" prop="status">
+      <el-form-item label="供应商" prop="vendorId">
-        <el-select
+        <MdVendorSelect v-model="queryParams.vendorId" clearable class="!w-240px" />
-          v-model="queryParams.status"
-          placeholder="请选择单据状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_RETURN_VENDOR_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
@@ -88,11 +71,9 @@
         </template>
       </el-table-column>
       <el-table-column label="退货单名称" align="center" prop="name" min-width="150" />
-      <el-table-column label="采购订单号" align="center" prop="poCode" min-width="140" />
+      <el-table-column label="采购订单号" align="center" prop="purchaseOrderCode" min-width="140" />
-      <!-- TODO @AI：拆成供应商编码、供应商名称 -->
+      <el-table-column label="供应商编码" align="center" prop="vendorCode" min-width="120" />
-      <el-table-column label="供应商" align="center" prop="vendorName" min-width="150" />
+      <el-table-column label="供应商名称" align="center" prop="vendorName" min-width="150" />
-      <!-- TODO @AI：去掉 batchCode 字段-->
-      <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
       <el-table-column
         label="退货日期"
         align="center"
@@ -100,8 +81,6 @@
         :formatter="dateFormatter2"
         width="180px"
       />
-      <!-- TODO @AI：去掉 returnReason 字段-->
-      <el-table-column label="退货原因" align="center" prop="returnReason" min-width="150" />
       <el-table-column label="单据状态" align="center" prop="status" min-width="110">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_RETURN_VENDOR_STATUS" :value="scope.row.status" />
@@ -188,10 +167,11 @@
 
 <script setup lang="ts">
 import { dateFormatter2 } from '@/utils/formatTime'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE } from '@/utils/dict'
 import download from '@/utils/download'
 import { WmReturnVendorApi, WmReturnVendorVO } from '@/api/mes/wm/returnvendor'
 import ReturnVendorForm from './ReturnVendorForm.vue'
+import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
 import { MesWmReturnVendorStatusEnum } from '@/views/mes/utils/constants'
 
 defineOptions({ name: 'MesWmReturnVendor' })
@@ -208,8 +188,8 @@ const queryParams = reactive({
   pageSize: 10,
   code: undefined,
   name: undefined,
-  status: undefined,
+  purchaseOrderCode: undefined,
-  returnDate: undefined
+  vendorId: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const formRef = ref() // 表单弹窗