diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index e6f4942f1..7e77373b1 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -176,3 +176,7 @@ export const getBalanceToPackageSelection = async (data: any) => { export const getPackageByBarbasic = async (relateNumber) => { return await request.get({ url: `/wms/package/getPackageByBarbasic?relateNumber=${relateNumber}`}) } + +export const jasperExportAll = async(params: any) => { + return await request.download({url: `/wms/package/jasperExportAll`, params}) +} diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index caeb563ea..0ceee171b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -300,21 +300,12 @@ hiddenSearchHigh:true, isForm: false, search: { component: 'DatePicker', + value: dayjs().format('YYYY-MM'), componentProps: { - clearable:false, - type: 'month', valueFormat: 'YYYY-MM', + type: 'month', } }, - // search: { - // component: 'DatePicker', - // value: [dayjs(), dayjs().subtract(-3,'month')], - // componentProps: { - // valueFormat: 'YYYY-MM-DD', - // type: 'daterange', - // defaultTime: [new Date('1 '), new Date('1 ')] - // } - // }, }, { label: '操作', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts index dc3697ef7..b2377c6af 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts @@ -206,21 +206,12 @@ hiddenSearchHigh:true, isForm: false, search: { component: 'DatePicker', + value: dayjs().format('YYYY-MM'), componentProps: { - clearable:false, - type: 'month', valueFormat: 'YYYY-MM', + type: 'month', } }, - // search: { - // value: [dayjs(), dayjs().subtract(-3,'month')], - // component: 'DatePicker', - // componentProps: { - // valueFormat: 'YYYY-MM-DD', - // type: 'daterange', - // defaultTime: [new Date('1 '), new Date('1 ')] - // } - // }, } ])) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 725d5e109..fcaf7e333 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -116,8 +116,13 @@ fieldTableColumn="poLine" @detailOpenForm="detailOpenForm" @handleSubmitForm="handleDetailSubmitForm" + @detailBasicFormOnChange="detailBasicFormOnChange" - /> + > + + @@ -1068,8 +1073,16 @@ const handleSelectionPublish = async ()=>{ // 数字输入-改变事件 const inputNumberChange = (field, index, row, val) => { console.log('inputNumberChange', field, index, row, val) - row.planQty = row.boxQty * row.purchaseStdQty + if (field == 'boxQty') { + row.planQty = row.boxQty * row.purchaseStdQty + } } +const detailBasicFormOnChange =(field, val) => { + if (field == 'boxQty') { + detailRef.value.formRef.formRef.formModel.planQty = detailRef.value.formRef.formRef.formModel.boxQty * detailRef.value.formRef.formRef.formModel.purchaseStdQty + } +} + /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 191820308..de729046c 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -180,7 +180,9 @@ { }) } +/** 导出明细按钮操作 */ +const printAllLoading = ref(false) // 导出的加载中 + +const doHandlePrintAllExport = async (asnNumber) => { + try { + // 发起导出导出明细 + printAllLoading.value = true + let params = { + pageNo: 1, + relateNumber: asnNumber, + pageSize: 99999999, + } + const excelTitle = ref(route.meta.title) + const data = await PackageApi.jasperExportAll(params) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.pdf`) + } catch { + } finally { + printAllLoading.value = false + } +} +const handlePrintAllExport = async () => { + let res = await PackageApi.getLabelDetailPage({ + moduleName: 'supplier', + recordNumber: printRow.value.number, + pageSize: 1000, + pageNo: 1, + }) + + await PackageApi.batchPrintingLablesForYT(res.list) + .then(res => { + let asnNumber + if(res.xdpLabel){ + //协定品标签 + asnNumber = res.xdpLabel; + } + if (res.cgLabel) { + //采购标签 + asnNumber = res.cgLabel; + } + doHandlePrintAllExport(asnNumber); + }).catch(err => { + message.error(t('ts.创建标签失败')) + }) +} // 批量打印--供应商发货申请 const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => { @@ -1481,4 +1527,4 @@ onMounted(async () => { display: flex!important; opacity: 1; } - \ No newline at end of file +