diff --git a/oms_web/oms_vue/src/api/base/vendor.js b/oms_web/oms_vue/src/api/base/vendor.js index f21eb478..e2329991 100644 --- a/oms_web/oms_vue/src/api/base/vendor.js +++ b/oms_web/oms_vue/src/api/base/vendor.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { tansParams } from '@/utils/ruoyi' // 查询制造商信息列表 export function listVendor(query) { @@ -48,7 +49,9 @@ export function exportVendor(query) { return request({ url: '/system/vendor/export', method: 'post', - params: query + data: query, + transformRequest: [(params) => tansParams(params)], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }) } diff --git a/oms_web/oms_vue/src/api/manage/order.js b/oms_web/oms_vue/src/api/manage/order.js index 4f2e87bf..09f248c9 100644 --- a/oms_web/oms_vue/src/api/manage/order.js +++ b/oms_web/oms_vue/src/api/manage/order.js @@ -49,7 +49,7 @@ export function delOrder(id) { export function exportOrder(query) { return request({ url: `${baseURL}/export`, - method: 'post', + method: 'get', params: query }) } diff --git a/oms_web/oms_vue/src/api/project/info.js b/oms_web/oms_vue/src/api/project/info.js index 01d1537a..22425a6f 100644 --- a/oms_web/oms_vue/src/api/project/info.js +++ b/oms_web/oms_vue/src/api/project/info.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { tansParams } from '@/utils/ruoyi' // 查询项目管理列表 export function listProject(query) { @@ -51,7 +52,9 @@ export function exportProject(query) { return request({ url: '/sip/project/vue/export', method: 'post', - params: query + data: query, + transformRequest: [(params) => tansParams(params)], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }) } diff --git a/oms_web/oms_vue/src/api/system/agent.js b/oms_web/oms_vue/src/api/system/agent.js index 231aa39a..a4976b04 100644 --- a/oms_web/oms_vue/src/api/system/agent.js +++ b/oms_web/oms_vue/src/api/system/agent.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { tansParams } from '@/utils/ruoyi' // 查询办事处信息列表 export function listAgent(query) { @@ -48,6 +49,8 @@ export function exportAgent(query) { return request({ url: '/system/agent/vue/export', method: 'post', - params: query + data: query, + transformRequest: [(params) => tansParams(params)], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }) } diff --git a/oms_web/oms_vue/src/api/system/customer.js b/oms_web/oms_vue/src/api/system/customer.js index ca57bfb8..74054ca0 100644 --- a/oms_web/oms_vue/src/api/system/customer.js +++ b/oms_web/oms_vue/src/api/system/customer.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { tansParams } from '@/utils/ruoyi' // 查询客户信息列表 export function listCustomer(query) { @@ -48,6 +49,8 @@ export function exportCustomer(query) { return request({ url: '/system/customer/vue/export', method: 'post', - params: query + data: query, + transformRequest: [(params) => tansParams(params)], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' } }) } diff --git a/oms_web/oms_vue/src/api/system/product.js b/oms_web/oms_vue/src/api/system/product.js index 27fa2850..7bd41af3 100644 --- a/oms_web/oms_vue/src/api/system/product.js +++ b/oms_web/oms_vue/src/api/system/product.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { tansParams } from '@/utils/ruoyi' // 查询产品管理列表 export function listProduct(query) { @@ -45,11 +46,13 @@ export function delProduct(id) { // 导出产品管理 export function exportProduct(query) { - return request({ - url: '/system/product/export', - method: 'post', - params: query - }) + return request({ + url: '/system/product/export', + method: 'post', + data: query, + transformRequest: [(params) => tansParams(params)], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' } + }) } // a new function that queries a product by its code diff --git a/oms_web/oms_vue/src/api/warehouse/info.js b/oms_web/oms_vue/src/api/warehouse/info.js index 7ce45eaa..b0317a4f 100644 --- a/oms_web/oms_vue/src/api/warehouse/info.js +++ b/oms_web/oms_vue/src/api/warehouse/info.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import { tansParams } from '@/utils/ruoyi' // 查询仓库基础信息列表 export function listInfo(query) { @@ -45,9 +46,11 @@ export function delInfo(id) { // 导出仓库基础信息 export function exportInfo(query) { - return request({ - url: '/warehouse/info/export', - method: 'post', - params: query - }) - } + return request({ + url: '/warehouse/info/export', + method: 'post', + data: query, + transformRequest: [(params) => tansParams(params)], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' } + }) +} diff --git a/oms_web/oms_vue/src/views/base/vendor/index.vue b/oms_web/oms_vue/src/views/base/vendor/index.vue index b8492ee8..9019ec28 100644 --- a/oms_web/oms_vue/src/views/base/vendor/index.vue +++ b/oms_web/oms_vue/src/views/base/vendor/index.vue @@ -301,6 +301,8 @@ export default { loading: true, // 选中数组 ids: [], + // 选中制造商编码 + selectedVendorCodes: [], // 非单个禁用 single: true, // 非多个禁用 @@ -454,6 +456,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.vendorId) + this.selectedVendorCodes = selection.map(item => item.vendorCode) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -526,8 +529,12 @@ export default { }, /** 导出按钮操作 */ handleExport() { - const queryParams = this.queryParams; - this.$modal.confirm('是否确认导出所有制造商信息数据项？').then(() => { + const queryParams = { + ...this.queryParams, + vendorCodeList: this.selectedVendorCodes.length ? this.selectedVendorCodes : undefined + }; + const exportTip = this.selectedVendorCodes.length ? '是否确认导出选中的制造商信息数据项？' : '是否确认导出所有制造商信息数据项？'; + this.$modal.confirm(exportTip).then(() => { this.exportLoading = true; return exportVendor(queryParams); }).then(response => { diff --git a/oms_web/oms_vue/src/views/manage/delivery/index.vue b/oms_web/oms_vue/src/views/manage/delivery/index.vue index 7533fe29..29a5e80f 100644 --- a/oms_web/oms_vue/src/views/manage/delivery/index.vue +++ b/oms_web/oms_vue/src/views/manage/delivery/index.vue @@ -315,8 +315,14 @@ export default { }, /** 导出按钮操作 */ handleExport() { - const queryParams = this.queryParams; - this.$confirm('是否确认导出所有发货记录数据项?', "警告", { + const queryParams = { + ...this.queryParams, + ids: this.ids.length ? this.ids.join(",") : undefined + }; + const confirmText = this.ids.length + ? "是否确认导出选中的发货记录数据项?" + : "是否确认导出所有发货记录数据项?"; + this.$confirm(confirmText, "警告", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" diff --git a/oms_web/oms_vue/src/views/manage/order/index.vue b/oms_web/oms_vue/src/views/manage/order/index.vue index ba19dda8..ade55dc3 100644 --- a/oms_web/oms_vue/src/views/manage/order/index.vue +++ b/oms_web/oms_vue/src/views/manage/order/index.vue @@ -188,8 +188,14 @@ export default { }, /** 导出按钮操作 */ handleExport() { - const queryParams = this.queryParams; - this.$modal.confirm('是否确认导出所有合同档案数据项？').then(() => { + const queryParams = { + ...this.queryParams, + ids: this.ids.length ? this.ids.join(",") : undefined + }; + const confirmText = this.ids.length + ? "是否确认导出选中的合同档案数据项？" + : "是否确认导出所有合同档案数据项？"; + this.$modal.confirm(confirmText).then(() => { return exportOrder(queryParams); }).then(response => { const fileName = response.msg; diff --git a/oms_web/oms_vue/src/views/project/info/index.vue b/oms_web/oms_vue/src/views/project/info/index.vue index 86f8e591..31bdab9b 100644 --- a/oms_web/oms_vue/src/views/project/info/index.vue +++ b/oms_web/oms_vue/src/views/project/info/index.vue @@ -316,6 +316,8 @@ export default { canUpdateJoinTrial: false, // 选中数组 ids: [], + // 选中项目ID + selectedProjectIds: [], // 非单个禁用 single: true, // 非多个禁用 @@ -466,6 +468,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) + this.selectedProjectIds = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -500,9 +503,14 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.$modal.confirm('是否确认导出所有项目管理数据项？').then(() => { + const queryParams = { + ...this.queryParams, + ids: this.selectedProjectIds.length ? this.selectedProjectIds.join(',') : undefined + } + const exportTip = this.selectedProjectIds.length ? '是否确认导出选中的项目管理数据项？' : '是否确认导出所有项目管理数据项？' + this.$modal.confirm(exportTip).then(() => { this.loading = true; - return exportProject(this.queryParams); + return exportProject(queryParams); }).then(response => { this.loading = false; const fileName = response.msg; diff --git a/oms_web/oms_vue/src/views/project/order/index.vue b/oms_web/oms_vue/src/views/project/order/index.vue index 71db1b83..91918bfa 100644 --- a/oms_web/oms_vue/src/views/project/order/index.vue +++ b/oms_web/oms_vue/src/views/project/order/index.vue @@ -165,6 +165,8 @@ export default { loading: true, // 选中数组 ids: [], + // 选中订单ID + selectedOrderIds: [], // 非单个禁用 single: true, // 非多个禁用 @@ -262,6 +264,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) + this.selectedOrderIds = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -299,6 +302,7 @@ export default { handleExport() { let query = { ...this.queryParams }; query.params = {}; + query.ids = this.selectedOrderIds.length ? this.selectedOrderIds.join(',') : undefined; if (this.dateRange && this.dateRange.length === 2) { const timeType = this.queryParams.timeType; const beginKey = `begin${timeType.charAt(0).toUpperCase() + timeType.slice(1)}`; @@ -307,7 +311,8 @@ export default { query.params[endKey] = this.dateRange[1]; } delete query.timeType; - this.$confirm('是否确认导出所有订单管理数据项?', "警告", { + const exportTip = this.selectedOrderIds.length ? '是否确认导出选中的订单管理数据项?' : '是否确认导出所有订单管理数据项?'; + this.$confirm(exportTip, "警告", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" diff --git a/oms_web/oms_vue/src/views/project/order/orderFinance.vue b/oms_web/oms_vue/src/views/project/order/orderFinance.vue index 3cbb6a9e..7d587f14 100644 --- a/oms_web/oms_vue/src/views/project/order/orderFinance.vue +++ b/oms_web/oms_vue/src/views/project/order/orderFinance.vue @@ -219,6 +219,8 @@ export default { loading: true, // 选中数组 ids: [], + // 选中订单ID + selectedOrderIds: [], // 非单个禁用 single: true, // 非多个禁用 @@ -308,6 +310,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) + this.selectedOrderIds = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -325,7 +328,8 @@ export default { this.addDateRange(this.queryParams, this.dateRange); this.changeTimeType(); this.download('/project/order/finance/export', { - ...this.queryParams + ...this.queryParams, + ids: this.selectedOrderIds.length ? this.selectedOrderIds.join(',') : undefined }, `order_finance_${new Date().getTime()}.xlsx`) }, /** 时间选择类型切换 */ diff --git a/oms_web/oms_vue/src/views/system/agent/index.vue b/oms_web/oms_vue/src/views/system/agent/index.vue index 871f29c8..c3a90911 100644 --- a/oms_web/oms_vue/src/views/system/agent/index.vue +++ b/oms_web/oms_vue/src/views/system/agent/index.vue @@ -200,6 +200,8 @@ export default { loading: true, // 选中数组 ids: [], + // 选中办事处编码 + selectedAgentCodes: [], // 非单个禁用 single: true, // 非多个禁用 @@ -332,6 +334,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) + this.selectedAgentCodes = selection.map(item => item.agentCode) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -390,8 +393,13 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.$modal.confirm('是否确认导出所有办事处信息数据项？').then(() => { - return exportAgent(this.queryParams); + const queryParams = { + ...this.queryParams, + agentCodeList: this.selectedAgentCodes.length ? this.selectedAgentCodes : undefined + } + const exportTip = this.selectedAgentCodes.length ? '是否确认导出选中的办事处信息数据项？' : '是否确认导出所有办事处信息数据项？' + this.$modal.confirm(exportTip).then(() => { + return exportAgent(queryParams); }).then(response => { this.$download.download(response.msg); }).catch(() => {}); diff --git a/oms_web/oms_vue/src/views/system/customer/index.vue b/oms_web/oms_vue/src/views/system/customer/index.vue index f7b59377..9f0af1ee 100644 --- a/oms_web/oms_vue/src/views/system/customer/index.vue +++ b/oms_web/oms_vue/src/views/system/customer/index.vue @@ -264,6 +264,8 @@ export default { loading: true, // 选中数组 ids: [], + // 选中客户编码 + selectedCustomerCodes: [], // 非单个禁用 single: true, // 非多个禁用 @@ -426,6 +428,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) + this.selectedCustomerCodes = selection.map(item => item.customerCode) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -490,8 +493,13 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.$modal.confirm('是否确认导出所有客户信息数据项？').then(() => { - return exportCustomer(this.queryParams); + const queryParams = { + ...this.queryParams, + customerCodeList: this.selectedCustomerCodes.length ? this.selectedCustomerCodes : undefined + } + const exportTip = this.selectedCustomerCodes.length ? '是否确认导出选中的客户信息数据项？' : '是否确认导出所有客户信息数据项？' + this.$modal.confirm(exportTip).then(() => { + return exportCustomer(queryParams); }).then(response => { this.$download.download(response.msg); }).catch(() => {}); diff --git a/oms_web/oms_vue/src/views/system/partner/index.vue b/oms_web/oms_vue/src/views/system/partner/index.vue index e0bc2779..89887baa 100644 --- a/oms_web/oms_vue/src/views/system/partner/index.vue +++ b/oms_web/oms_vue/src/views/system/partner/index.vue @@ -287,6 +287,8 @@ export default { loading: true, // 选中数组 ids: [], + // 选中代理商编码 + selectedPartnerCodes: [], // 非单个禁用 single: true, // 非多个禁用 @@ -462,6 +464,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) + this.selectedPartnerCodes = selection.map(item => item.partnerCode) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -520,8 +523,13 @@ export default { }, /** 导出按钮操作 */ handleExport() { - this.$modal.confirm('是否确认导出所有代理商管理数据项？').then(() => { - return exportPartner(this.queryParams); + const queryParams = { + ...this.queryParams, + partnerCodeList: this.selectedPartnerCodes.length ? this.selectedPartnerCodes : undefined + }; + const exportTip = this.selectedPartnerCodes.length ? '是否确认导出选中的代理商管理数据项？' : '是否确认导出所有代理商管理数据项？'; + this.$modal.confirm(exportTip).then(() => { + return exportPartner(queryParams); }).then(response => { this.$download.download(response.msg); }).catch(() => {}); diff --git a/oms_web/oms_vue/src/views/system/product/index.vue b/oms_web/oms_vue/src/views/system/product/index.vue index 9d0ca96a..a0219646 100644 --- a/oms_web/oms_vue/src/views/system/product/index.vue +++ b/oms_web/oms_vue/src/views/system/product/index.vue @@ -276,6 +276,8 @@ export default { loading: true, // 选中数组 ids: [], + // 选中产品编码 + selectedProductCodes: [], // 非单个禁用 single: true, // 非多个禁用 @@ -468,6 +470,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) + this.selectedProductCodes = selection.map(item => item.productCode) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -527,8 +530,12 @@ export default { }, /** 导出按钮操作 */ handleExport() { - const queryParams = this.queryParams; - this.$modal.confirm('是否确认导出所有产品管理数据项？').then(() => { + const queryParams = { + ...this.queryParams, + productCodeList: this.selectedProductCodes.length ? this.selectedProductCodes : undefined + }; + const exportTip = this.selectedProductCodes.length ? '是否确认导出选中的产品管理数据项？' : '是否确认导出所有产品管理数据项？'; + this.$modal.confirm(exportTip).then(() => { this.exportLoading = true; return exportProduct(queryParams); }).then(response => { diff --git a/oms_web/oms_vue/src/views/warehouse/info/index.vue b/oms_web/oms_vue/src/views/warehouse/info/index.vue index 1c010453..15836a7c 100644 --- a/oms_web/oms_vue/src/views/warehouse/info/index.vue +++ b/oms_web/oms_vue/src/views/warehouse/info/index.vue @@ -353,8 +353,12 @@ export default { }, /** 导出按钮操作 */ handleExport() { - const queryParams = this.queryParams; - this.$modal.confirm('是否确认导出所有仓库基础信息数据项？').then(() => { + const queryParams = { + ...this.queryParams, + idList: this.ids.length ? this.ids : undefined + }; + const exportTip = this.ids.length ? '是否确认导出选中的仓库基础信息数据项？' : '是否确认导出所有仓库基础信息数据项？'; + this.$modal.confirm(exportTip).then(() => { this.exportLoading = true; return exportInfo(queryParams); }).then(response => { diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java index 3af068fa..ed61da64 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java @@ -23,6 +23,9 @@ public class OrderDelivery extends BaseEntity /** 主键，自增 */ private Long id; + + /** 导出/查询时按选中ID过滤 */ + private String ids; /** 关联合同id */ @Excel(name = "关联合同id") diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java index 3f98e050..c59a0c56 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderInfo.java @@ -25,6 +25,9 @@ public class OrderInfo extends BaseEntity /** 主键，自增 */ private Long id; + + /** 导出/查询时按选中ID过滤 */ + private String ids; /** 关联项目编号 */ @Excel(name = "项目编号") diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/PartnerInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/PartnerInfo.java index 9a25940a..5b272f10 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/PartnerInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/PartnerInfo.java @@ -1,6 +1,7 @@ package com.ruoyi.sip.domain; import java.util.Date; +import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import com.ruoyi.common.annotation.Excel; @@ -23,6 +24,7 @@ public class PartnerInfo extends BaseEntity /** 供应商编码 */ @Excel(name = "供应商编码") private String partnerCode; + private List partnerCodeList; /** 供应商名称 */ @Excel(name = "供应商名称") diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml index f642c222..982e6560 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml @@ -45,6 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t1.logistics_code = #{logisticsCode} and t1.delivery_status = #{deliveryStatus} and t2.order_name like concat('%', #{orderName},'%') + + and t1.id in + + #{id} + + order by t1.order_id,t1.delivery_date @@ -146,4 +152,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index c071847a..d4df3ae7 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -169,6 +169,12 @@ select delivery_id from delivery_list where serial_number=#{serialNumber})) + + and t1.id in + + #{id} + + order by ISNULL(t1.project_code)||t1.project_code='' ,t1.project_code @@ -430,4 +436,4 @@ - \ No newline at end of file + diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml index 1e304aeb..24799d06 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml @@ -74,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"