11692908/TMS-VUE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用车需求调整

Browse Source
This commit is contained in:
王帅 2025-04-22 14:39:18 +08:00
parent 34fa9031bb
commit 152a2a7284
3 changed files with 126 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ant-design-vue-jeecg/src/views/tms/outbound/deliverydemand/DeliveryDemand.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <!-- <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -29,27 +29,26 @@
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div> -->
<!-- 查询区域-END --> <!-- 查询区域-END -->
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <!-- <div class="table-operator">
<a-button type="primary" icon="download" @click="handleExportXls('发货需求')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('发货需求')">导出</a-button>
</div> </div> -->
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<a-table <a-table
ref="table" ref="table"
size="middle" size="small"
:scroll="{x:true}" :scroll="{ y: 300, x:true }"
bordered bordered
rowKey="id" rowKey="id"
:columns="columns" :columns="columns"
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="false"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap" class="j-table-force-nowrap"
@change="handleTableChange"> @change="handleTableChange">
@ -104,7 +103,7 @@
import '@/assets/less/TableExpand.less' import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin' import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { postAction } from '@/api/manage' import { postAction,getAction } from '@/api/manage'
import DeliveryDemandModal from './modules/DeliveryDemandModal' import DeliveryDemandModal from './modules/DeliveryDemandModal'
export default { export default {
@ -118,45 +117,51 @@
description: '发货需求管理页面', description: '发货需求管理页面',
// 表头 // 表头
columns: [ columns: [
{ // {
title: '#', // title: '#',
dataIndex: '', // dataIndex: '',
key:'rowIndex', // key:'rowIndex',
width:60, // width:60,
align:"center", // align:"center",
customRender:function (t,r,index) { // customRender:function (t,r,index) {
return parseInt(index)+1; // return parseInt(index)+1;
} // }
}, // },
{ {
title:'用车需求编号', title:'用车需求编号',
align:"center", align:"center",
dataIndex: 'vdNo' dataIndex: 'vdNo',
width: 120
}, },
{ {
title:'料号', title:'料号',
align:"center", align:"center",
dataIndex: 'pn' dataIndex: 'pn',
width: 120
}, },
{ {
title:'规格', title:'规格',
align:"center", align:"center",
dataIndex: 'spec' dataIndex: 'spec',
width: 100
}, },
{ {
title:'发货数量', title:'发货数量',
align:"center", align:"center",
dataIndex: 'shipNumber' dataIndex: 'shipNumber',
width: 100
}, },
{ {
title:'预估托盘数', title:'预估托盘数',
align:"center", align:"center",
dataIndex: 'palletsNum' dataIndex: 'palletsNum',
width: 100
}, },
{ {
title:'发货单', title:'发货单',
align:"center", align:"center",
dataIndex: 'invoice' dataIndex: 'invoice',
width: 100
}, },
// { // {
// title: '操作', // title: '操作',
@ -173,7 +178,8 @@
deleteBatch: "/deliverydemand/deliveryDemand/deleteBatch", deleteBatch: "/deliverydemand/deliveryDemand/deleteBatch",
exportXlsUrl: "/deliverydemand/deliveryDemand/exportXls", exportXlsUrl: "/deliverydemand/deliveryDemand/exportXls",
importExcelUrl: "deliverydemand/deliveryDemand/importExcel", importExcelUrl: "deliverydemand/deliveryDemand/importExcel",
handleMerge: '/deliverydemand/deliveryDemand/handleMerge' handleMerge: '/deliverydemand/deliveryDemand/handleMerge',
getByVdNo: '/deliverydemand/deliveryDemand/getByVdNo',
}, },
dictOptions:{}, dictOptions:{},
superFieldList:[], superFieldList:[],
@ -218,6 +224,16 @@
} }
}) })
}, },
getByVdNo(vdNo){
getAction(this.url.getByVdNo,{vdNo: vdNo}).then(res => {
if (res.success) {
this.dataSource = res.result;
} else {
this.$message.warning(res.message)
}
})
},
loadData(){},
initDictConfig(){ initDictConfig(){
}, },
getSuperFieldList(){ getSuperFieldList(){

30
ant-design-vue-jeecg/src/views/tms/outbound/vehicledemand/VehicleDemandList.vue
View File

@ -87,7 +87,7 @@
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="ipagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio'}"
class="j-table-force-nowrap" class="j-table-force-nowrap"
@change="handleTableChange"> @change="handleTableChange">
@ -134,7 +134,16 @@
</a-table> </a-table>
</div> </div>
<a-row :gutter="24">
<a-col :span="12">
<div class="title">用车需求物料明细</div>
<DeliveryDemand ref="deliveryDemand"/>
</a-col>
<a-col :span="12" style="margin-right: -30px;">
<div class="title">用车需求计算</div>
<VehicleDemandCountList ref="vehicleDemandCountList"/>
</a-col>
</a-row>
<vehicle-demand-modal ref="modalForm" @ok="modalFormOk"></vehicle-demand-modal> <vehicle-demand-modal ref="modalForm" @ok="modalFormOk"></vehicle-demand-modal>
</a-card> </a-card>
</template> </template>
@ -146,12 +155,16 @@
import { postAction } from '@/api/manage' import { postAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import VehicleDemandModal from './modules/VehicleDemandModal' import VehicleDemandModal from './modules/VehicleDemandModal'
import DeliveryDemand from '../deliverydemand/DeliveryDemand.vue';
import VehicleDemandCountList from '../vehicledemandcount/VehicleDemandCountList.vue'
export default { export default {
name: 'VehicleDemandList', name: 'VehicleDemandList',
mixins:[JeecgListMixin, mixinDevice], mixins:[JeecgListMixin, mixinDevice],
components: { components: {
VehicleDemandModal VehicleDemandModal,
DeliveryDemand,
VehicleDemandCountList
}, },
data () { data () {
return { return {
@ -257,6 +270,13 @@
} }
}) })
}, },
onSelectChange(selectedRowKeys, selectionRows) {
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
let vdNo = selectionRows[0].vdNo;
this.$refs.deliveryDemand.getByVdNo(vdNo);
this.$refs.vehicleDemandCountList.getByVdNo(vdNo);
},
initDictConfig(){ initDictConfig(){
}, },
getSuperFieldList(){ getSuperFieldList(){
@ -275,4 +295,8 @@
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
.title {
font-size: 18px;
padding-left: 10px;
}
</style> </style>

95
ant-design-vue-jeecg/src/views/tms/outbound/vehicledemandcount/VehicleDemandCountList.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <!-- <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -48,44 +48,43 @@
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</div> </div> -->
<!-- 查询区域-END --> <!-- 查询区域-END -->
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <!-- <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('用车需求计算')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('用车需求计算')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload> -->
<!-- 高级查询区域 --> <!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu> </a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown> </a-dropdown>
</div> </div> -->
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
<a style="margin-left: 24px" @click="onClearSelected">清空</a> <a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div> </div> -->
<a-table <a-table
ref="table" ref="table"
size="middle" size="small"
:scroll="{x:true}" :scroll="{ y: 300, x:true }"
bordered bordered
rowKey="id" rowKey="id"
:columns="columns" :columns="columns"
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="false"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap" class="j-table-force-nowrap"
@change="handleTableChange"> @change="handleTableChange">
@ -139,6 +138,7 @@
import '@/assets/less/TableExpand.less' import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin' import { mixinDevice } from '@/utils/mixin'
import { getAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import VehicleDemandCountModal from './modules/VehicleDemandCountModal' import VehicleDemandCountModal from './modules/VehicleDemandCountModal'
@ -153,64 +153,72 @@
description: '用车需求计算管理页面', description: '用车需求计算管理页面',
// 表头 // 表头
columns: [ columns: [
{ // {
title: '#', // title: '#',
dataIndex: '', // dataIndex: '',
key:'rowIndex', // key:'rowIndex',
width:60, // width:60,
align:"center", // align:"center",
customRender:function (t,r,index) { // customRender:function (t,r,index) {
return parseInt(index)+1; // return parseInt(index)+1;
} // }
}, // },
{ {
title:'用车需求编号', title:'用车需求编号',
align:"center", align:"center",
dataIndex: 'vdNo' dataIndex: 'vdNo',
width: 120
}, },
{ {
title:'发货类型', title:'发货类型',
align:"center", align:"center",
dataIndex: 'shipType_dictText' dataIndex: 'shipType_dictText',
width: 80
}, },
{ {
title:'车型', title:'车型',
align:"center", align:"center",
dataIndex: 'carType' dataIndex: 'carType',
width: 80
}, },
{ {
title:'车长', title:'车长',
align:"center", align:"center",
dataIndex: 'carLong' dataIndex: 'carLong',
width: 100
}, },
{ {
title:'送货区域', title:'送货区域',
align:"center", align:"center",
dataIndex: 'deliveryArea' dataIndex: 'deliveryArea',
width: 100
}, },
{ {
title:'送货地点', title:'送货地点',
align:"center", align:"center",
dataIndex: 'deliveryAddress' dataIndex: 'deliveryAddress',
width: 100
}, },
{ {
title:'取货仓库', title:'取货仓库',
align:"center", align:"center",
dataIndex: 'pickUpHub' dataIndex: 'pickUpHub',
width: 100
}, },
{ {
title:'审核结果', title:'审核结果',
align:"center", align:"center",
dataIndex: 'auditResult_dictText' dataIndex: 'auditResult_dictText',
width: 100
}, },
{ // {
title: '操作', // title: '操作',
dataIndex: 'action', // dataIndex: 'action',
align:"center", // align:"center",
fixed:"right", // fixed:"right",
width:147, // width:147,
scopedSlots: { customRender: 'action' } // scopedSlots: { customRender: 'action' }
} // }
], ],
url: { url: {
list: "/vehicledemandcount/vehicleDemandCount/list", list: "/vehicledemandcount/vehicleDemandCount/list",
@ -218,6 +226,7 @@
deleteBatch: "/vehicledemandcount/vehicleDemandCount/deleteBatch", deleteBatch: "/vehicledemandcount/vehicleDemandCount/deleteBatch",
exportXlsUrl: "/vehicledemandcount/vehicleDemandCount/exportXls", exportXlsUrl: "/vehicledemandcount/vehicleDemandCount/exportXls",
importExcelUrl: "vehicledemandcount/vehicleDemandCount/importExcel", importExcelUrl: "vehicledemandcount/vehicleDemandCount/importExcel",
getByVdNo: "vehicledemandcount/vehicleDemandCount/getByVdNo",
}, },
dictOptions:{}, dictOptions:{},
@ -233,6 +242,16 @@
}, },
}, },
methods: { methods: {
getByVdNo(vdNo){
getAction(this.url.getByVdNo,{vdNo: vdNo}).then(res => {
if (res.success) {
this.dataSource = res.result.records||res.result;
} else {
this.$message.warning(res.message)
}
})
},
loadData(){},
initDictConfig(){ initDictConfig(){
}, },
getSuperFieldList(){ getSuperFieldList(){