From da608a1ea1ffe6b2f5900717b97bcea13ab38f20 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Sat, 17 Jun 2023 17:18:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecgbiz/modal/JSelectUserByDepModal.vue | 9 +++-- .../form/ProcessMaterialWarehousingForm.vue | 5 ++- .../form/ProcessMaterialsAllotForm.vue | 5 ++- .../form/ProcessMaterialsDeliveryForm.vue | 6 +++- .../ProcessPermissionAuthorizationForm.vue | 5 ++- .../form/ProcessSmaterialsScrapForm.vue | 5 ++- .../activiti/form/ProcessUdgetPlanForm.vue | 5 ++- src/views/system/DepartList.vue | 20 ++++++++--- src/views/system/modules/UserModal.vue | 34 +++++++++++-------- 9 files changed, 67 insertions(+), 27 deletions(-) diff --git a/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue b/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue index c41f5c1..270a4d5 100644 --- a/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue +++ b/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue @@ -190,12 +190,17 @@ this.ipagination.current = 1 } if (this.selectedDepIds && this.selectedDepIds.length > 0) { - await this.initQueryUserByDepId(this.selectedDepIds) + this.loading = true + let params = this.getQueryParams()//查询条件 + params.id = this.selectedDepIds.join(","); + console.log("<><><><",params); + await this.initQueryUserByDepId(params); // console.log("这边1"); } else { // console.log("这边2"); this.loading = true let params = this.getQueryParams()//查询条件 + console.log("<><><><",params); await getUserList(params).then((res) => { if (res.success) { this.dataSource = res.result.records @@ -307,7 +312,7 @@ // 根据选择的id来查询用户信息 initQueryUserByDepId(selectedDepIds) { this.loading = true - return queryUserByDepId({ id: selectedDepIds.toString() }).then((res) => { + return queryUserByDepId(selectedDepIds).then((res) => { if (res.success) { this.dataSource = res.result this.ipagination.total = res.result.length diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue index 4f8fa32..84e2958 100644 --- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue +++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue @@ -167,6 +167,7 @@ export default { name: 'ProcessMaterialWarehousingForm', mixins: [JEditableTableMixin], + inject:['closeCurrent'], components: { JFormContainer, JDate, @@ -652,7 +653,8 @@ this.$message.success('提交申请成功！') //todo 将表单的数据传给父组件 this.$emit('loadData') - this.close() + this.close(); + this.closeCurrent(); } else { this.$message.error(res.message) } @@ -753,6 +755,7 @@ //todo 将表单的数据传给父组件 if(e!=true){ this.$emit('afterSubmit', formData) + this.closeCurrent(); } } else { this.$message.error(res.message) diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue index 89aef63..ee4412c 100644 --- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue +++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue @@ -142,6 +142,7 @@ export default { name: 'ProcessMaterialsAllotForm', mixins: [JEditableTableMixin], + inject:['closeCurrent'], components: { JFormContainer, JDate, @@ -970,7 +971,8 @@ this.$message.success('提交申请成功！') //todo 将表单的数据传给父组件 this.$emit('loadData') - this.close() + this.close(); + this.closeCurrent(); } else { this.$message.error(res.message) } @@ -1062,6 +1064,7 @@ this.$message.success('保存成功！') //todo 将表单的数据传给父组件 this.$emit('afterSubmit', formData) + this.closeCurrent(); } else { this.$message.error(res.message) } diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue index 845e58a..dfdab9e 100644 --- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue +++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue @@ -155,6 +155,7 @@ export default { name: 'ProcessMaterialsDeliveryForm', mixins: [JEditableTableMixin], + inject:['closeCurrent'], components: { JFormContainer, JDate, @@ -1276,7 +1277,9 @@ this.$message.success('提交申请成功！') //todo 将表单的数据传给父组件 this.$emit('loadData') - this.close() + this.close(); + this.closeCurrent(); + // this.$store.dispatch( this.activePage, this.$route) } else { this.$message.error(res.message) } @@ -1349,6 +1352,7 @@ //this.$message.success("保存成功！") //todo 将表单的数据传给父组件 this.$emit('afterSubmit', formData) + this.closeCurrent(); } else { this.$message.error(res.message) } diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue index ebd09b3..f11e272 100644 --- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue +++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue @@ -119,6 +119,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany' export default { name: 'ProcessPermissionAuthorizationForm', + inject:['closeCurrent'], components: { JFormContainer, JDate, @@ -370,6 +371,7 @@ authorizationNumberDays: '', fileId: '', }) + this.closeCurrent(); // this.close(); }else{ that.$message.warning(res.message); @@ -414,7 +416,8 @@ this.btndisabled = true; httpAction(httpurl,formData,method).then((res)=>{ if(res.success){ - this.$emit('afterSubmit',formData) + this.$emit('afterSubmit',formData); + this.closeCurrent(); }else{ that.$message.warning(res.message); } diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue index f31d25a..5283b6d 100644 --- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue +++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue @@ -119,6 +119,7 @@ export default { name: 'ProcessSmaterialsScrapForm', mixins: [JEditableTableMixin], + inject:['closeCurrent'], components: { JFormContainer, JDate, @@ -405,7 +406,7 @@ created() { //如果是流程中表单，则需要加载流程表单data this.showFlowData(); - console.log("dfgsdf",this.allotBaoNumber); + // console.log("dfgsdf",this.allotBaoNumber); let company = sessionStorage.getItem('PARENT_ID') let userInfo = sessionStorage.getItem('USER_INFORMATION') this.department(userInfo); @@ -932,6 +933,7 @@ //todo 将表单的数据传给父组件 this.$emit('loadData') this.close(); + this.closeCurrent(); } else { this.$message.error(res.message) } @@ -989,6 +991,7 @@ this.$message.success('保存成功！') //todo 将表单的数据传给父组件 this.$emit('afterSubmit', formData) + this.closeCurrent(); } else { this.$message.error(res.message) } diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index e6ddd50..bf8fccc 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -231,6 +231,7 @@ export default { name: 'ProcessUdgetPlanForm', mixins: [JEditableTableMixin], + inject:['closeCurrent'], components: { Template1, JFormContainer, @@ -1573,7 +1574,8 @@ this.$message.success('提交申请成功！') //todo 将表单的数据传给父组件 this.$emit('loadData') - this.close() + this.close(); + this.closeCurrent(); } else { this.$message.error(res.message) } @@ -1811,6 +1813,7 @@ //todo 将表单的数据传给父组件 if (e != true) { this.$emit('afterSubmit', formData) + this.closeCurrent(); } } else { this.$message.error(res.message) diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue index 110be64..705da0d 100644 --- a/src/views/system/DepartList.vue +++ b/src/views/system/DepartList.vue @@ -1,8 +1,7 @@