java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

商配车辆、司机接口调整

fix_bug_pro20231227
kilo 1 year ago
parent
105f1c92fd
commit
69d4758a0d
6 changed files with 198 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/api/basicdata/basicdataDriverArtery.js
  2. 14
      src/api/basicdata/basicdataVehicle.js
  3. 6
      src/api/distribution/distributionReservation.js
  4. 168
      src/views/basicdata/vehicle/basicdataVehicle.vue
  5. 8
      src/views/distribution/turndelivery/deliveryDiscuss.vue
  6. 5
      src/views/distribution/turndelivery/deliveryMarket.vue

18
src/api/basicdata/basicdataDriverArtery.js
Unescape View File

@ -67,15 +67,19 @@ export const update = (row) => {
})
}
export const getDriverList = (current, size, params) => {
/**
* 查询当前仓库司机列表
* @returns {AxiosPromise}
*/
export const getDriverList = () => {
return request({
url: '/api/logpm-basicdata/driverArtery/list',
url: '/api/logpm-basicdata/driverArtery/getDriverList',
method: 'get',
params: {
...params,
current,
size,
}
// params: {
// ...params,
// current,
// size,
// }
})
}

14
src/api/basicdata/basicdataVehicle.js
Unescape View File

@ -65,15 +65,15 @@ export const update = (row) => {
})
}
export const getVehicleList = (current, size, params) => {
export const getVehicleList = () => {
return request({
url: '/api/logpm-basicdata/vehicle/page',
url: '/api/logpm-basicdata/vehicle/getVehicleList',
method: 'get',
params: {
...params,
current,
size,
}
// params: {
// ...params,
// current,
// size,
// }
})

6
src/api/distribution/distributionReservation.js
Unescape View File

@ -227,11 +227,11 @@ export const getReservationZeroOrderDetail = (reservationId,id) => {
* @param ids
* @returns {AxiosPromise}
*/
export const getDeliveryZeroOrderDetail = (deliveryId,id) => {
export const getDeliveryZeroOrderDetail = (deliveryId,orderId) => {
return request({
url: '/api/logpm-distribution/reservation/getDeliveryZeroOrderDetail',
url: '/api/logpm-distribution/deliveryList/getDeliveryZeroOrderDetail',
method: 'get',
params: { id,deliveryId }
params: { deliveryId,orderId }
});
}

168
src/views/basicdata/vehicle/basicdataVehicle.vue
Unescape View File

@ -76,6 +76,174 @@ import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import BasicdataVehicleform from '/src/views/basicdata/vehicle/basicdataVehicleform.vue';
// export default {
// components: { BasicdataVehicleform },
// data() {
// return {
// form: {},
// query: {},
// search: {},
// loading: true,
// vehicleformdata: {},
// dicDatas: [],
// edit: true, //修改
// page: {
// pageSize: 30,
// currentPage: 1,
// total: 0
// },
// selectionList: [],
// option: {
// height: 'auto',
// calcHeight: 30,
// tip: false,
// searchShow: false,
// searchMenuSpan: 6,
// border: true,
// index: true,
// viewBtn: false,
// editBtn: false,
// selection: true,
// dialogClickModal: false,
// column: [
// {
// label: '主键',
// prop: 'id',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '租户号',
// prop: 'tenantId',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '创建人',
// prop: 'createUser',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '创建时间',
// prop: 'createTime',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '更新人',
// prop: 'updateUser',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '更新时间',
// prop: 'updateTime',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '状态',
// prop: 'status',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '是否已删除;1-未删除，2-已删除',
// prop: 'isDeleted',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '创建部门',
// prop: 'createDept',
// type: 'input',
// addDisplay: false,
// editDisplay: false,
// viewDisplay: false,
// hide: true
// },
// {
// label: '车牌号',
// prop: 'vehicleNub',
// type: 'input',
// search: true,
// labelWidth: '150',
// width: '100px',
// align: 'center',
// span: 11
// },
// {
// label: '承运商名称',
// labelWidth: '150',
// // width: 'fit-content',
// width: '100px',
// align: 'center',
// span: 11,
// prop: 'carrierName',
// type: 'input',
// editDisplay: false,
// addDisplay: false
// },
// {
// label: '绑定驾驶人',
// prop: 'vehicleOwners',
// type: 'select',
// labelWidth: '150',
// width: '200px',
// align: 'center',
// span: 11,
// multiple: true,
// dicData: []
// // dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
// // props: {
// // label: 'vehicleNub',
// // value: 'id',
// // },
// // addDisplay: false,
// // editDisplay: false,
// // viewDisplay: false,
// // hide: true,
// },
// {
// label: '车辆来源',
// prop: 'vehicleSource',
// type: 'select',
// search: true,
// labelWidth: '150',
// width: '100px',
// align: 'center',
// span: 11,
// dicUrl: '/api/blade-system/dict-biz/dictionary?code=basic_vehicle_source',
// props: {
// label: 'dictValue',
// value: 'dictKey'
// }
// }
export default {
components: { BasicdataVehicleform },
data() {

8
src/views/distribution/turndelivery/deliveryDiscuss.vue
Unescape View File

@ -873,8 +873,6 @@ import { ElMessage } from 'element-plus'
},
methods: {
//查询叉车人员
async getFork() {
await getListUser().then(res => {
@ -932,7 +930,10 @@ import { ElMessage } from 'element-plus'
},
//查询班组
async getTeam() {
let params = this.deptId;
const info = JSON.parse(localStorage.getItem('TWMS-userInfo'))
console.log('info >>>>>>>>', info);
// let params = this.deptId;
let params = info.content.dept_id;
console.log('%%%%%%%%%', params);
getListTeamInfo(params).then(res => {
console.log('aaaaaaaaa', res.data.data);
@ -1197,6 +1198,7 @@ import { ElMessage } from 'element-plus'
return;
}
}
entryNum(this.zeroOrderData).then(res => {
if (res) {
this.$message({

5
src/views/distribution/turndelivery/deliveryMarket.vue
Unescape View File

@ -798,7 +798,10 @@
},
//查询班组
async getTeam() {
let params = this.deptId;
const info = JSON.parse(localStorage.getItem('TWMS-userInfo'))
console.log('info >>>>>>>>', info);
// let params = this.deptId;
let params = info.content.dept_id;
console.log('%%%%%%%%%', params);
getListTeamInfo(params).then(res => {
console.log('aaaaaaaaa', res.data.data);

Write Preview
Loading…
Cancel
Save