diff --git a/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue b/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue index d7bca92..2bdbbe4 100644 --- a/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue +++ b/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue @@ -64,7 +64,7 @@ export default { viewBtnText: '详情', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 120, + menuWidth: 100, dialogWidth: 640, dialogClickModal: false, searchEnter: true, @@ -299,6 +299,7 @@ export default { }); }, onLoad() { + this.loading = true; getList({ current:this.page.currentPage, size:this.page.pageSize, @@ -306,6 +307,7 @@ export default { }).then(res =>{ this.data = res.data.data.records this.page.total = res.data.data.total + this.loading = false; }) // this.data = [ // { diff --git a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/addPreserve.vue b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/addPreserve.vue index 9d1272e..8a00168 100644 --- a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/addPreserve.vue +++ b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/addPreserve.vue @@ -246,9 +246,9 @@ export default { this.form.tableData = this.form.tableData.filter(row => !row._select); }, - closeDialog() { + closeDialog(val) { this.openShow = false; - this.$emit('closeDialog'); + this.$emit('closeDialog',val); // 重置表单 this.form.tableData = []; this.formError = ''; @@ -303,7 +303,7 @@ export default { addRecords(submitData).then(res => { if(res.data.code === 200){ this.$message.success('新增成功'); - this.closeDialog(); + this.closeDialog(true); } }) } catch (err) { diff --git a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue index c9b8afd..1494f66 100644 --- a/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue +++ b/src/views/qualityManagement/inspectionArchiving/rbFilePreserve/index.vue @@ -147,7 +147,7 @@ export default { excelBtn: true, showOverflowTooltip: true, align: 'center', - menuWidth: 360, + menuWidth: 280, searchLabelPosition: 'left', searchGutter: 24, searchSpan: 6, @@ -319,8 +319,12 @@ export default { handleAdd(){ this.showDialog = true }, - closeDialog(){ + closeDialog(val){ this.showDialog = false + this.isShowImport = false + if(val){ + this.onLoad() + } }, getPermission(key, row, index) { if (key === 'editBtn') { diff --git a/src/views/system/user.vue b/src/views/system/user.vue index 7b7318e..2baee87 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -429,6 +429,9 @@ export default { row.roleId = func.join(row.roleId); row.postId = func.join(row.postId); row.leaderId = func.join(row.leaderId); + row.tenantId = '000000' + row.userType = '1' + console.log('row--------------',row) add(row).then( () => { this.initFlag = false; @@ -452,6 +455,9 @@ export default { row.leaderId = func.join(row.leaderId); // 获取需要提交的数据 const submitData = this.sensitiveManager.getSubmitData(row); + row.tenantId = '000000' + row.userType = '1' + console.log('sub--------',submitData) update(submitData).then( () => { this.initFlag = false;