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

修复市配bug

fix_bug_pro20231227
13208366016 1 year ago
parent
0e71d5087c
commit
0d45b28ed1
6 changed files with 131 additions and 17 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. 7
      src/api/distribution/distributionDeliveryList.js
  2. 3
      src/views/basic/pda/basicPdaTT.vue
  3. 109
      src/views/distribution/reservation/reservationAddFrom.vue
  4. 5
      src/views/distribution/reservation/reservationSubmitFrom.vue
  5. 20
      src/views/distribution/turndelivery/deliveryDiscuss.vue
  6. 4
      vite.config.js

7
src/api/distribution/distributionDeliveryList.js
Unescape View File

@ -195,12 +195,15 @@ export const selectStockArticleAtlasInfo = id => {
* @param data
* @returns {AxiosPromise}
*/
export const getPackageListByDeliveryIdAndOrderId = (current,size,delivery,orderId) => {
export const getPackageListByDeliveryIdAndOrderId = (current,size,deliveryId,orderId) => {
return request({
url: '/api/logpm-distribution/deliveryList/getPackageListByDeliveryIdAndOrderId',
method: 'get',
params: {
current,size,delivery,orderId
current,
size,
deliveryId,
orderId,
},
});
};

3
src/views/basic/pda/basicPdaTT.vue
Unescape View File

@ -14,6 +14,8 @@
<el-button @click="handleDelete"
><el-icon><Edit /></el-icon>查看维修记录</el-button
>
<el-button link type="primary" icon="el-icon-view" @click="handleview(row)">多选测试</el-button
>
</div>
<!-- 表格顶部右侧按钮 -->
<div class="el-Cart-button-right">
@ -89,6 +91,7 @@
<el-button link type="primary" icon="el-icon-view" @click="handleview(row)"
>查看</el-button
>
</template>
</el-table-column>
</el-table>

109
src/views/distribution/reservation/reservationAddFrom.vue
Unescape View File

@ -134,6 +134,7 @@
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
>
<template #default="slotProps">
<el-text v-if="slotProps.scope.row.resource !=='零担'"
@ -411,6 +412,7 @@
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionInventoryChange"
ref=multipleTable
>
<template #default="slotProps">
<el-text
@ -441,8 +443,10 @@
:checkselect="packageDataSec"
:loading="loading"
@selection="selectionPackageChange"
@select='tableAllSelection'
@cell-mouse-enter='hove'
>
<template #default="slotProps">
<template #default="slotProps">
<!-- <el-text
type="primary"
link
@ -1828,6 +1832,9 @@
}
},
methods: {
handleToggleAllSelection() {
this.$refs.selecttable.toggleAllSelection();
},
fetchData() {
this.error = this.post = null;
this.loading = true;
@ -2049,17 +2056,71 @@
this.zeroOrderShow = true;
this.isrReservationEntry = false;
},
// 选择包件信息
// selectionPackageChange(list) {
// console.log(list,'list22');
// console.log('-----------<>', list);
// this.packageListInfo=list
// console.log(this.packageListInfo,'packageListInfo');
// if (this.reservationId) {
// this.packageDataSec = list;
// } else {
// //新增
// let a = [];
// list.forEach(item => {
// if (
// item.orderPackageReservationStatus === '10' ||
// item.orderPackageReservationStatusName === '未预约'
// ) {
// a.push(item);
// }
// });
// this.packageDataSec = a;
// }
// },
// 查看包件
// 自动选中
selectMatchingRows(val) {
console.log(val,'数组');
console.log(this.packageData);
const selectedIds = val; // 需要匹配选中的ID
// const matchedArray = this.packageData.filter(item => selectedIds.includes(item.id));
// console.log(matchedArray,"处理好的数据");
this.packageData.forEach(item => {
if (selectedIds.includes(item.id)) {
console.log(item,'包含================================================================>');
this.selectionPackageChange(item)
}
});
},
// if (row) {
// this.selectionPackageChange(row)
// console.log( this.selectionPackageChange(),'12312312312321函数');
// }
viewStockArticlePackage(row) {
this.loading = true;
this.packageList = row.packageList;
this.obj = row;
let page = this.page;
this. toggleAllSelection
console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
if (this.reservationId) {
getReservationPackageListByOrderId(this.reservationId,row.id,page.currentPage,page.pageSize).then(res=>{
console.log("->>>>>>>>>>>>>>>>>>",res);
console.log("->>>>>>>>>>>>>>>>>>查看包件",res);
this.packageData = res.data.data.data.packageList
console.log(this.packageData,'需要的信息');
console.log(res.data.data.data.reservationPackageList);
let idList=[]
res.data.data.data.reservationPackageList.forEach(v=>{
idList.push(v.id)
})
console.log(idList);
})
// 自动选中
@ -2099,7 +2160,10 @@
} else {
getPackageListByStockArticleId(page.currentPage,page.pageSize,row.id).then(res=>{
console.log("res---------------->",res);
console.log("res---------------->",res);
console.log(res.data.data.records);
this.packageData=res.data.data.records
})
// this.packageData = row.parcelListVOS;
// this.packageDataSec = row.parcelListVOS;
@ -2127,9 +2191,33 @@
// // }
// });
}
this.isaddvalue = true;
this.loading = false;
this.isaddvalue = true;
this.loading = false;
},
// 选择包件信息
// selectionPackageChange(list) {
// console.log(list,'list22');
// console.log('-----------<>', list);
// if (this.reservationId) {
// this.packageDataSec = list;
// } else {
// //新增
// let a = [];
// list.forEach(item => {
// if (
// item.orderPackageReservationStatus === '10' ||
// item.orderPackageReservationStatusName === '未预约'
// ) {
// a.push(item);
// }
// });
// this.packageDataSec = a;
// }
// },
// 全选表格新增
checkPackage(row, index) {
//区分编辑还是新增
//编辑需要对这个预约单下的包件信息均可进行调整
@ -2197,7 +2285,10 @@
this.query = {};
this.handleAddInventory();
},
// 提交包件数
onSubmitPackage() {
// this.packageListInfo
if (this.packageDataSec.length === 0) {
this.$message.warning('请选择包件!!!');
return;
@ -2383,15 +2474,19 @@
this.orderList = list;
console.log('list :>> ', list);
},
// 选择包件信息
selectionPackageChange(list) {
console.log('掉用了此函数',list);
console.log(list,'list22');
console.log('-----------<>', list);
this.packageListInfo=list
console.log(this.packageListInfo,'packageListInfo');
if (this.reservationId) {
this.packageDataSec = list;
} else {
//新增
let a = [];
list.forEach(item => {
console.log('--------------->', item);
if (
item.orderPackageReservationStatus === '10' ||
item.orderPackageReservationStatusName === '未预约'

5
src/views/distribution/reservation/reservationSubmitFrom.vue
Unescape View File

@ -162,7 +162,7 @@
<!-- </template>-->
<!-- </el-table-column>-->
<!-- 操作栏模块 -->
<el-table-column prop="menu" label="操作" :width="220" align="center">
<el-table-column prop="menu" label="操作" :width="320" align="center">
<template #="{row}">
<el-button type="primary" link icon="el-icon-view"
@click="viewStockArticlePackage(row)">查看包件
@ -1211,6 +1211,7 @@
selectionChange(list) {
this.orderList = list;
},
// 全选中
selectionPackageChange(list) {
console.log('-----------<>', list);
if (this.reservationId) {
@ -1219,7 +1220,7 @@
//新增
let a = [];
list.forEach(item => {
console.log('--------------->', item);
// console.log('--------------->', item);
if (item.orderPackageReservationStatus === '10' || item.orderPackageReservationStatusName === '未预约') {
a.push(item);
}

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

@ -700,7 +700,7 @@
import { mapGetters } from 'vuex';
import dayjs from 'dayjs';
import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
import { ElMessageBox } from 'element-plus'
export default {
data() {
return {
@ -979,7 +979,9 @@
selectionChange(list) {
//只要这个触发就认定为该包件进行了重新勾选，不论数据是否发生变化
this.selectionList = list;
this.packageListInfo=this.selectionList
console.log(' this.selectionList = list', this.selectionList);
this.orderData.forEach(item => {
if (item.id === this.obj.id) {
item.isUpdate = true;
@ -989,6 +991,7 @@
//这里就为当前选择的订单进行包件信息的添加
// this.obj.
},
// 复选框事件
selectionStockArticleChange(list) {
console.log('selectionStockArticleChange', list);
this.stockArticleList = list;
@ -1213,6 +1216,7 @@
* 查看包件
*/
viewStockArticlePackage(row) {
//这里应该先对订单下的所有包件信息进行获取，然后结合查询出预约单下以选择的包件信息进行勾选状态的回显
//查询该订单下所有的包件信息
this.loading = true;
@ -1220,8 +1224,11 @@
let page = this.page;
console.log('++++++++++++', row);
if (this.deliveryListId) {
getPackageListByDeliveryIdAndOrderId(page.currentPage,page.pageSize,row.id).then(res=>{
console.log("getPackageListByDeliveryIdAndOrderId--------------------->",res);
getPackageListByDeliveryIdAndOrderId(page.currentPage,page.pageSize,this.deliveryListId,row.id).then(res=>{
console.log("getPackageListByDeliveryIdAndOrderId1--------------------->",res);
this.packageData = res.data.data.data.packageList
console.log(this.packageData,'this.packageListInfo');
})
// //编辑
// let params = {};
@ -1245,7 +1252,12 @@
// this.packageData = row.parcelListVOS;
} else {
getPackageListByStockArticleId(page.currentPage,page.pageSize,row.id).then(res=>{
console.log("________--------------------->",res);
console.log("________--------------------->",res.data.data.records);
this.packageData=res.data.data.records;
this.packageListInfo=res.data.data.records
// 自动全选
console.log(this.selectionList,'勾选值');
})
// //新增
// //默认打开包件信息，包件列表处于全选状态

4
vite.config.js
Unescape View File

@ -16,13 +16,13 @@ export default ({ mode, command }) => {
// hy
// target: 'http://192.168.10.48:8888',
// lmy
target: 'http://192.168.10.123:8889',
// target: 'http://192.168.10.123:8889',
// caoge
// target: 'http://192.168.10.101:8888',
// cyz
// target: 'http://192.168.10.75:8777',
// tjj
// target: 'http://192.168.10.29:13000',
target: 'http://192.168.10.29:13000',
// target: 'http://test.api.huitongys.com',
// target: 'http://h5uapi.huitongys.com',
changeOrigin: true,

Write Preview
Loading…
Cancel
Save