From 200a5f6c6def2d91b99aea98b20428f5af48804e Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 21 Dec 2023 15:33:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artery/zeroAdditionalRecording.vue | 63 ++++++++----------- .../reservation/reservationAddFrom.vue | 47 ++++++++------ 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue index 7a245f2b..5753a5d6 100644 --- a/src/views/distribution/artery/zeroAdditionalRecording.vue +++ b/src/views/distribution/artery/zeroAdditionalRecording.vue @@ -91,11 +91,11 @@ background @size-change="sizeChange" @current-change="currentChange" - :current-page="zeroAdditionalRecordingInfo.oldPage.pageNum" + :current-page="oldPage.pageNum" :page-sizes="[30, 50, 80, 120]" - :page-size="zeroAdditionalRecordingInfo.oldPage.pageSize" + :page-size="oldPage.pageSize" layout="total, sizes, prev, pager, next, jumper" - :total="zeroAdditionalRecordingInfo.oldPage.total" + :total="oldPage.total" > @@ -278,6 +278,11 @@ const details = reactive({ pageSize: 30, total: 0, }, + oldPage: { + pageSize: 30, + pageNum: 1, + total: 0, + }, /** 装车明细分页参数 */ trickleLoadingPage: { pageNum: 1, @@ -294,14 +299,6 @@ const details = reactive({ /** 列表Dom节点 */ listNode: '', form: {}, - /** 零担补录信息 */ - zeroAdditionalRecordingInfo: { - oldPage: { - pageSize: 30, - pageNum: 1, - total: 0, - }, - }, /** 被选中的零担订单 */ orderCodeList: [], }); @@ -316,7 +313,7 @@ const { drawerShow, page, trickleLoadingPage, - zeroAdditionalRecordingInfo, + oldPage, popUpShow, } = toRefs(details); @@ -335,7 +332,7 @@ onMounted(() => { }); /** 请求页面数据 */ -const onLoad = async (page: any, params = {}) => { +const onLoad = async (params = {}) => { try { details.loadingObj.oldListLoading = true; const submitData = { @@ -365,7 +362,7 @@ onLoad(); /** 搜索 */ const searchChange = () => { - onLoad(details.page); + onLoad(); }; /** 清空表单 */ @@ -373,7 +370,7 @@ const searchReset = () => { details.query = {}; details.stockupDate = []; details.page.pageNum = 1; - onLoad(details.page); + onLoad(); }; /** 展开列表控件 */ @@ -416,7 +413,7 @@ const searchHide = () => { /** 表格表头输入框搜索 */ const inputsc = (index, row) => { details.query[row.prop] = index; - onLoad(details.page); + onLoad(); }; /** 表格表头时间选择 */ @@ -429,7 +426,7 @@ const timesc = (index, row) => { if (!index) { delete details.query[row.prop]; } - onLoad(details.page); + onLoad(); }; /** 表格表头输入框搜索 */ @@ -443,7 +440,7 @@ const selectsc = (index, row) => { details.query['certificateType'] = index; if (!index) delete details.query['certificateType']; } - onLoad(details.page); + onLoad(); }; /** 表格表头复选框选择 */ @@ -454,7 +451,7 @@ const selectionChange = (list: any) => { /** 表格表头输入框搜索 */ const newInputsc = (index, row) => { details.newQuery[row.prop] = index; - onLoad(details.page); + onLoad(); }; /** 表格表头时间选择 */ @@ -467,7 +464,7 @@ const newTimesc = (index, row) => { if (!index) { delete details.newQuery[row.prop]; } - onLoad(details.page); + onLoad(); }; /** 表格表头输入框搜索 */ @@ -481,7 +478,7 @@ const newSelectsc = (index, row) => { details.newQuery['certificateType'] = index; if (!index) delete details.newQuery['certificateType']; } - onLoad(details.page); + onLoad(); }; /** 表格表头复选框选择 */ @@ -492,7 +489,7 @@ const newSelectionChange = (list: any) => { /** 每页数量改变执行的回调 */ const sizeChange = (pageSize: number) => { details.page.pageSize = pageSize; - onLoad(details.page); + onLoad(); }; /** 页码改变执行的回调 */ @@ -520,8 +517,6 @@ const setnewcolum = (newarr, headarr, type) => { const handleAddWaybill = () => { if (details.oldSelectionList.length === 0) return ElMessage.error('最少选择一条数据'); - // 新增 - // if (Number(details.pageType) === 1) { for (let item of details.oldSelectionList) { item.planNum = item.stockNum; item.loadingNum = 0; @@ -529,31 +524,25 @@ const handleAddWaybill = () => { } details.orderCodeList = [ - ...new Set([ - ...details.orderCodeList, - ...details.oldSelectionList.map(val => val.orderCode + ',' + val.waybillNo), - ]), + ...new Set([...details.orderCodeList, ...details.oldSelectionList.map(val => val.orderCode)]), ]; - console.log('details.orderCodeList :>> ', details.orderCodeList); - const orderCodes = details.selectionList.map(val => val.orderCode); - // clearSelectionList(); details.page.pageNum = 1; - // initOriginWarehouseOrder(); - // } + onLoad(); }; /** 移除运单 */ const handleRemoveWaybill = () => { - // if (this.addInfo.newSelectionList.length === 0) return this.$message.warning('最少选择一条运单'); + if (details.newSelectionList.length === 0) return ElMessage.warning('最少选择一条运单'); + for (const iterator of details.newSelectionList) { + console.log('111 :>> ', 111); + } // this.addInfo.newData = [...this.addInfo.newData, ...this.addInfo.oldSelectionList]; // this.addInfo.haveIds = this.addInfo.map(val => val.id); }; /** 零担补录提交 */ -const handleEditZeroSubmit = () => { - details.popUpShow.zeroAdditionalRecordingVisited = false; -}; +const handleEditZeroSubmit = () => {};