From 0b13636e6fc6719d30ff2501866cb7464cc695cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Tue, 10 Jun 2025 10:18:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=BD=A6=E9=9C=80=E6=B1=82=E5=90=88?= =?UTF-8?q?=E5=B9=B6=EF=BC=8C=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/TmsIogisticsPriceForm.vue | 7 + .../vehicleinout/VehicleInOutList.vue | 4 +- .../deliverydemand/DeliveryDemand.vue | 2 +- .../deliverydemand/DeliveryDemandList.vue | 4 +- .../modules/DeliveryDemandForm.vue | 2 +- .../vehicledemand/VehicleDemandHisList.vue | 190 ++++++++++++++++++ .../vehicledemand/VehicleDemandList.vue | 156 +++++++++++--- .../modules/VehicleDemandForm.vue | 9 +- 8 files changed, 343 insertions(+), 31 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandHisList.vue diff --git a/ant-design-vue-jeecg/src/views/tms/basicdata/iogisticsprice/modules/TmsIogisticsPriceForm.vue b/ant-design-vue-jeecg/src/views/tms/basicdata/iogisticsprice/modules/TmsIogisticsPriceForm.vue index 285743d..d61aece 100644 --- a/ant-design-vue-jeecg/src/views/tms/basicdata/iogisticsprice/modules/TmsIogisticsPriceForm.vue +++ b/ant-design-vue-jeecg/src/views/tms/basicdata/iogisticsprice/modules/TmsIogisticsPriceForm.vue @@ -71,6 +71,11 @@ + + + + + @@ -138,6 +143,8 @@ carType :[{required: true, message: '请输入车型!'}], supplierCode :[{required: true, message: '请输入供应商编码!'}], effectiveDate :[{required: true, message: '请选择生效日期!'}], + failureTime :[{required: true, message: '请选择失效日期!'}], + effectiveDate :[{required: true, message: '请选择生效日期!'}], validity :[{required: true, message: '请输入时效!'}], tandardPrice :[{required: true, message: '请输入定标价格!'}], }, diff --git a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutList.vue b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutList.vue index 0a72f42..c36fbb4 100644 --- a/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutList.vue +++ b/ant-design-vue-jeecg/src/views/tms/carinout/vehicleinout/VehicleInOutList.vue @@ -140,11 +140,11 @@ 预约入厂 --> - + 入厂审核 diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemand.vue b/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemand.vue index a2a1ea7..35ed51d 100644 --- a/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemand.vue +++ b/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemand.vue @@ -42,7 +42,7 @@ { - return item.shipType == '0'; + return item.shipType == '2'; }); if (hasEven) { - this.$message.warning("数据中含有整车数据！"); + this.$message.warning("数据中含有快递数据！"); return; } let hasEven1 = this.selectionRows.some(item => { diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/modules/DeliveryDemandForm.vue b/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/modules/DeliveryDemandForm.vue index d0b7ecb..d3dd5e0 100644 --- a/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/modules/DeliveryDemandForm.vue +++ b/ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/modules/DeliveryDemandForm.vue @@ -68,7 +68,7 @@ - + diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandHisList.vue b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandHisList.vue new file mode 100644 index 0000000..70f6f98 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandHisList.vue @@ -0,0 +1,190 @@ + + + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue index b839f16..27dd248 100644 --- a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue +++ b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue @@ -43,6 +43,8 @@ 查询 重置 新增 + 合并 + 拆分 导出 {{ toggleSearchStatus ? '收起' : '展开' }} @@ -87,8 +89,10 @@ :dataSource="dataSource" :pagination="false" :loading="loading" - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio'}" + :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" class="j-table-force-nowrap" + :customRow="rowClick" + :rowClassName="rowClassName" @change="handleTableChange"> - + 用车计算 @@ -137,8 +141,9 @@
-
用车需求物料明细
- +
用车需求历史
+ +
@@ -156,12 +161,13 @@ import '@/assets/less/TableExpand.less' import { mixinDevice } from '@/utils/mixin' - import { postAction } from '@/api/manage' + import { postAction,getAction } from '@/api/manage' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import moment from 'moment' import VehicleDemandModal from './modules/VehicleDemandModal' import DeliveryDemand from '../deliverydemand/DeliveryDemand.vue'; import VehicleDemandCountList from '../vehicledemandcount/VehicleDemandCountList.vue' + import VehicleDemandHisList from './VehicleDemandHisList' export default { name: 'VehicleDemandList', @@ -169,7 +175,8 @@ components: { VehicleDemandModal, DeliveryDemand, - VehicleDemandCountList + VehicleDemandCountList, + VehicleDemandHisList }, data () { return { @@ -178,6 +185,7 @@ shipDate_begin: moment().format('YYYY-MM-DD'), shipDate_end: moment().format('YYYY-MM-DD'), }, + click: '', // 表头 columns: [ { @@ -199,21 +207,32 @@ return !text?"":(text.length>10?text.substr(0,10):text) } }, + { + title:'到货日期', + align:"center", + dataIndex: 'deliveryDate' + }, { title:'发货类型', align:"center", dataIndex: 'shipType_dictText', // width: 100, }, - { - title:'料号', - align:"center", - dataIndex: 'pn', - // width: 100, - }, + // { + // title:'料号', + // align:"center", + // dataIndex: 'pn', + // // width: 100, + // }, { title:'预计装车总托数', align:"center", + dataIndex: 'preTotalPallets', + // width: 120, + }, + { + title:'实际装车总托数', + align:"center", dataIndex: 'totalPallets', // width: 120, }, @@ -229,15 +248,15 @@ // dataIndex: 'deliveryArea' // }, { - title:'送货地点', + title:'取货地点', align:"center", - dataIndex: 'deliveryAddress', + dataIndex: 'pickUpHub', // width: 80, }, { - title:'取货仓库', + title:'送货地点', align:"center", - dataIndex: 'pickUpHub', + dataIndex: 'deliveryAddress', // width: 80, }, { @@ -246,6 +265,11 @@ dataIndex: 'vdNo', // width: 120, }, + { + title:'当前状态', + align:"center", + dataIndex: 'currentStatus_dictText', + }, { title: '操作', dataIndex: 'action', @@ -262,7 +286,8 @@ exportXlsUrl: "/vehicle_demand/vehicleDemand/exportXls", importExcelUrl: "vehicle_demand/vehicleDemand/importExcel", carCount: "vehicle_demand/vehicleDemand/carCount", - + handleMerge: "vehicle_demand/vehicleDemand/handleMerge", + handleUnbind: "vehicle_demand/vehicleDemand/handleUnbind", }, dictOptions:{}, superFieldList:[], @@ -287,12 +312,87 @@ } }) }, - onSelectChange(selectedRowKeys, selectionRows) { - this.selectedRowKeys = selectedRowKeys; - this.selectionRows = selectionRows; - let vdNo = selectionRows[0].vdNo; - this.$refs.deliveryDemand.getByVdNo(vdNo); - this.$refs.vehicleDemandCountList.getByVdNo(vdNo); + // onSelectChange(selectedRowKeys, selectionRows) { + // this.selectedRowKeys = selectedRowKeys; + // this.selectionRows = selectionRows; + // let vdNo = selectionRows[0].vdNo; + // this.$refs.deliveryDemand.getByVdNo(vdNo); + // this.$refs.vehicleDemandCountList.getByVdNo(vdNo); + // }, + rowClick(record){ + return { + on: { + click:() => { + this.click = record.id + let vdNo = record.vdNo + this.$refs.vehicleDemandHisList.getByVdNo(vdNo); + this.$refs.vehicleDemandCountList.getByVdNo(vdNo); + }, + } + } + }, + rowClassName(record){ + // if(record.id == this.click){ + // return 'clicked-row' + // } + }, + handleMerge(){ + if (this.selectedRowKeys.length <= 0) { + this.$message.warning("请至少选择一条记录！"); + return; + } + postAction(this.url.handleMerge, this.selectedRowKeys).then(res => { + if (res.success){ + this.$message.success(res.message); + //清空列表选中 + this.onClearSelected() + this.loadData(); + }else { + this.$message.error(res.message); + } + }) + }, + handleUnbind(){ + if (this.selectedRowKeys.length <= 0) { + this.$message.warning("请至少选择一条记录！"); + return; + } + postAction(this.url.handleUnbind, this.selectedRowKeys).then(res => { + if (res.success){ + this.$message.success(res.message); + //清空列表选中 + this.onClearSelected() + this.loadData(); + }else { + this.$message.error(res.message); + } + }) + }, + loadData(arg) { + if(!this.url.list){ + this.$message.error("请设置url.list属性!") + return + } + //加载数据 若传入参数1则加载第一页的内容 + if (arg === 1) { + this.ipagination.current = 1; + } + var params = this.getQueryParams();//查询条件 + this.loading = true; + getAction(this.url.list, params).then((res) => { + if (res.success) { + this.dataSource = res.result.records||res.result; + if(this.dataSource.length > 0){ + let vdNo = this.dataSource[0].vdNo + this.$refs.vehicleDemandHisList.getByVdNo(vdNo); + this.$refs.vehicleDemandCountList.getByVdNo(vdNo); + } + }else{ + this.$message.warning(res.message) + } + }).finally(() => { + this.loading = false + }) }, initDictConfig(){ }, @@ -339,4 +439,14 @@ font-size: 12px; padding: 0 10px; } + + ::v-deep .clicked-row { + background-color: #507CD1 !important; + color: #fff; + transition: all 0.2s ease-in-out; + } + + /* ::v-deep table tbody tr:hover>td { + background-color: transparent !important; + } */ \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/modules/VehicleDemandForm.vue b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/modules/VehicleDemandForm.vue index 4830a23..428fafc 100644 --- a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/modules/VehicleDemandForm.vue +++ b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/modules/VehicleDemandForm.vue @@ -30,8 +30,8 @@ - - + + @@ -39,6 +39,11 @@ + + + + +