diff --git a/src/views/userManage/admin/authRole.vue b/src/views/userManage/admin/authRole.vue index 6aa487f..71be768 100644 --- a/src/views/userManage/admin/authRole.vue +++ b/src/views/userManage/admin/authRole.vue @@ -93,6 +93,7 @@ :page-size="query.limit" @current-change="handleCurrentChange" layout="prev, pager, next" + :current-page="query.page" :total="total" > @@ -326,7 +327,7 @@ export default { this.getList(); }, handleCurrentChange(val) { - + this.query.page = val; this.getList(); }, @@ -467,7 +468,7 @@ export default { }, formSubmit() { var regu = "^[ ]+$"; - var re = new RegExp(regu); + var re = new RegExp(regu); if (this.$isBlank(this.formData.name) || re.test(this.formData.name)) { this.$message.error("请输入角色名称!"); return; diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index f65e731..988d6dc 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -1035,7 +1035,7 @@ export default { }); }, - findSubStorageMethod() { + findSubStorageMethod(val) { let cQuery = { pcode: this.formData.fromCorpId, filter: 2, @@ -1043,7 +1043,10 @@ export default { filterSubByInv(cQuery) .then((response) => { this.fromSubStorageOptions = response.data || []; - this.formData.fromSubInvCode = this.fromSubStorageOptions[0].code; + if (val == 1) { + + } else + this.formData.fromSubInvCode = this.fromSubStorageOptions[0].code; }) .catch(() => { }); @@ -1231,6 +1234,8 @@ export default { this.formData.preCheck = this.idQuery.preCheck; this.actionEnable = true; this.getCodeList(); + + this.findSubStorageMethod(1); } else { this.corpOrderIdDisabled = false; if (JSON.stringify(this.$route.query) === '{}') {