diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index 94195e82a..f98e86bea 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -603,14 +603,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '父包装号', - field: 'parentPackingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '父包装号', + // field: 'parentPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '包装规格', field: 'packUnit', @@ -841,10 +841,18 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, + // search: { + // component: 'DatePicker', + // componentProps: { + // valueFormat: 'YYYY-MM-DD HH:mm:ss', + // type: 'daterange', + // defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + // }, + // }, }, { label: '最后更新者', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue index a498edadb..be6758cc2 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue @@ -120,7 +120,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 + defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 7c8b46cf7..818eaf5f8 100644 --- a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -548,7 +548,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 26be02758..79238e5c7 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -598,7 +598,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index f61b9fa0f..cfb17f1b4 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -533,11 +533,11 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ } }, isSearch: true, - search: { + search: { component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 668ed89c8..608fdca4e 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -949,7 +949,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] }, }, diff --git a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue index 2fa43c6a2..2f42c17d9 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/supplierMoldCostMain/index.vue @@ -64,7 +64,18 @@ :detailButtonIsShowEdit="false" :detailButtonIsShowDelete="false" :buttondataTable="buttondataTable" - :otherHeadButttonData = "[]" + :otherHeadButttonData = "[ + { + label: t('ts.导出明细'), + name: 'export-detail', + hide: false, + type: 'primary', + // icon: 'ep:operation', + color: '', + float: 'left', + hasPermi: '' + } + ]" @buttonBaseClick="detailButtonBaseClick" @tableFormButton="tableFormButton" @@ -260,7 +271,7 @@ const buttonBaseClick = (val, item) => { } } - + const clicKRowId = ref() // 点击详情列表列按钮回调事件 const tableFormButton = async (val , row) => { if (val == 'close') { // 点击关闭 @@ -281,6 +292,7 @@ const buttonBaseClick = (val, item) => { value: row.number }] detailRef.value.openDetail(row, titleName, titleValue, 'basicCustomerStatementMain') + clicKRowId.value = row.id; } @@ -369,8 +381,30 @@ const importSuccess = () => { if (val == 'export') { // 子表导出明细 handleExportDetail(detailTableObject) + } else if (val === 'export-detail') { + console.log('导出明细:', clicKRowId.value) + handleDetailExport(clicKRowId.value) + } + } + /** 导出明细按钮操作 */ +const exportLoadingDetail = ref(false) // 导出的加载中 +const handleDetailExport = async (masterId) => { + try { + // 导出的二次确认 + await message.exportConfirm() + // 发起导出导出明细 + exportLoadingDetail.value = true + let params = { + masterId: masterId } + const excelTitle = ref(route.meta.title) + const data = await SuppliperMoldCostDetailApi.exportSupplierMoldCostDetail(params) + download.excel(data, `【${excelTitle.value}明细】【${formatDate(new Date())}】.xlsx`) + } catch { + } finally { + exportLoadingDetail.value = false } +} /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 // 子表导出明细 diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts index 876cbe2cd..126bc1e33 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts @@ -273,9 +273,9 @@ export const FinishedShipmentDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } + }, }, isForm: false, hiddenInMain:true diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts index 97157b8d2..2850d2e52 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts @@ -267,9 +267,9 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive([ component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } + }, }, isForm: false, hiddenInMain:true diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index d55297fd4..d772f8889 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -74,7 +74,8 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false + isTable:true, + sortTableDefault:5, }, { label: '供应商代码', @@ -975,6 +976,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive valueFormat: 'x', } }, + sortTableDefault:19, }, { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 8d38b3533..6daba3822 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -1052,6 +1052,18 @@ export const PurchasePlanDetail = useCrudSchemas( isTable: true, }, + { + label: '已收库存数量', + field: 'inventoryedQty', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isTable: true, + }, + // {需求作废 // label: '受入地', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 0eea10e7a..e3f8cf018 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -1770,7 +1770,7 @@ onMounted(async () => { sort: '', by: 'ASC' }) - item.componentProps.options = procurementCreators.list + item.componentProps.options = procurementCreators.list.filter(item => item.id != 1) } }) getList() diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index d98ea3621..f0cf35abb 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -16,7 +16,6 @@ const queryParams = { pageNo: 1, code: 'PurchaseInvoiceRequest' } -console.log(34343) const data = await getRequestsettingApi.getRequestsettingPage(queryParams) const requestsettingData = data?.list[0] || {} @@ -29,7 +28,8 @@ const requestsettingData = data?.list[0] || {} userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] -const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase',pageSize: 1000,pageNo: 1,sort: '',by: 'ASC' }) +const procurementCreators = await SupplierinvoiceRequestMainApi.queryUserInfoByRoleCode({ roleCode: 'purchase', pageSize: 1000, pageNo: 1, sort: '', by: 'ASC' }) +const purchasingPriceApprover = procurementCreators.list.filter(item => item.id != 1) /** * @returns {Array} 采购员列表 */ @@ -929,7 +929,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( isSearch:true, form: { component: 'Select', - api: () => procurementCreators.list, + api: () => purchasingPriceApprover, componentProps: { options:[], optionsAlias: { @@ -956,7 +956,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, search: { component: 'Select', - api: () => procurementCreators.list, + api: () => purchasingPriceApprover, componentProps: { options:[], optionsAlias: { @@ -978,7 +978,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( isDetail:false, form: { component: 'Select', - api: () => procurementCreators.list, + api: () => purchasingPriceApprover, componentProps: { optionsAlias: { labelField: 'nickname', @@ -1964,7 +1964,6 @@ function validateTaxRate(rule, value, callback) { } const validateGoldenTaxInvoiceNumber = (rule, value, callback) => { - console.log('金税票号',value) const reg = /^[0-9]*$/ if (value==null||value==''||reg.test(value)) { callback()