diff --git a/src/views/collectReorganizi/filingApprovalList/index.vue b/src/views/collectReorganizi/filingApprovalList/index.vue index 24ecb66..6361b0a 100644 --- a/src/views/collectReorganizi/filingApprovalList/index.vue +++ b/src/views/collectReorganizi/filingApprovalList/index.vue @@ -35,6 +35,7 @@ + @@ -50,6 +51,7 @@ import pagination from '@crud/Pagination' // import { exportFile } from '@/utils/index' // import qs from 'qs' import { mapGetters } from 'vuex' +import Detail from '@/views/system/processManage/runningProcess/module/detail' const data = [ { @@ -76,7 +78,7 @@ const data = [ export default { name: 'FilingApprovalList', - components: { DateRangePicker, rrOperation, crudOperation, pagination }, + components: { Detail, DateRangePicker, rrOperation, crudOperation, pagination }, cruds() { return [ CRUD({ @@ -120,8 +122,10 @@ export default { [CRUD.HOOK.afterRefresh]() { this.crud.data = data }, - handleDetail() { - this.$refs.mDetail.eepDetialVisible = true + handleDetail(row) { + this.$refs.processDetail.detailVisible = true + this.$refs.processDetail.selectRow = row + this.$refs.processDetail.activeIndex = 0 }, doExport(data) { crud.downloadLoading = true diff --git a/src/views/collectReorganizi/receivingFlowList/index.vue b/src/views/collectReorganizi/receivingFlowList/index.vue new file mode 100644 index 0000000..17563f8 --- /dev/null +++ b/src/views/collectReorganizi/receivingFlowList/index.vue @@ -0,0 +1,33 @@ + + + + + diff --git a/src/views/system/fieldCorresManage/index.vue b/src/views/system/fieldCorresManage/index.vue index ff84e77..8b53c10 100644 --- a/src/views/system/fieldCorresManage/index.vue +++ b/src/views/system/fieldCorresManage/index.vue @@ -206,7 +206,7 @@ export default { if (valid) { crudFieldMate.FetchCheckRepeat(this.form).then((res) => { this.initFiledList(this.form.documentId, this.form.categoryId) - if (res === {}) { + if (JSON.stringify(res) === JSON.stringify({})) { // 不存在对应关系时 this.$refs.corresForm.corresVisible = true this.$refs.corresForm.documentName = this.selectedDocumentName