From c7ce4b4cdc750788bc99aaeb7d3becca486d7cb0 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 10 Aug 2022 20:33:19 +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=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=9C=AA=E5=AF=B9=E5=BA=94=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E9=A1=B5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/basicCompany.vue | 33 +++++++---------- src/views/basic/basicCompanyProducts.vue | 6 +++- src/views/inventory/invUdiTraceOrder.vue | 1 - src/views/thrsys/ThrProductsSubmit.vue | 6 +++- src/views/userManage/customerManage.vue | 7 ++++ src/views/userManage/userAccountManage.vue | 18 ++++++++++ src/views/warehouse/DialogSelectErpOrder.vue | 1 + .../warehouse/DialogSelectInvStorage.vue | 9 ++++- src/views/warehouse/IOCheckErrOrder.vue | 1 + src/views/warehouse/IOSearchOrder.vue | 10 +++--- src/views/warehouse/IOWaitOrder.vue | 35 +++++++++++-------- src/views/warehouse/code.vue | 7 ++-- src/views/warehouse/codeReplace.vue | 7 ++-- src/views/warehouse/errorCode.vue | 6 ++++ src/views/warehouse/stockOrderDelete.vue | 4 +++ src/views/warehouse/stockOrderEdit.vue | 5 ++- src/views/warehouse/stockOrderSearch.vue | 12 +++++++ 17 files changed, 117 insertions(+), 51 deletions(-) diff --git a/src/views/basic/basicCompany.vue b/src/views/basic/basicCompany.vue index fe09896..5abe518 100644 --- a/src/views/basic/basicCompany.vue +++ b/src/views/basic/basicCompany.vue @@ -127,7 +127,7 @@ - + - + - + - + - + - + - + - + @@ -342,7 +344,7 @@ - + { }); } else { - console.log("error submit!!"); return false; } }); @@ -1073,7 +1075,6 @@ export default { }).catch(() => { }); } else { - console.log("error submit!!"); return false; } }); @@ -1085,6 +1086,7 @@ export default { } else { this.companyEditDisabled = true; this.companyEditButtonStr = "编辑"; + this.getData(); } }, addUpdateLog(formName) { @@ -1109,7 +1111,6 @@ export default { }).catch(() => { }); } else { - console.log("error submit!!"); return false; } }); @@ -1120,7 +1121,6 @@ export default { customerId: store.getters.customerId, }; getCompany(tquery).then((response) => { - console.log(response) this.loading = false; this.inputQuery = response.data; this.inputQuery.bussinessStatus = this.inputQuery.bussinessStatus + ""; @@ -1375,11 +1375,8 @@ export default { this.inputQuery.areaCode = value.toString(); }, uploadHandleRemove(file, fileList) { - console.log(file, fileList); }, uploadHandlePreview(file) { - console.log(file); - console.log(this.fileList); }, uploadHandleExceed(files, fileList) { this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); @@ -1411,7 +1408,6 @@ export default { return isLt; }, uploadHandleSuccess(response, file, fileList) { - console.log(response) if (response.code === 20000) { this.uploadFilePath('', response.data.name); @@ -1433,7 +1429,6 @@ export default { } }, uploadHandleSuccess2(response, file, fileList) { - console.log(response) if (response.code === 20000) { this.uploadFilePath('2', response.data.name); @@ -1454,7 +1449,6 @@ export default { } }, uploadHandleSuccess3(response, file, fileList) { - console.log(response) if (response.code === 20000) { this.uploadFilePath('3', response.data.name); @@ -1473,7 +1467,6 @@ export default { } }, uploadHandleSuccess4(response, file, fileList) { - console.log(response) if (response.code === 20000) { this.uploadFilePath('4', response.data.name); diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue index 7b1e1d5..81d212a 100644 --- a/src/views/basic/basicCompanyProducts.vue +++ b/src/views/basic/basicCompanyProducts.vue @@ -47,7 +47,7 @@ - 查询 + 查询 { - console.log(response) this.loading = false; this.detailList = response.data || []; }) diff --git a/src/views/thrsys/ThrProductsSubmit.vue b/src/views/thrsys/ThrProductsSubmit.vue index 7888c64..5a46f76 100644 --- a/src/views/thrsys/ThrProductsSubmit.vue +++ b/src/views/thrsys/ThrProductsSubmit.vue @@ -50,7 +50,7 @@ - 查询 + 查询 新增 @@ -190,6 +190,10 @@ export default { }; this.getList(); }, + search() { + this.filterQuery.page = 1; + this.getList(); + }, checDialog(row) { this.checkVisible = true; this.curRow = row; diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue index a24cafc..57ccbbc 100644 --- a/src/views/userManage/customerManage.vue +++ b/src/views/userManage/customerManage.vue @@ -153,6 +153,7 @@ size="small" style="width: 40%" type="number" + @change="verifyUserCount" > @@ -578,6 +579,12 @@ export default { .catch(() => { }); }, + verifyUserCount(val) { + if (val < 0) { + this.$message.error("用户数不得小于0！"); + this.formData.userMax = 0; + } + }, }, components: { customerUser, diff --git a/src/views/userManage/userAccountManage.vue b/src/views/userManage/userAccountManage.vue index f91c602..18941d5 100644 --- a/src/views/userManage/userAccountManage.vue +++ b/src/views/userManage/userAccountManage.vue @@ -87,6 +87,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > @@ -148,6 +149,22 @@ + + + +
+
+ + + +
+
+ +
取消 @@ -281,6 +298,7 @@ export default { path: "", query: this.query, }); + this.query.page = 1; this.getList(); }, handleCurrentChange(val) { diff --git a/src/views/warehouse/DialogSelectErpOrder.vue b/src/views/warehouse/DialogSelectErpOrder.vue index a2b8a20..e666587 100644 --- a/src/views/warehouse/DialogSelectErpOrder.vue +++ b/src/views/warehouse/DialogSelectErpOrder.vue @@ -261,6 +261,7 @@ export default { this.filterQuery.startDate = null; this.filterQuery.endDate = null; } + this.filterQuery.page = 1; this.getList(); }, getList() { diff --git a/src/views/warehouse/DialogSelectInvStorage.vue b/src/views/warehouse/DialogSelectInvStorage.vue index 3e5b175..a0fd659 100644 --- a/src/views/warehouse/DialogSelectInvStorage.vue +++ b/src/views/warehouse/DialogSelectInvStorage.vue @@ -69,6 +69,14 @@ export default { } }, methods: { + onReset() { + this.query = { + key: "", + page: 1, + limit: 20 + } + this.list = []; + }, getList() { this.loading = true; filterAll(this.query) @@ -81,7 +89,6 @@ export default { }); }, selectStorage(row) { - console.log(row.id); this.$emit("selectStorage", row); }, }, diff --git a/src/views/warehouse/IOCheckErrOrder.vue b/src/views/warehouse/IOCheckErrOrder.vue index 48b7280..1b199f8 100644 --- a/src/views/warehouse/IOCheckErrOrder.vue +++ b/src/views/warehouse/IOCheckErrOrder.vue @@ -697,6 +697,7 @@ export default { this.filterQuery.startTime = null; this.filterQuery.endTime = null; } + this.filterQuery.page = 1; this.getList(); }, bindRl(val) { diff --git a/src/views/warehouse/IOSearchOrder.vue b/src/views/warehouse/IOSearchOrder.vue index dfb0385..4ae3085 100644 --- a/src/views/warehouse/IOSearchOrder.vue +++ b/src/views/warehouse/IOSearchOrder.vue @@ -366,6 +366,8 @@ :visible.sync="codeDetailVisible" width="80%" v-if="codeDetailVisible" + :close-on-click-modal="false" + :close-on-press-escape="false" > { - console.log(response) this.loading = false; this.list = response.data.list || []; this.detailList = []; @@ -786,7 +789,6 @@ export default { refresgOrderDetail() { orderDetail(this.detailQuery) .then((response) => { - console.log(response) this.loading = false; this.detailList = response.data || []; }) @@ -823,7 +825,6 @@ export default { this.successOrderExportPDFSettingVisible = true; }, successOrderExportPDF(row) { - console.log(row) let tQuery = { orderId: row.id, customerId: store.getters.customerId @@ -858,7 +859,6 @@ export default { }, selectUnit(row) { - console.log(row.id); this.unitUpdateQuery.id = this.curIndex; this.unitUpdateQuery.fromCorp = row.name; this.unitUpdateQuery.fromCorpId = row.unitid; diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue index 03d0748..1c3a3ad 100644 --- a/src/views/warehouse/IOWaitOrder.vue +++ b/src/views/warehouse/IOWaitOrder.vue @@ -380,6 +380,8 @@ :visible.sync="codeDetailVisible" width="80%" v-if="codeDetailVisible" + :close-on-click-modal="false" + :close-on-press-escape="false" > import { - orderList, - codeList, - findAllByOrderId, updateUnit, filterOrder, deleteByOrderId, - updateExportStatus, uploadOrder, mergeOrder, orderDetail, } from "../../api/warehouse/order"; import { - orderDetailPDFFromTemplateCode, orderDetailPDFFromTemplateFile, - inspectionOrderDetailPDFFromTemplateCode, inspectionOrderDetailPDFFromTemplateFile } from "../../api/itextpdf/itextpdf"; import {repeatCheck} from "../../api/erp/erpOrder"; import {unitListBykey} from "../../api/warehouse/unit"; import draggable from "vuedraggable"; -import {saveAs} from "file-saver"; import codeDetail from "./code"; import store from "../../store"; import successOrderExportPDFSetting from "./successOrderExportPDF"; -import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf"; import selectErpOrder from "./DialogSelectErpOrder"; -import {getBussinessType} from "../../api/basic/bussinessType"; import {filterAllByUser} from "@/api/basic/invWarehouse"; import {getLocalJoinByUser} from "@/api/basic/busLocalType"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {isBlank} from "@/utils/strUtil"; const formJson = { site_id: "", @@ -613,6 +607,13 @@ export default { this.filterQuery.startTime = null; this.filterQuery.endTime = null; } + + if (!isBlank(this.filterQuery.invWarehouseCode)) { + if (isBlank(this.filterQuery.locStorageCode)) { + this.$message.warning("请选择仓库！"); + return; + } + } this.getList(); }, handleSizeChange(val) { @@ -1010,12 +1011,16 @@ export default { let query = { pcode: this.filterQuery.locStorageCode }; - filterSubByInv(query) - .then((response) => { - this.subInvList = response.data || []; - }) - .catch(() => { - }); + if (isBlank(this.filterQuery.locStorageCode)) { + this.subInvList = []; + } else { + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + } }, diff --git a/src/views/warehouse/code.vue b/src/views/warehouse/code.vue index cf570ea..70ac2f1 100644 --- a/src/views/warehouse/code.vue +++ b/src/views/warehouse/code.vue @@ -7,7 +7,7 @@ - 查询 @@ -129,7 +129,10 @@ export default { this.query.page = val; this.getCodeList(); }, - + search() { + this.query.page = 1; + this.getCodeList(); + }, getCodeList() { this.loading = true; this.query.corpOrderId = this.idQuery.id; diff --git a/src/views/warehouse/codeReplace.vue b/src/views/warehouse/codeReplace.vue index 2a5d481..1b73373 100644 --- a/src/views/warehouse/codeReplace.vue +++ b/src/views/warehouse/codeReplace.vue @@ -7,7 +7,7 @@ - 查询 @@ -255,7 +255,10 @@ this.query.page = val; this.getCodeList(); }, - + search() { + this.query.page = 1; + this.getCodeList(); + }, getCodeList() { this.loading = true; this.query.corpOrderId = this.idQuery.id; diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue index b144edb..4cd3f32 100644 --- a/src/views/warehouse/errorCode.vue +++ b/src/views/warehouse/errorCode.vue @@ -103,6 +103,8 @@ :visible.sync="dialogTableVisible" v-if="dialogTableVisible" width="70%" + :close-on-click-modal="false" + :close-on-press-escape="false" append-to-body > @@ -186,6 +187,8 @@ :visible.sync="codeDetailVisible" width="80%" v-if="codeDetailVisible" + :close-on-click-modal="false" + :close-on-press-escape="false" > { _this.multipId.push(item.id); }) - console.log(this.multipId); }, batchSetParams(flag, type) { if (flag == '1' && type == 'salesListNo') { @@ -266,9 +265,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/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue index 67c37b5..fa85a1c 100644 --- a/src/views/warehouse/stockOrderSearch.vue +++ b/src/views/warehouse/stockOrderSearch.vue @@ -140,6 +140,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="query.page" > @@ -597,6 +598,15 @@ export default { this.haveDistributionVisible = true; this.actDateRange = []; }, + resetDetailQuery() { + this.detailQuery = { + orderIdFk: "", + page: 1, + limit: 20 + } + this.detailList = []; + this.detailTotal = 0; + }, onSubmit() { if (this.actDateRange !== null) { this.query.startTime = this.actDateRange[0]; @@ -605,6 +615,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; @@ -709,6 +720,7 @@ export default { } }, getList() { + this.resetDetailQuery(); this.loading = true; this.query.corpId = store.getters.customerId; stockOrderList(this.query)