采购退货修改

src/api/wms/purchasereceiptRecordDetail/index.ts

@@ -73,6 +73,17 @@ export const getPurchasereceiptRecordDetailPageSpare = async (params) => {
 }
 
 
+// 查询采购收货记录--退货筛选列表
+export const getPurchasereceiptRecordDetailPageReturn = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorReturn', data })
+  } else {
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/pageReturn`, params })
+  }
+}
+
 export const getPurchasereceiptRecordDetailPageSCP = async (params) => {
   if (params.isSearch) {
     delete params.isSearch

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

@@ -269,8 +269,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
               item.packingNumber = item.fromPackingNumber
               item.containerNumber = item.toContainerNumber
               item.receiptQty = item.qty
+              item.packUnit = item.packUnit
+              item.packQty = item.packQty
               item.toLocationGroupCode = null
               item.toWarehouseCode = null
+              item.fromLocationCode = null
               item.toAreaTypes = null
               item.toLocationCode = null
               // item.fromLocationCode = item.fromLocationCode
@@ -337,7 +340,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
       setV['supplierUom'] = val[0]['supplierUom']
       setV['inventoryStatus'] = val[0]['inventoryStatus']
       // setV['fromLocationCode'] = val[0]['toLocationCode']
-      setV['toLocationCode'] = val[0]['toLocationCode']
+      // setV['toLocationCode'] = val[0]['toLocationCode']
       setV['fromLocationGroupCode'] = val[0]['locationGroupCode']
       setV['toLocationGroupCode'] = null
       setV['toWarehouseCode'] = null
@@ -363,7 +366,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
         setV['containerNumber'] = val[0]['containerNumber']
         setV['containerNumber'] = val[0]['containerNumber']
         // setV['fromLocationCode'] = val[0]['fromLocationCode']
-        setV['toLocationCode'] = val[0]['toLocationCode']
+        // setV['toLocationCode'] = val[0]['toLocationCode']
       }
     }else {
       setV[formField] = val[0][searchField]

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

@@ -96,14 +96,6 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '计量单位',
     field: 'uom',
@@ -115,14 +107,6 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面
-    field: 'fromPackingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '包装规格',
     field: 'packUnit',
@@ -133,21 +117,6 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
-  {
-    label: '包装数量',
-    field: 'packQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    tableForm: {
-      disabled: true,
-    },
-    isForm:false,
-  },
   {
     label: '从库位代码',
     field: 'fromLocationCode',
@@ -241,7 +210,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '采购收货记录', // 查询弹窗标题
         searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, // 查询弹窗所需分页方法
+        searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法
         searchCondition: [
         {
           key: 'supplierCode',
@@ -677,7 +646,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     }, 
     tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
+      isInpuFocusShow: false, // 开启查询弹窗
       searchListPlaceholder: '请选择订单行',
       searchField: 'poLine',
       searchTitle: '采购收货记录信息',
@@ -693,7 +662,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true,
+        isSearchList: false,
         searchListPlaceholder: '请选择订单行',
         searchField: 'poLine',
         searchTitle: '采购收货记录信息',
@@ -799,24 +768,17 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  // {
+  
-  //   label: '从批次',
-  //   field: 'fromBatch',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   }, 
-  //   tableForm:{
-  //     disabled:true
-  //   }
-  // },
   {
-    label: '批次',
+    label: '替代批次',
-    field: 'batch',
+    field: 'altBatch',
     sort: 'custom',
     table: {
       width: 150 
     }, 
+    hiddenInMain: true,
+    isTableForm: false,
+    isTable: false,
     tableForm:{
       disabled:true
     },
@@ -827,18 +789,18 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '替代批次',
+    label: '包装号',
-    field: 'altBatch',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     }, 
     hiddenInMain: true,
-    isTableForm: false,
-    isTable: false,
     tableForm:{
       disabled:true
     },
+    isTableForm: false,
+    isTable: false,
     form: {
       componentProps:{
         disabled:true
@@ -846,8 +808,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '包装号',
+    label: '器具号',
-    field: 'packingNumber',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
@@ -865,18 +827,20 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '器具号',
+    label: '计量单位',
-    field: 'containerNumber',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     }, 
-    hiddenInMain: true,
     tableForm:{
-      disabled:true
+      disabled:true,
+      type: 'Select',
     },
-    isTableForm: false,
-    isTable: false,
     form: {
       componentProps:{
         disabled:true
@@ -898,6 +862,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
         disabled:true
       }
     },
+    isTable:false,
+    isTableForm:false,
     tableForm:{
       disabled:true,
       type:'InputNumber',
@@ -951,27 +917,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       precision: 6
     }
   },
-  {
+  
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    }, 
-    tableForm:{
-      disabled:true,
-      type: 'Select',
-    },
-    form: {
-      componentProps:{
-        disabled:true
-      }
-    }
-  },
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -1171,7 +1117,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
   },
- 
   {
     label: '项目代码',
     field: 'projectCode',
@@ -1397,7 +1342,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     table: {
       width: 150
     },
-    isTableForm: false,
+    isTableForm: true,
     isForm: false
   },
   {
@@ -1485,17 +1430,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       valueFormat: 'x',
     },
   },
-  {
+  
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      disabled: true
-    }
-  },
   {
     label: '替代批次',
     field: 'altBatch',
@@ -1522,6 +1457,14 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       type: 'Select'
     }
   },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '包装数量',
     field: 'packQty',