diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue index c386c150..3113a76f 100644 --- a/src/views/distribution/artery/truckLoadingDetails.vue +++ b/src/views/distribution/artery/truckLoadingDetails.vue @@ -706,6 +706,7 @@ const handleBatchUnLoad = async () => { loadId: details.pageInfo.loadId, unloadPackageList: _orderArr, unloadZeroList: _zeroArr, + incomingType: '7', }; const res = await postBatchUnload(submitData); @@ -739,6 +740,7 @@ const handleBatchUnLoad = async () => { loadId: details.pageInfo.loadId, unloadPackageList: _orderArr, unloadZeroList: _zeroArr, + incomingType: '7', }; const res = await postBatchUnload(submitData); @@ -764,6 +766,7 @@ const handleBatchUnLoad = async () => { loadId: details.pageInfo.loadId, unloadPackageList: _orderArr.filter(val => val.finalNodeId === myWarehouseId), unloadZeroList: _zeroArr.filter(val => val.finalNodeId === myWarehouseId), + incomingType: '7', }; const res = await postBatchUnload(submitData); @@ -876,6 +879,7 @@ const handleOrderUnLoad = async ({ row }) => { loadId: details.pageInfo.loadId, unloadPackageList: [{ orderPackageCode: row.scanCode }], unloadZeroList: [], + incomingType: '7', }; const res = await postBatchUnload(submitData); @@ -906,6 +910,7 @@ const handleOrderUnLoad = async ({ row }) => { loadId: details.pageInfo.loadId, unloadPackageList: [{ orderPackageCode: row.scanCode }], unloadZeroList: [], + incomingType: '7', }; const res = await postBatchUnload(submitData); @@ -976,7 +981,7 @@ const handleZeroUnLoadSubmit = async () => { details.popUpShow.transferVisited = false; details.loadingObj.pageLoading = true; - let res = {}; + let res: any = {}; if (details.pageInfo.type !== 'TripartiteTransfer') { const submitData = { @@ -989,6 +994,7 @@ const handleZeroUnLoadSubmit = async () => { orderCode: details.zeroItem.orderCode, }, ], + incomingType: '7', }; res = await postBatchUnload(submitData); @@ -998,6 +1004,7 @@ const handleZeroUnLoadSubmit = async () => { waybillNo: details.zeroItem.waybillNo, enterNum: details.zeroItem.num, orderCode: details.zeroItem.orderCode, + incomingType: '7', }; res = await postTransferUnloadZero(submitData); diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index f50c8028..8488fb97 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -1502,6 +1502,8 @@ const details = reactive({ selectionList: [], /** 是否显示设置表格 */ drawerShow: false, + /** 弹窗表格query */ + tableQuery: {}, /** 分页参数 */ page: { pageNum: 1, @@ -1912,11 +1914,15 @@ const initOrderList = async (params = {}) => { if (status === 'haveData') details.loadingObj.haveDataList = true; else details.loadingObj.notHaveDataList = true; - details.form.freezeStatus = '0'; + params.freezeStatus = '0'; params.hasPackage = status === 'haveData' ? 1 : 0; - const res = await getopenOrderAdvancePageList(details.page, { ...details.form, ...params }); + const res = await getopenOrderAdvancePageList(details.page, { + ...details.tableQuery, + ...details.form, + ...params, + }); // 获取暂存单列表 const { code, data } = res.data; if (code !== 200) return; @@ -1996,7 +2002,7 @@ const handleChoose = () => { /** 表格表头输入框搜索 */ const inputsc = (index, row) => { - details.query[row.prop] = index; + details.tableQuery[row.prop] = index; init(); }; @@ -2005,9 +2011,9 @@ const timesc = (index, row) => { if (!!index) { index = dayjs(index).format('YYYY-MM-DD'); } - details.query[row.prop] = index; + details.tableQuery[row.prop] = index; if (!index) { - delete details.query[row.prop]; + delete details.tableQuery[row.prop]; } init(); }; @@ -2017,8 +2023,8 @@ const btnsc = () => {}; /** 表格表头下拉框选择 */ const selectsc = (index, row) => { - details.query[row.prop] = index; - if (!index) delete details.query[row.prop]; + details.tableQuery[row.prop] = index; + if (!index) delete details.tableQuery[row.prop]; if (row.prop === 'certificateTypeName') { details.query['certificateType'] = index; if (!index) delete details.query['certificateType']; @@ -2034,13 +2040,13 @@ const selectionChange = (list: any) => { /** 每页数量改变执行的回调 */ const sizeChange = (pageSize: number) => { details.page.pageSize = pageSize; - init(); + initOrderList(); }; /** 页码改变执行的回调 */ const currentChange = current => { details.page.pageNum = current; - onLoad(); + initOrderList(); }; /** 查看包明细 */