diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue index 956b54fb..f0ddc0b5 100644 --- a/src/views/distribution/artery/TripartiteTransfer.vue +++ b/src/views/distribution/artery/TripartiteTransfer.vue @@ -419,7 +419,13 @@ import dayjs from 'dayjs'; import { mapGetters } from 'vuex'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, deepClone, setNodeHeight, debounce } from '@/utils/util'; +import { + downloadXls, + deepClone, + setNodeHeight, + debounce, + handleClearTableQuery, +} from '@/utils/util'; import { columnList, detailsColumnList } from '@/option/distribution/TripartiteTransfer'; import { packageColumnList } from '@/option/distribution/VehicleStowage'; import { @@ -755,6 +761,7 @@ const searchReset = () => { details.query = {}; details.stockupDate = []; details.page.pageNum = 1; + handleClearTableQuery(details.columnList); onLoad(); }; diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue index 6dcff28e..7d28247e 100644 --- a/src/views/distribution/artery/truckLoadingDetails.vue +++ b/src/views/distribution/artery/truckLoadingDetails.vue @@ -2,9 +2,9 @@
- +
- + 清 空 - +
@@ -216,7 +216,7 @@ import { import { getShowAdvancePackgeCode } from '@/api/waybill/orderPackageListDetails'; /** 获取字典 */ import { getDictionaryBiz } from '@/api/system/dict'; -import { downloadXls, getHtmls, debounce } from '@/utils/util'; +import { downloadXls, getHtmls, debounce, setNodeHeight } from '@/utils/util'; import { detailsColumnList } from '@/option/distribution/TripartiteTransfer'; import { useRouter, useRoute } from 'vue-router'; import print from '@/utils/print'; @@ -524,23 +524,9 @@ const showdrawer = (_flag?: boolean, _type?: string) => { /** 是否开启搜索区 */ const searchHide = () => { - function getWinHight() { - var windowHight = 0; - if (document.body.clientHeight && document.documentElement.clientHeight) { - windowHight = - document.body.clientHeight < document.documentElement.clientHeight - ? document.body.clientHeight - : document.documentElement.clientHeight; - } else { - } - return document.documentElement.clientHeight; - } details.search = !details.search; - const timer = setTimeout(() => { - details.listNode.style.height = - getWinHight() - details.listNode.getBoundingClientRect().top - 70 + 'px'; - clearTimeout(timer); - }, 10); + + setNodeHeight(tableNodeRef.value.$el, '', true); }; /** 表格表头输入框搜索 */ diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue index 7107ed18..9c356bda 100644 --- a/src/views/distribution/inventory/BookingNote.vue +++ b/src/views/distribution/inventory/BookingNote.vue @@ -1543,7 +1543,7 @@ const onLoad = async () => { const handleFindInfo = async type => { try { details.loadingObj.pageLaoding = true; - + details.data = []; const submitData = { waybillId: $route.query.id, infoType: type, diff --git a/src/views/warehouse/warehouseWaybill.vue b/src/views/warehouse/warehouseWaybill.vue index 79822a8c..5c3eb922 100644 --- a/src/views/warehouse/warehouseWaybill.vue +++ b/src/views/warehouse/warehouseWaybill.vue @@ -346,7 +346,7 @@ > ', item); if (isNumber(item.splitNum) && item.splitNum > 0) _flag = true; + totalNum += item.splitNum; } if (!_flag) continue; @@ -1232,7 +1235,7 @@ export default { console.log('_arr :>> ', _arr); if (_arr.length === 0) return this.$message.error('请选择需要拆单的数据'); - + if (totalNum > this.rowobj.handleNum) return this.$message.error('总数大于可用数量'); this.dialogTableVisible = false; const res = await splitOrder(_arr); diff --git a/src/views/waybill/FreezeOrder.vue b/src/views/waybill/FreezeOrder.vue index bd5943e6..6f8ae429 100644 --- a/src/views/waybill/FreezeOrder.vue +++ b/src/views/waybill/FreezeOrder.vue @@ -1,5 +1,5 @@