diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index 72276a5e1..106f245a7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -209,7 +209,8 @@ @@ -483,12 +484,11 @@ export default { projectClassification: "", // 项目状态 projectStatus: "", - page: "" }, + page: 1, + pageSize: this.$store.getters.userInfo.configContent, // 查询条件 localProTableSearch: { - page: 1, - pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, // 项目编号 projectNumber: "", @@ -519,8 +519,6 @@ export default { }, // 查询条件 localProTableSearchDefault: { - page: 1, - pageSize: this.$store.getters.userInfo.configContent, validFlag: 0, // 项目编号 projectNumber: "", @@ -1188,96 +1186,6 @@ export default { }); return newData; }, - saveOrUpdateLocalPro() { - this.$refs["addLocalProductForm"].validate((valid, fields) => { - if (valid) { - const formData = this.resolveTime(this.localProEO); - if (formData.energyKind != null && (formData.energyKind instanceof Array)) { - formData.energyKind = formData.energyKind.join(","); // 能源种类 - } - if (formData.productTypeCode != null && (formData.productTypeCode instanceof Array)) { - formData.productTypeCode = formData.productTypeCode.join(","); // 项目类型 - } - if (formData.producePlace != null && (formData.producePlace instanceof Array)) { - formData.producePlace = formData.producePlace.join(","); // 生产基地 - } - formData.targetMarket = formData.targetMarket.toString(); - // 新增 - if (this.flag === 0) { - this.$http.postData("lawss/sarProductInfo/addSarProductInfo", formData, { - _this: this - }, res => { - if (res.ok) { - // this.modalProductAddShowflag = false - this.closeProductAddDrawer(); - this.isSubmit = false; - if (this.localProEO.prodectCode === "INLAND") { - this.activeName = "INLAND"; - this.localProTableSearch.prodectCode = this.activeName; - this.$nextTick(() => { - this.getLocalProductTable(); - }); - } else { - this.activeName = "FOREIGN"; - this.localProTableSearch.prodectCode = this.activeName; - this.$nextTick(() => { - this.getLocalProductTable(); - }); - } - } - }, e => { - }); - } else { - // 修改 - this.$http.postData("lawss/sarProductInfo/updateSarProductInfo", formData, { - _this: this - }, res => { - if (res.ok) { - this.isSubmit = false; - // this.modalProductAddShowflag = false - this.closeProductAddDrawer(); - if (this.localProEO.prodectCode === "INLAND") { - this.activeName = "INLAND"; - this.localProTableSearch.prodectCode = this.activeName; - if (this.localProEO.dataType === "LOCAL") { - this.insideTabsActiveName = "LOCAL"; - this.localProTableSearch.dataType = this.insideTabsActiveName; - this.$nextTick(() => { - this.getLocalProductTable(); - }); - } else { - this.insideTabsActiveName = "PDPM"; - this.localProTableSearch.dataType = this.insideTabsActiveName; - this.$nextTick(() => { - this.getLocalProductTable(); - }); - } - } else { - this.activeName = "FOREIGN"; - this.localProTableSearch.prodectCode = this.activeName; - if (this.localProEO.dataType === "LOCAL") { - this.insideTabsActiveName = "LOCAL"; - this.localProTableSearch.dataType = this.insideTabsActiveName; - this.$nextTick(() => { - this.getLocalProductTable(); - }); - } else { - this.insideTabsActiveName = "PDPM"; - this.localProTableSearch.dataType = this.insideTabsActiveName; - this.$nextTick(() => { - this.getLocalProductTable(); - }); - } - } - } - }, e => { - }); - } - } else { - this.$message.error("请检查表单是否填写正确!"); - } - }); - }, // 条件分页查询 getLocalProductTableBtn() { this.projectLibrarySearch.page = 1; @@ -1290,11 +1198,10 @@ export default { this.localProTableSearch.dataType = this.insideTabsActiveName; this.SarExportSearchEo = this.localProTableSearch; this.$http.get("sarStandProjectLibrary/queryProject", { - // projectName: this.projectLibrarySearch.projectName, - // projectClassification: this.projectLibrarySearch.projectSort, - // projectStatus: this.projectLibrarySearch.projectStatus ...this.localProTableSearch, - ...this.projectLibrarySearch + ...this.projectLibrarySearch, + page: this.page, + pageSize: this.pageSize, }, { _this: this, loading: "loading" }, res => { @@ -1440,15 +1347,6 @@ export default { this.relateProductId = this.relectonSelectNum[0].id; } }, - // 关联弹窗里的分页查询 - reletionPageChange(page) { - this.relationPage = page; - this.getLocalProductTable(); - }, - reletionPageSizeChange(pageSize) { - this.reletionPageSize = pageSize; - this.getLocalProductTable(); - }, // 关联弹窗的保存 saveOrUpdateReletion() { if (this.relectonSelectNum.length === 0) { @@ -1487,12 +1385,13 @@ export default { }, // 分页点击后方法 pageChange(page) { - this.localProTableSearch.page = page; + console.log(page); + this.page = page; this.getLocalProductTable(); }, // 分页每页显示数改变后方法 pageSizeChange(pageSize) { - this.localProTableSearch.pageSize = pageSize; + this.pageSize = pageSize; this.getLocalProductTable(); // 此处需要调用接口,修改个人配置 },