diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue index eb77c04c6..e7aba727d 100644 --- a/src/components/SearchHigh/src/SearchHigh.vue +++ b/src/components/SearchHigh/src/SearchHigh.vue @@ -86,7 +86,7 @@ const moreListData = ref({ // 列表-操作按钮 const butttondata = [ defaultButtons.defaultSearchBtn(null), // 查询 - // defaultButtons.defaultSearchResetBtn(null), // 重置 + // defaultButtons.defaultSearchResetBtn(null), // 重置 重置功能现在有问题,让去掉 ] // 高级筛选条件列表配置 ==,!=,>,<,>=,<=,like,in,notIn,betweeen,isNull,isNotNull const moreListOptions = ref({ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index a6f7f394f..1e16d3c2b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -59,18 +59,30 @@ tableName:'contract', showDownload:true, hiddenDelete:true, + queryParams:[{ + queryField:'tableId', + rowField:'annexMasterId', + }], },{ label: t('ts.发票附件'), prop: 'Annex', tableName:'invoice', showDownload:true, hiddenDelete:true, + queryParams:[{ + queryField:'tableId', + rowField:'annexMasterId', + }], },{ label: t('ts.货运单附件'), prop: 'Annex', tableName:'waybill', showDownload:true, hiddenDelete:true, + queryParams:[{ + queryField:'tableId', + rowField:'annexMasterId', + }], }]" :annexAlias="{ label:t('ts.其他附件'), @@ -92,6 +104,8 @@ import * as SupplierinvoiceRecordMainApi from '@/api/wms/supplierinvoiceRecordMa import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecordDeatil' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' +import * as SupplierinvoiceRequestDetailApi from '@/api/wms/supplierinvoiceRequestDetail' + // 供应商发票记录主 defineOptions({ name: 'SupplierinvoiceRecordMain' }) @@ -164,8 +178,20 @@ const buttonTableClick = async (val, row) => { const { wsCache } = useCache() /** 详情操作 */ const detailRef = ref() -const openDetail = (row: any, titleName: any, titleValue: any) => { +const openDetail = async (row: any, titleName: any, titleValue: any) => { + console.log('openDetail',row) const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name + //获取申请中的masterId + const { tableObject: requestTableObject, tableMethods:requestTableMethods } = useTable({ + getListApi: SupplierinvoiceRequestDetailApi.getSupplierinvoiceRequestDetailPage // 分页接口 + }) + const { getList:requestGetList } = requestTableMethods + requestTableObject.params.number = row.requestNumber + await requestGetList() + if(requestTableObject.tableList.length>0){ + row.annexMasterId = requestTableObject.tableList[0].masterId + } + if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) detailRef.value.openDetail(row, titleName, titleValue) }