From b8af2f9a46710201a59da4f4471c70682143a4b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Thu, 24 Apr 2025 11:20:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/src/App.vue | 3 + .../deliverydemand/DeliveryDemand.vue | 7 +- .../vehicledemand/VehicleDemandList.vue | 53 ++++++++--- .../modules/VehicleDemandForm.vue | 16 ++-- .../VehicleDemandCountList.vue | 40 ++++++--- .../modules/VehicleDemandCountForm.vue | 90 +++++++++++++++---- 6 files changed, 152 insertions(+), 57 deletions(-) diff --git a/ant-design-vue-jeecg/src/App.vue b/ant-design-vue-jeecg/src/App.vue index 9f4f7a8..502bc42 100644 --- a/ant-design-vue-jeecg/src/App.vue +++ b/ant-design-vue-jeecg/src/App.vue @@ -41,4 +41,7 @@ #app { height: 100%; } + .ant-table-thead > tr > th, .ant-table-tbody > tr > td{ + padding: 3px !important; + } \ No newline at end of file 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 c443fd4..a1d7e17 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 @@ -41,8 +41,8 @@
{ if (res.success) { this.dataSource = res.result; } else { this.$message.warning(res.message) } + }).finally(()=>{ + this.loading = false; }) }, loadData(){}, 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 398c65f..9f2e7ed 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 @@ -72,15 +72,15 @@
-
+ -
用车需求物料明细
- +
+
用车需求物料明细
+ +
-
用车需求计算
- +
+
用车需求计算
+ +
@@ -209,11 +213,11 @@ align:"center", dataIndex: 'totalShips' }, - { - title:'送货区域', - align:"center", - dataIndex: 'deliveryArea' - }, + // { + // title:'送货区域', + // align:"center", + // dataIndex: 'deliveryArea' + // }, { title:'送货地点', align:"center", @@ -296,7 +300,28 @@ \ 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 51a14a3..8c499c6 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 @@ -3,37 +3,37 @@ - + - + - + - + - + - + - + @@ -67,7 +67,7 @@ }, labelCol: { xs: { span: 24 }, - sm: { span: 5 }, + sm: { span: 7 }, }, wrapperCol: { xs: { span: 24 }, diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/VehicleDemandCountList.vue b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/VehicleDemandCountList.vue index ad5fa22..071d7bd 100644 --- a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/VehicleDemandCountList.vue +++ b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/VehicleDemandCountList.vue @@ -52,9 +52,10 @@ - @@ -65,8 +66,8 @@ 删除 批量操作 - -
--> + --> +
@@ -77,8 +78,8 @@ { if (res.success) { this.dataSource = res.result.records||res.result; + this.totalPallets = this.dataSource.reduce((sum, current) => sum + current.tandardPrice, 0); } else { this.$message.warning(res.message) } + }).finally(()=>{ + this.loading = false; }) }, loadData(){}, diff --git a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/modules/VehicleDemandCountForm.vue b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/modules/VehicleDemandCountForm.vue index 4e618e0..e37e9ef 100644 --- a/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/modules/VehicleDemandCountForm.vue +++ b/ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/modules/VehicleDemandCountForm.vue @@ -3,42 +3,45 @@ - + - + + - + - + - + + - + - + - + + - + + - + + + + + + @@ -68,11 +71,15 @@ }, data () { return { + carTypeLongList:[], + carTypeList:[], + cityList:[], + pickUpHubList:[], model:{ }, labelCol: { xs: { span: 24 }, - sm: { span: 5 }, + sm: { span: 6 }, }, wrapperCol: { xs: { span: 24 }, @@ -80,11 +87,19 @@ }, confirmLoading: false, validatorRules: { + vdNo :[{required: true, message: '请选择用车需求编号!'}], + shipType :[{required: true, message: '请选择发货类型!'}], + carType :[{required: true, message: '请选择车型!'}], + carLong :[{required: true, message: '请选择车长!'}], + pickUpHub :[{required: true, message: '请选择取货仓库!'}], + deliveryAddress :[{required: true, message: '请选择送货地点!'}], }, url: { add: "/vehicledemandcount/vehicleDemandCount/add", edit: "/vehicledemandcount/vehicleDemandCount/edit", - queryById: "/vehicledemandcount/vehicleDemandCount/queryById" + queryById: "/vehicledemandcount/vehicleDemandCount/queryById", + getCarTypeLong: "/vehiclepallet/vehiclePallet/getCarTypeLong", + getCity: "/logisticsroute/logisticsRoute/getCity", } } }, @@ -96,6 +111,8 @@ created () { //备份model原始值 this.modelDefault = JSON.parse(JSON.stringify(this.model)); + this.getCarTypeLong(); + this.getCity(); }, methods: { add () { @@ -134,6 +151,41 @@ }) }, + getCarTypeLong(){ + getAction(this.url.getCarTypeLong).then(res => { + if (res.success) { + this.carTypeLongList = res.result; + this.carTypeList = res.result; + } + }) + }, + carTypeSelect(){ + let carType = this.carTypeList.filter(x=>x.includes(this.model.carType))[0].split('&-')[0]; + let carLong = this.carTypeList.filter(x=>x.includes(this.model.carType))[0].split('&-')[1]; + this.model.carType = carType; + this.model.carLong = carLong; + }, + carTypeChange(val){ + this.carTypeList = this.carTypeLongList.filter(x => x.includes(val)); + }, + + getCity(){ + getAction(this.url.getCity).then(res => { + if (res.success) { + this.cityList = res.result; + this.pickUpHubList = res.result; + } + }) + }, + pickUpHubSelect(){ + let pickUpHub = this.pickUpHubList.filter(x=>x.includes(this.model.pickUpHub))[0].split('&-')[0] + let deliveryAddress = this.pickUpHubList.filter(x=>x.includes(this.model.pickUpHub))[0].split('&-')[1] + this.model.pickUpHub = pickUpHub + this.model.deliveryAddress = deliveryAddress + }, + pickUpHubChange(val){ + this.pickUpHubList = this.cityList.filter(x => x.includes(val)); + }, } } \ No newline at end of file