Browse Source

Merge branch 'hella_online_20240823' into hella_online_20240803

hella_online_20240828
陈薪名 3 months ago
parent
commit
86bdaa2826
  1. 4
      src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts
  2. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

4
src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@ -383,7 +383,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
}, },
{ // {
// label: '库位', // label: '库位',
// field: 'location', // field: 'location',
// sort: 'custom', // sort: 'custom',
@ -418,7 +418,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
// } // }
// }, // },
// isSearch: true // isSearch: true
}, // },
// { // {
// label: '是否确认接收', // label: '是否确认接收',
// field: 'isRecive', // field: 'isRecive',

2
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@ -241,7 +241,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage // getListApi: SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage //
}) })
const { getList:requestGetList } = requestTableMethods const { getList:requestGetList } = requestTableMethods
requestTableObject.params.requestNumber = row.requestNumber requestTableObject.params.number = row.requestNumber
await requestGetList() await requestGetList()
if(requestTableObject.tableList.length>0){ if(requestTableObject.tableList.length>0){
row.annexMasterId = requestTableObject.tableList[0].masterId row.annexMasterId = requestTableObject.tableList[0].masterId

Loading…
Cancel
Save