diff --git a/src/main.js b/src/main.js index 06f031b..65eb83c 100644 --- a/src/main.js +++ b/src/main.js @@ -37,7 +37,6 @@ import { parseTime } from '@/utils/index.js' Vue.filter('parseTime', function(time, cFormat) { return parseTime(time, cFormat) }) - Vue.use(checkPer) Vue.use(VueHighlightJS) Vue.use(mavonEditor) diff --git a/src/views/archivesManage/lendManage/borrowerManage/index.vue b/src/views/archivesManage/lendManage/borrowerManage/index.vue index c25e69f..f9d3e30 100644 --- a/src/views/archivesManage/lendManage/borrowerManage/index.vue +++ b/src/views/archivesManage/lendManage/borrowerManage/index.vue @@ -1,12 +1,34 @@ @@ -63,6 +63,7 @@ export default { data() { return { activeIndex: 0 + // recordFormVisible:false } }, computed: { @@ -84,6 +85,11 @@ export default { methods: { changeActiveTab(data) { this.activeIndex = data + }, + // 重新登记 + callBack(val) { + console.log(val, '-------------------') + this.activeIndex = val.index } } } diff --git a/src/views/archivesManage/lendManage/lendConfirm/index.vue b/src/views/archivesManage/lendManage/lendConfirm/index.vue index d2e4b82..af75791 100644 --- a/src/views/archivesManage/lendManage/lendConfirm/index.vue +++ b/src/views/archivesManage/lendManage/lendConfirm/index.vue @@ -6,7 +6,7 @@ size="mini" @click="lendFormVisible = true" >借出 - 重新登记 + 重新登记 移出 导出 @@ -77,6 +77,10 @@ export default { }, clickRowHandler() { console.log('clickRowHandler') + }, + // 重新登记返回上一级 + handelReRecord() { + this.$emit('callBack', { index: 0 }) } } } diff --git a/src/views/archivesManage/lendManage/lendQuery/index.vue b/src/views/archivesManage/lendManage/lendQuery/index.vue index 664b5e8..3c56c9f 100644 --- a/src/views/archivesManage/lendManage/lendQuery/index.vue +++ b/src/views/archivesManage/lendManage/lendQuery/index.vue @@ -1,7 +1,7 @@