diff --git a/src/views/basic/BussinessType.vue b/src/views/basic/BussinessType.vue index a31f762..51c0a04 100644 --- a/src/views/basic/BussinessType.vue +++ b/src/views/basic/BussinessType.vue @@ -25,7 +25,7 @@ - 查询 + 查询 新增 @@ -254,6 +254,14 @@ export default { handleChange() { this.getList(); }, + handleCurrentChange(val) { + this.filterQuery.page = val; + this.getList(); + }, + search() { + this.filterQuery.page = 1; + this.getList(); + }, getList() { this.loading = true; getJoinBussinessType(this.filterQuery) diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue index cface72..5b0fb02 100644 --- a/src/views/thrsys/ThrInvWarehouse.vue +++ b/src/views/thrsys/ThrInvWarehouse.vue @@ -321,6 +321,7 @@ export default { isDefault: null, page: 1, limit: 20, + parentId: null, thirdSysFk: null, }, mergeList: [], @@ -464,7 +465,6 @@ export default { this.$refs["dataForm"].clearValidate(); // 刷新表单 this.$refs["dataForm"].resetFields(); - this.getList(); } }, // 隐藏表单 @@ -530,7 +530,11 @@ export default { return false; } this.$message.success("删除成功"); - this.loadSubData(row.parentId); + let param = { + code: row.parentId, + thirdSysFk: row.thirdSysFk + } + this.loadSubData(param); }) .catch(() => { this.deleteLoading = false; @@ -544,14 +548,17 @@ export default { //添加分库 forSubSubmit() { - if (this.$isBlank(this.subData.name)) { this.$message.error("分库名称不能为空!"); return; } saveSubWarehouse(this.subData, this.subFromName).then((response) => { if (response.code == 20000) { - this.loadSubData(this.subData.parentId); + let row = { + code: this.subData.parentId, + thirdSysFk: this.subData.thirdSysFk + } + this.loadSubData(row); this.subFormVisible = false; } else { this.$message.error(response.message); @@ -560,10 +567,8 @@ export default { }).catch(() => { this.subFormVisible = false; }); - }, - formSubmit() { if (!isBlank(this.formData.code)) { if (Number(this.formData.code) + '' === NaN + '') { @@ -604,9 +609,9 @@ export default { } } } - // 刷新表单 - this.resetForm(); this.getList(); + // 刷新表单验证 + this.resetForm(); }) .catch(() => { this.formLoading = false;