缺陷:HL-5834M类型退货功能开发

src/api/wms/purchaseDetail/index.ts

@@ -55,6 +55,18 @@ export const getPurchaseDetailPageWMS = async (params) => {
   }
 }
 
+
+// 查询M类型的采购订单子列表
+export const getPurchaseDetailPageWMSMOrderType = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchase-detail/seniorWMS-MOrderType', data })
+  } else {
+    return await request.get({ url: `/wms/purchase-detail/pageWMS-MOrderType`, params })
+  }
+}
+
 export const getPurchaseDetailPageWMSTypeM = async (params) => {
   if (params.isSearch) {
     delete params.isSearch

src/api/wms/purchasereturnRequestDetail/index.ts

@@ -66,6 +66,18 @@ export const getPurchasereturnRequestDetailPageSpare = async (params) => {
   }
 }
 
+
+// 查询采购退货申请子列表--M类型退货
+export const getPurchasereturnRequestDetailPageMorderType = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereturn-request-detail/seniorMorderType', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereturn-request-detail/pageMorderType`, params })
+  }
+}
+
 // 查询采购退货申请子详情
 export const getPurchasereturnRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/purchasereturn-request-detail/get?id=` + id })

src/api/wms/purchasereturnRequestMain/index.ts

@@ -57,6 +57,11 @@ export const createPurchasereturnRequestMainNew = async (data: PurchasereturnReq
   return await request.post({ url: `/wms/purchasereturn-request-main/createReturnNew`, data })
 }
 
+// 新增采购退货申请主 --M类型采购退货
+export const createPurchasereturnRequestMainMType = async (data: PurchasereturnRequestMainVO) => {
+  return await request.post({ url: `/wms/purchasereturn-request-main/createReturnNewMtype`, data })
+}
+
 // 修改采购退货申请主
 export const updatePurchasereturnRequestMain = async (data: PurchasereturnRequestMainVO) => {
   return await request.put({ url: `/wms/purchasereturn-request-main/update`, data })

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue

@@ -117,7 +117,7 @@
     :detailAllSchemasRules="PurchasereturnRequestDetailRules"
     :apiCreate="PurchasereturnRequestDetailApi.createPurchasereturnRequestDetail"
     :apiUpdate="PurchasereturnRequestDetailApi.updatePurchasereturnRequestDetail"
-    :apiPage="PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage"
+    :apiPage="PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPageMorderType"
     :apiDelete="PurchasereturnRequestDetailApi.deletePurchasereturnRequestDetail"
     :Echo="Echo"
     @searchTableSuccessDetail="searchTableSuccessDetail"
@@ -181,7 +181,6 @@ import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMa
 import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail'
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
 import { PurchaseMain, PurchaseMainRules, PurchaseDetail, PurchaseDetailRules } from '@/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/purchaseMain.data'
-
 import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { SupplierdeliverRequestPackage } from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
@@ -240,7 +239,7 @@ const onEnter = async (field, value) => {
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const { tableObject: detatableData, tableMethods: detatableMethods } = useTable({
-  getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage
+  getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPageMorderType
 })
 const { getList: getDetailList } = detatableMethods
 
@@ -312,7 +311,7 @@ const updateTableData = (tableList)=>{
 const getSearchTableData = async (number,isEnter=false)=>{
   const {tableObject ,tableMethods} = useTable({
     defaultParams:{number},
-    getListApi: PurchaseDetailApi.getPurchaseDetailPageWMS // 分页接口
+    getListApi: PurchaseDetailApi.getPurchaseDetailPageWMSMOrderType // 分页接口
   })
   tableObject.pageSize = 500
   // 获得表格的各种操作
@@ -496,7 +495,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
 const Echo = []
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPage // 分页接口
+  getListApi: PurchasereturnRequestDetailApi.getPurchasereturnRequestDetailPageMorderType // 分页接口
 })
 
 // 获得表格的各种操作
@@ -877,7 +876,7 @@ const onChangeForm = async (field, cur, formRef)=>{
 }
 
 const getPurchanseList = async ()=>{
-  let res = await PurchaseDetailApi.getPurchaseDetailPageWMS({
+  let res = await PurchaseDetailApi.getPurchaseDetailPageWMSMOrderType({
     supplierCode: formRef.value.formRef.formModel.supplierCode,
     itemCode: formRef.value.formRef.formModel.itemCode,
     pageSize: 20,
@@ -911,7 +910,7 @@ const choosePurchanseList  = ()=>{
   searchTableRef.value.open(
     "直接选择采购订单",
     PurchaseMain.allSchemas,
-    PurchaseDetailApi.getPurchaseDetailPageWMS,
+    PurchaseDetailApi.getPurchaseDetailPageWMSMOrderType,
     "hehehe",
     "hehehe",
     false,
@@ -1012,7 +1011,7 @@ const submitForm = async (formType, submitData) => {
   try {
     if (formType === 'create') {
       data.orderTypeM='1';
-      await PurchasereceiptRequestMainApi.createPurchasereceiptRequestMain(data)
+      await PurchasereturnRequestMainApi.createPurchasereturnRequestMainMType(data)
       message.success(t('common.createSuccess'))
     } else {
       data.orderTypeM='1';

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts

@@ -55,12 +55,14 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         isConcatDetailSchemas:true,//是否是主子表合并 默认false
         searchDetailSchemas:PurchaseDetail.allSchemas,
         searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法
+        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMSMOrderType, // 查询弹窗所需分页方法
         isEnter:true,
         searchCondition: [{
-          key:'status',
-          value:'2',
-          message: '已发布状态',
+          key:'poLineType',
+          value:'M',
+          action: '==', 
+          message: 'M型的采购订单',
+          isSearch: true,
           isMainValue: false
         },
         {
@@ -113,7 +115,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       isConcatDetailSchemas:true,//是否是主子表合并 默认false
       searchDetailSchemas:PurchaseDetail.allSchemas,
       searchAllSchemas: PurchaseMain.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS,
+      searchPage: PurchaseDetailApi.getPurchaseDetailPageWMSMOrderType,
       searchCondition: [
       {
         key:'number',
@@ -142,7 +144,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         searchTitle: '采购订单信息',
         searchDetailSchemas:PurchaseDetail.allSchemas,
         searchAllSchemas: PurchaseMain.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPageWMSMOrderType,
         searchCondition: [{
           key:'supplierCode',
           value:'supplierCode',
@@ -397,7 +399,9 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         isFormModel: true,
       }], // 失去焦点校验参数
     },
-    isTableForm: true,
+    isTable:false,
+    isDetail:false,
+    isTableForm: false,
     isForm: false
   },
   {
@@ -427,6 +431,10 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       placeholder: '请选择到货日期',
       valueFormat: 'x',
     },
+    isTable:false,
+    isDetail:false,
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '生产日期',
@@ -455,6 +463,10 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       placeholder: '请选择生产日期',
       valueFormat: 'x',
     },
+    isTable:false,
+    isDetail:false,
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '批次',
@@ -466,7 +478,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     tableForm:{
       disabled: true
-    }
+    },
+    isTable:false,
+    isDetail:false,
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '过期日期',
@@ -480,7 +496,6 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
-    isTable:true,
     hiddenInMain:true,
     form: {
       component: 'DatePicker',
@@ -499,7 +514,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     tableForm:{
       type: 'slot',
       disabled: true
-    }
+    },
+    isTable:false,
+    isDetail:false,
+    isTableForm: false,
+    isForm: false
   },
   {
     label: '备注',