From ea1f6b3e0417075954cea633c6e55a8a3c6741fe Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 3 Aug 2022 18:37:05 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/BasicEntrutsRece.vue | 6 +++++- src/views/basic/BasicThirdSys.vue | 6 +++++- src/views/basic/CorpSingleRelevance.vue | 6 +++++- src/views/basic/invWarehouse.vue | 2 +- src/views/business/stockOrder.vue | 2 +- src/views/business/stockOrderEditor.vue | 3 +-- src/views/business/stockOrderNew.vue | 1 + src/views/business/stockOrderSearch.vue | 4 +--- src/views/business/stockOrderWaitCheck.vue | 4 ++-- src/views/inout/DialogSelectErpOrder.vue | 2 +- src/views/inout/IOCheckErrorOrder.vue | 5 +---- src/views/inout/IOCheckWaitOrder.vue | 6 +----- src/views/inout/IOFinishOrder.vue | 1 + 13 files changed, 26 insertions(+), 22 deletions(-) diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue index eaa2e03..479b1af 100644 --- a/src/views/basic/BasicEntrutsRece.vue +++ b/src/views/basic/BasicEntrutsRece.vue @@ -12,7 +12,7 @@ - 查询 + 查询 新增 @@ -178,6 +178,10 @@ export default { this.filterQuery.page = val; this.getList(); }, + search() { + this.filterQuery.page = 1; + this.getList(); + }, getList() { this.loading = true; getEntrustRece(this.filterQuery) diff --git a/src/views/basic/BasicThirdSys.vue b/src/views/basic/BasicThirdSys.vue index 106f34e..3aaf586 100644 --- a/src/views/basic/BasicThirdSys.vue +++ b/src/views/basic/BasicThirdSys.vue @@ -24,7 +24,7 @@ - 查询 + 查询 @@ -526,6 +526,10 @@ export default { } this.thirdSysFk = this.thirdSysFk; }, + search() { + this.filterQuery.page = 1; + this.getList(); + }, getList() { this.loading = true; getBasicThirdSys(this.filterQuery) diff --git a/src/views/basic/CorpSingleRelevance.vue b/src/views/basic/CorpSingleRelevance.vue index 0321184..9eec418 100644 --- a/src/views/basic/CorpSingleRelevance.vue +++ b/src/views/basic/CorpSingleRelevance.vue @@ -77,7 +77,7 @@ - 查询 + 查询 选入 @@ -173,6 +173,10 @@ export default { this.erpQuery.page = val; this.getErpList(); }, + searchList() { + this.unitQuery.page = 1; + this.getList(); + }, getList() { this.loading = true; this.unitQuery.thirdSys = this.thirdSysFk; diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 7dc793d..e8f9cd9 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -1361,7 +1361,7 @@ export default { getJoinBussinessType(this.bussinessTypeQuery).then((res) => { this.selectBussinessTypeList = []; this.bussinessTypeList = res.data.list; - + this.bussinessTypeTotal = res.data.total; var that = this; that.$nextTick(() => { if (that.$refs.typeList) { diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index b359e78..7d20805 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -613,9 +613,9 @@ export default { this.detailLoading = true; stockOrderDetail(this.detailQuery) .then((response) => { - console.log(response) this.detailLoading = false; this.detailList = response.data.list || []; + this.detailTotal = response.data.total; }) .catch(() => { this.detailLoading = false; diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index 6352319..9ebbd95 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -764,9 +764,9 @@ export default { this.detailLoading = true; stockOrderDetail(this.detailQuery) .then((response) => { - console.log(response) this.detailLoading = false; this.detailList = response.data.list || []; + this.detailTotal = response.data.total; }) .catch(() => { this.detailLoading = false; @@ -884,7 +884,6 @@ export default { if (valid) { this.detailLoading = true; let tQuery = this.detailFormData; - console.log(this.detailCountMax + "---" + this.detailFormData.count + "---" + this.detailFormData.reCount) if (this.detailCountMax) { if (this.detailFormData.count < this.detailFormData.reCount) { this.$message.error("实际数量不能高于订单数量"); diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue index aac3a90..32508ae 100644 --- a/src/views/business/stockOrderNew.vue +++ b/src/views/business/stockOrderNew.vue @@ -703,6 +703,7 @@ export default { .then((response) => { this.detailLoading = false; this.detailList = response.data.list || []; + this.detailTotal = response.data.total; }) .catch(() => { this.detailLoading = false; diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue index de9efc7..51b4bcc 100644 --- a/src/views/business/stockOrderSearch.vue +++ b/src/views/business/stockOrderSearch.vue @@ -619,7 +619,6 @@ export default { }, handleEdit(index, row) { this.currentCheckIndex = index; - console.log(this.currentCheckIndex) }, handleSave(index, row) { this.currentCheckIndex = -1; @@ -636,7 +635,6 @@ export default { row.forEach((item) => { _this.multipId.push(item.id); }) - console.log(this.multipId); }, batchSetParams(flag, type) { if (flag == '1' && type == 'salesListNo') { @@ -808,9 +806,9 @@ export default { this.detailLoading = true; stockOrderDetail(this.detailQuery) .then((response) => { - console.log(response) this.detailLoading = false; this.detailList = response.data.list || []; + this.detailTotal = response.data.total; }) .catch(() => { this.detailLoading = false; diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue index c56a13c..06e7a75 100644 --- a/src/views/business/stockOrderWaitCheck.vue +++ b/src/views/business/stockOrderWaitCheck.vue @@ -477,7 +477,7 @@ export default { this.query.startTime = null; this.query.endTime = null; } - + this.query.page = 1; this.getList(); if (this.query.status === "202" || this.query.status === "502") { this.haveDistributionVisible = true; @@ -611,9 +611,9 @@ export default { this.detailLoading = true; stockOrderDetail(this.detailQuery) .then((response) => { - console.log(response) this.detailLoading = false; this.detailList = response.data.list || []; + this.detailTotal = response.data.total; }) .catch(() => { this.detailLoading = false; diff --git a/src/views/inout/DialogSelectErpOrder.vue b/src/views/inout/DialogSelectErpOrder.vue index 6ed54e5..f9e08c1 100644 --- a/src/views/inout/DialogSelectErpOrder.vue +++ b/src/views/inout/DialogSelectErpOrder.vue @@ -260,6 +260,7 @@ export default { this.filterQuery.startDate = null; this.filterQuery.endDate = null; } + this.filterQuery.page = 1; this.getList(); }, getList() { @@ -351,7 +352,6 @@ export default { this.getList(); }, handleSelectionChange(val) { - console.log(val); this.multipleSelection = val; }, getBusType() { diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 3cd8576..9dc4f99 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -666,6 +666,7 @@ export default { this.filterQuery.startTime = null; this.filterQuery.endTime = null; } + this.filterQuery.page = 1; this.getList(); }, bindRl(val) { @@ -690,7 +691,6 @@ export default { this.getList(); }, handleSelectionChange(val) { - console.log(val); this.multipleSelection = val; }, @@ -756,7 +756,6 @@ export default { this.filterQuery.customerId = store.getters.customerId; filterOrder(this.filterQuery) .then((response) => { - console.log(response) this.loading = false; this.list = response.data.list || []; this.total = response.data.total || 0; @@ -864,7 +863,6 @@ export default { refresgOrderDetail() { orderDetail(this.detailQuery) .then((response) => { - console.log(response) this.loading = false; this.detailList = response.data || []; }) @@ -1039,7 +1037,6 @@ export default { }, uploadOrderDialog(value) { - console.log(value.id + "---" + value.orderid); this.uploadQuery = { orderId: value.id, }; diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index 022285f..988bfb9 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -521,6 +521,7 @@ export default { this.filterQuery.startTime = null; this.filterQuery.endTime = null; } + this.filterQuery.page = 1; this.getList(); }, handleSizeChange(val) { @@ -532,7 +533,6 @@ export default { this.getList(); }, handleSelectionChange(val) { - console.log(val); this.multipleSelection = val; }, getStorageName(code) { @@ -612,7 +612,6 @@ export default { this.filterQuery.customerId = store.getters.customerId; filterOrder(this.filterQuery) .then((response) => { - console.log(response) this.loading = false; this.list = response.data.list || []; this.total = response.data.total || 0; @@ -635,7 +634,6 @@ export default { refresgOrderDetail() { orderDetail(this.detailQuery) .then((response) => { - console.log(response) this.loading = false; this.detailList = response.data || []; }) @@ -675,7 +673,6 @@ export default { }, selectUnit(row) { - console.log(row.id); this.unitUpdateQuery.id = this.curIndex; this.unitUpdateQuery.fromCorp = row.name; this.unitUpdateQuery.fromCorpId = row.unitid; @@ -768,7 +765,6 @@ export default { uploadOrderDialog(value) { - console.log(value.id + "---" + value.orderid); this.uploadQuery = { orderId: value.id, }; diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue index 988bcad..7b16557 100644 --- a/src/views/inout/IOFinishOrder.vue +++ b/src/views/inout/IOFinishOrder.vue @@ -580,6 +580,7 @@ export default { this.filterQuery.startTime = null; this.filterQuery.endTime = null; } + this.filterQuery.page = 1; this.getList(); }, handleSizeChange(val) {