From 0d45b28ed189eb8136fbe3beb6b5bc4425673a0a Mon Sep 17 00:00:00 2001
From: 13208366016 <47278630@qq.com>
Date: Wed, 18 Oct 2023 21:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=82=E9=85=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../distribution/distributionDeliveryList.js | 7 +-
src/views/basic/pda/basicPdaTT.vue | 3 +
.../reservation/reservationAddFrom.vue | 109 ++++++++++++++++--
.../reservation/reservationSubmitFrom.vue | 5 +-
.../turndelivery/deliveryDiscuss.vue | 20 +++-
vite.config.js | 4 +-
6 files changed, 131 insertions(+), 17 deletions(-)
diff --git a/src/api/distribution/distributionDeliveryList.js b/src/api/distribution/distributionDeliveryList.js
index 56b9feef..eddecc50 100644
--- a/src/api/distribution/distributionDeliveryList.js
+++ b/src/api/distribution/distributionDeliveryList.js
@@ -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,
},
});
};
diff --git a/src/views/basic/pda/basicPdaTT.vue b/src/views/basic/pda/basicPdaTT.vue
index 07e54f34..b7648760 100644
--- a/src/views/basic/pda/basicPdaTT.vue
+++ b/src/views/basic/pda/basicPdaTT.vue
@@ -14,6 +14,8 @@
查看维修记录
+ 多选测试
@@ -89,6 +91,7 @@
查看
+
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index f80327a3..2c27db0e 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -134,6 +134,7 @@
@btnCheck="btnsc"
@selectCheck="selectsc"
@selection="selectionChange"
+
>
-
+
",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 === '未预约'
diff --git a/src/views/distribution/reservation/reservationSubmitFrom.vue b/src/views/distribution/reservation/reservationSubmitFrom.vue
index 0597e58a..f9cabc8f 100644
--- a/src/views/distribution/reservation/reservationSubmitFrom.vue
+++ b/src/views/distribution/reservation/reservationSubmitFrom.vue
@@ -162,7 +162,7 @@
-
+
查看包件
@@ -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);
}
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 93c378e8..f525e67e 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -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,'勾选值');
})
// //新增
// //默认打开包件信息，包件列表处于全选状态
diff --git a/vite.config.js b/vite.config.js
index 9d861987..cf6e5b91 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -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,