diff --git a/klp-ui/src/views/crm/contract/components/ContractTabs.vue b/klp-ui/src/views/crm/contract/components/ContractTabs.vue index c0677dd13..bf337eb52 100644 --- a/klp-ui/src/views/crm/contract/components/ContractTabs.vue +++ b/klp-ui/src/views/crm/contract/components/ContractTabs.vue @@ -60,29 +60,44 @@
- - + + - - - - - + + - - - - - + + + + + + + - - + + + + + 查询 重置 @@ -104,29 +119,44 @@
- - + + - - - - - + + - - - - - + + + + + + + - - + + + + + 查询 重置 @@ -190,6 +220,9 @@ import { batchUpdateContractCoil } from "@/api/wms/coil"; import FileList from "@/components/FileList"; import DeliveryTable from "../../components/DeliveryTable.vue"; import ContractPreview from "./ContractPreview.vue"; +import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; +import MemoInput from "@/components/MemoInput"; +import MutiSelect from "@/components/MutiSelect"; // 导入可能需要的组件 import OrderDetail from "../../components/OrderDetail.vue"; @@ -212,8 +245,12 @@ export default { OrderEdit, ReceiveTable, OrderObjection, - OrderRecord + OrderRecord, + WarehouseSelect, + MemoInput, + MutiSelect }, + dicts: ['coil_itemname', 'coil_material', 'coil_manufacturer', 'coil_quality_status'], props: { orderId: { type: [Number, String], @@ -377,10 +414,10 @@ export default { fetchProductCoils() { this.productCoilLoading = true; listProductCoilsByContract({ - contractId: this.orderId, + orderId: this.orderId, pageNum: this.productPagination.currentPage, pageSize: this.productPagination.pageSize, - coilBo: this.productCoilBo + ...this.productCoilBo }).then(res => { this.productCoilList = res.rows || []; this.productPagination.total = res.total || 0; @@ -394,11 +431,12 @@ export default { }); }, fetchProductCoilStatistics() { - getProductCoilsStatisticsByContract({ contractId: this.orderId, coilBo: this.productCoilBo }).then(res => { + getProductCoilsStatisticsByContract({ ...this.productCoilBo, orderId: this.orderId }).then(res => { this.productCoilStatistics = res.data || {}; }); }, handleProductFilter() { + this.productCoilBo.selectType = this.productCoilBo.itemType || ''; this.productPagination.currentPage = 1; this.fetchProductCoils(); this.fetchProductCoilStatistics(); @@ -408,6 +446,7 @@ export default { this.handleProductFilter(); }, handleDeliveryFilter() { + this.deliveryCoilBo.selectType = this.deliveryCoilBo.itemType || ''; this.deliveryPagination.currentPage = 1; this.fetchDeliveryCoils(); this.fetchDeliveryCoilStatistics(); diff --git a/klp-ui/src/views/crm/saleman/index.vue b/klp-ui/src/views/crm/saleman/index.vue index bafe6dac1..7b8cc4738 100644 --- a/klp-ui/src/views/crm/saleman/index.vue +++ b/klp-ui/src/views/crm/saleman/index.vue @@ -78,29 +78,44 @@
- - + + - - - - - + + - - - - - + + + + + + + - - + + + + + 查询 重置 @@ -114,22 +129,38 @@
- - + + - - - - + + + + + + + + + + - - - - - + + 查询 重置 @@ -178,6 +209,9 @@ import { listData, getData, delData, addData, updateData } from "@/api/system/di import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type"; import CoilTable from "../components/CoilTable.vue"; import DeliveryTable from "../components/DeliveryTable.vue"; +import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; +import MemoInput from "@/components/MemoInput"; +import MutiSelect from "@/components/MutiSelect"; import { listDeliveryWaybill } from "@/api/wms/deliveryWaybill"; import { listCustomer } from "@/api/crm/customer"; @@ -186,8 +220,8 @@ import { listProductCoilsBySalesman, getProductCoilsStatisticsBySalesman, listDe export default { name: "Data", - components: { DragResizePanel, CoilTable, DeliveryTable }, - dicts: ['sys_normal_disable'], + components: { DragResizePanel, CoilTable, DeliveryTable, WarehouseSelect, MemoInput, MutiSelect }, + dicts: ['sys_normal_disable', 'coil_itemname', 'coil_material', 'coil_manufacturer', 'coil_quality_status'], data() { return { // 遮罩层 @@ -425,6 +459,7 @@ export default { }); }, handleProductFilter() { + this.productCoilBo.selectType = this.productCoilBo.itemType || ''; this.productPagination.currentPage = 1; if (this.selectedItem) { this.fetchProductCoils(this.selectedItem.dictValue); @@ -459,6 +494,7 @@ export default { }); }, handleDeliveryFilter() { + this.deliveryCoilBo.selectType = this.deliveryCoilBo.itemType || ''; this.deliveryPagination.currentPage = 1; if (this.selectedItem) { this.fetchDeliveryCoils(this.selectedItem.dictValue); diff --git a/klp-ui/src/views/wms/post/aps/orderTrack.vue b/klp-ui/src/views/wms/post/aps/orderTrack.vue index 3defc8877..272ee5f1e 100644 --- a/klp-ui/src/views/wms/post/aps/orderTrack.vue +++ b/klp-ui/src/views/wms/post/aps/orderTrack.vue @@ -133,29 +133,44 @@
- - + + - - - - - + + - - - - - + + + + + + + - - + + + + + 查询 重置 @@ -228,11 +243,14 @@ import CoilTable from '@/views/crm/components/CoilTable.vue' import ContractSelect from '@/components/KLPService/ContractSelect' import { batchUpdateContractCoil } from '@/api/wms/coil' import { listProductCoilsByContract, getProductCoilsStatisticsByContract } from '@/api/crm/coil' +import WarehouseSelect from '@/components/KLPService/WarehouseSelect' +import MemoInput from '@/components/MemoInput' +import MutiSelect from '@/components/MutiSelect' export default { name: 'ApsOrderTrack', - components: { CoilTable, ContractSelect }, - dicts: ['wip_pack_saleman'], + components: { CoilTable, ContractSelect, WarehouseSelect, MemoInput, MutiSelect }, + dicts: ['wip_pack_saleman', 'coil_itemname', 'coil_material', 'coil_manufacturer', 'coil_quality_status'], data() { return { ORDER_STATUS, @@ -418,10 +436,10 @@ export default { if (!this.currentOrder || !this.currentOrder.orderId) return this.productCoilLoading = true listProductCoilsByContract({ - contractId: this.currentOrder.orderId, + orderId: this.currentOrder.orderId, pageNum: this.productPagination.currentPage, pageSize: this.productPagination.pageSize, - coilBo: this.productCoilBo + ...this.productCoilBo }).then(res => { this.productCoilList = res.rows || [] this.productPagination.total = res.total || 0 @@ -431,11 +449,12 @@ export default { }, fetchProductCoilStatistics() { if (!this.currentOrder || !this.currentOrder.orderId) return - getProductCoilsStatisticsByContract({ contractId: this.currentOrder.orderId, coilBo: this.productCoilBo }).then(res => { + getProductCoilsStatisticsByContract({ ...this.productCoilBo, orderId: this.currentOrder.orderId }).then(res => { this.productCoilStatistics = res.data || {} }) }, handleProductFilter() { + this.productCoilBo.selectType = this.productCoilBo.itemType || '' this.productPagination.currentPage = 1 this.fetchProductCoils() this.fetchProductCoilStatistics()