diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss
index 1e62026..9262feb 100644
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@@ -839,6 +839,8 @@
}
}
.setting-dialog{
+ z-index: 100;
+ position: relative;
.des-form{
width: 100% !important;
margin-top: 0 !important;
diff --git a/src/views/archivesManage/caseManage/index.vue b/src/views/archivesManage/caseManage/index.vue
index 4e9f7e6..c967129 100644
--- a/src/views/archivesManage/caseManage/index.vue
+++ b/src/views/archivesManage/caseManage/index.vue
@@ -17,13 +17,13 @@
- 拆盒
+ 拆盒
绑定标签
-
@@ -60,13 +61,14 @@
import caseCrudMethod from '@/api/archivesManage/caseManage'
import BindingTagDlg from '@/views/components/BindingTagDlg'
import eForm from './module/form'
+import openCaseDlg from './module/openCaseDlg'
import CRUD, { presenter, crud } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
export default {
- components: { eForm, crudOperation, rrOperation, pagination, BindingTagDlg },
+ components: { eForm, crudOperation, rrOperation, pagination, BindingTagDlg, openCaseDlg },
mixins: [presenter(), crud()],
cruds() {
return CRUD({
@@ -140,6 +142,10 @@ export default {
this.$refs.bindingTag.tidCode = data[0].tid
}
this.$refs.bindingTag.bindingVisible = true
+ },
+ openCase(data) {
+ this.$refs.openCase.openCaseVisible = true
+ this.$refs.openCase.caseData = data
}
}
}
@@ -150,4 +156,10 @@ export default {
::v-deep div.el-dialog__footer {
text-align: center;
}
+.app-container{
+ margin: 0 20px 20px;
+}
+.container-wrap{
+ min-height: calc(100vh - 242px);
+}
diff --git a/src/views/archivesManage/caseManage/module/openCaseDlg.vue b/src/views/archivesManage/caseManage/module/openCaseDlg.vue
new file mode 100644
index 0000000..cb65145
--- /dev/null
+++ b/src/views/archivesManage/caseManage/module/openCaseDlg.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
+
确定拆除当前选择的所有档案盒吗?
+
提示:1.确定拆盒后,当前盒号下绑定的所有档案数据将一并清除;
+
提示:2.若案卷存在多个盒,选择其中一个分盒则自动拆掉该案卷的全部档案盒
+
+
+
+
+
+
+
+
diff --git a/src/views/category/baseInfo/index.vue b/src/views/category/baseInfo/index.vue
index ea1070e..fb11e1f 100644
--- a/src/views/category/baseInfo/index.vue
+++ b/src/views/category/baseInfo/index.vue
@@ -62,11 +62,15 @@ export default {
// },
watch: {
selectedCategory: function(newValue, oldValue) {
- this.initData()
+ if (newValue && newValue.id) {
+ this.initData()
+ }
}
},
created() {
- this.initData()
+ if (this.selectedCategory && this.selectedCategory.id) {
+ this.initData()
+ }
},
methods: {
initData() {
diff --git a/src/views/category/listBrowsing/index.vue b/src/views/category/listBrowsing/index.vue
index d479b81..ee70336 100644
--- a/src/views/category/listBrowsing/index.vue
+++ b/src/views/category/listBrowsing/index.vue
@@ -74,7 +74,7 @@