diff --git a/src/api/archivesKeeping/caseManage.js b/src/api/archivesKeeping/caseManage.js
new file mode 100644
index 0000000..d8726a0
--- /dev/null
+++ b/src/api/archivesKeeping/caseManage.js
@@ -0,0 +1,100 @@
+import request from '@/utils/request'
+import qs from 'qs'
+
+export function add(form) {
+ return edit(form)
+}
+
+export function edit(parameter) {
+ return request({
+ url: 'api/archivesDeposit/editCase',
+ method: 'post',
+ data: parameter
+ })
+}
+
+// 删除档案盒
+export function del(data) {
+ return request({
+ url: 'api/archivesDeposit/del',
+ method: 'post',
+ data: data
+ })
+}
+
+// 判断盒名称是否重复
+export function caseNameIsRepeat(parameter) {
+ return request({
+ url: 'api/archivesDeposit/caseNameIsRepeat',
+ method: 'get',
+ params: parameter
+ })
+}
+// 判断条形码值是否重复
+export function barcodeIsRepeat(parameter) {
+ return request({
+ url: 'api/archivesDeposit/barcodeIsRepeat',
+ method: 'get',
+ params: parameter
+ })
+}
+
+// 档案盒列表
+export function FetchInitCaseList(parameter) {
+ return request({
+ url: 'api/archivesDeposit/initCaseList',
+ method: 'get',
+ params: parameter
+ })
+}
+
+// 档案盒装盒列表
+export function FetchInitCartoningList(parameter) {
+ return request({
+ url: 'api/archivesDeposit/initCartoningList',
+ method: 'get',
+ params: parameter
+ })
+}
+
+// 装盒
+export function FetchCartoning(data) {
+ return request({
+ url: 'api/archivesDeposit/cartoning',
+ method: 'post',
+ data: data
+ })
+}
+// 拆盒
+export function unpacking(data) {
+ return request({
+ url: 'api/archivesDeposit/unpacking',
+ method: 'post',
+ data: data
+ })
+}
+// 盒详情
+export function findInCase(params) {
+ return request({
+ url: 'api/archivesDeposit/findInCase' + '?' + qs.stringify(params, { indices: false }),
+ method: 'get'
+ })
+}
+
+// 获取新条码号
+export function getNewBarcode(params) {
+ return request({
+ url: 'api/archivesDeposit/getNewBarcode' + '?' + qs.stringify(params, { indices: false }),
+ method: 'get'
+ })
+}
+
+// 获取新盒号
+export function getNewCaseCode(params) {
+ return request({
+ url: 'api/archivesDeposit/getNewCaseCode' + '?' + qs.stringify(params, { indices: false }),
+ method: 'get'
+ })
+}
+
+export default { add, edit, del, unpacking, findInCase, getNewBarcode, getNewCaseCode }
diff --git a/src/api/archivesManage/library.js b/src/api/archivesManage/library.js
index adbfe53..396e1c6 100644
--- a/src/api/archivesManage/library.js
+++ b/src/api/archivesManage/library.js
@@ -10,7 +10,7 @@ export function FetchInitCategoryViewTable(params) {
})
}
-export function FetchInitCategoryView(params) {
+export function FetchInitContorlView(params) {
return request({
url: 'api/control/initCategoryView' + '?' + qs.stringify(params, { indices: false }),
method: 'get'
@@ -19,5 +19,5 @@ export function FetchInitCategoryView(params) {
export default {
FetchInitCategoryViewTable,
- FetchInitCategoryView
+ FetchInitContorlView
}
diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss
index 93cf6fb..3746efc 100644
--- a/src/assets/styles/archives-manage.scss
+++ b/src/assets/styles/archives-manage.scss
@@ -909,4 +909,21 @@
display: inline-block;
color: #0348F3;
}
+}
+
+.filter-rfid{
+ margin-left: 10px;
+ padding: 0 13px;
+ height: 32px;
+ line-height: 30px;
+ &.is-disabled,
+ &.is-disabled:focus{
+ border-color: #0348F3 !important;
+ background-color: rgba(31, 85, 235, 0.20) !important;
+ color: #0348F3 !important;
+ opacity: 0.6;
+ }
+ .iconfont{
+ font-size: 20px;
+ }
}
\ No newline at end of file
diff --git a/src/views/archiveKeeping/caseManage/caseList/index.vue b/src/views/archiveKeeping/caseManage/caseList/index.vue
new file mode 100644
index 0000000..47ef176
--- /dev/null
+++ b/src/views/archiveKeeping/caseManage/caseList/index.vue
@@ -0,0 +1,368 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+ 拆盒
+
+
+
+ 绑定标签
+
+
+
+ 打印目录
+
+
+
+
+
+
+
+
+
+ {{ scope.row.storageType | storageTypeStatus }}
+
+
+
+
+
+
+
+
+ -
+
+ {{ scope.row.folderLocationDetails }}
+
+
+
+
+
+ {{ scope.row.update_time | parseTime }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue b/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue
new file mode 100644
index 0000000..90df8e1
--- /dev/null
+++ b/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
盒名称:{{ rowData.caseName }}
+
盒条码:{{ rowData.barcode }}
+
+
+
存放位置:
+
+ -
+
+ {{ rowData.folderLocationDetails }}
+
+
+
+
TID:{{ rowData.tid }}
+
+
创建时间:{{ rowData.create_time | parseTime }}
+
+
+
+
+
+
+
+ 文件级
+ 卷内级
+ 案卷级
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+ {{ scope.row.folderLocationDetails }}
+
+
+
+
+
+ {{ scope.row.create_time | parseTime }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/archiveKeeping/caseManage/caseList/module/form.vue b/src/views/archiveKeeping/caseManage/caseList/module/form.vue
new file mode 100644
index 0000000..a0de84f
--- /dev/null
+++ b/src/views/archiveKeeping/caseManage/caseList/module/form.vue
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/archiveKeeping/caseManage/caseList/module/openCaseDlg.vue b/src/views/archiveKeeping/caseManage/caseList/module/openCaseDlg.vue
new file mode 100644
index 0000000..04b6cc8
--- /dev/null
+++ b/src/views/archiveKeeping/caseManage/caseList/module/openCaseDlg.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
确定拆除当前选择的所有档案盒吗?
+
+
+ 提示:1.确定拆盒后,当前盒号下绑定的所有档案数据将一并清除;
+ 2.若案卷存在多个盒,选择其中一个分盒则自动拆掉该案卷的全部档案盒
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/archiveKeeping/caseManage/index.vue b/src/views/archiveKeeping/caseManage/index.vue
new file mode 100644
index 0000000..c42fc2c
--- /dev/null
+++ b/src/views/archiveKeeping/caseManage/index.vue
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
diff --git a/src/views/archiveKeeping/caseManage/module/caseLog.vue b/src/views/archiveKeeping/caseManage/module/caseLog.vue
new file mode 100644
index 0000000..0fe7cbf
--- /dev/null
+++ b/src/views/archiveKeeping/caseManage/module/caseLog.vue
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+ {{ scope.row.operationType === 1 ? '装盒' : '拆盒' }}
+
+
+
+
+
+
+
+
+
+ {{ scope.row.create_time | parseTime }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/archiveUtilize/archiveEditing/module/materialSelected.vue b/src/views/archiveUtilize/archiveEditing/module/materialSelected.vue
index da2b721..d25a3e3 100644
--- a/src/views/archiveUtilize/archiveEditing/module/materialSelected.vue
+++ b/src/views/archiveUtilize/archiveEditing/module/materialSelected.vue
@@ -167,6 +167,7 @@ export default {
const params = {
'categoryId': this.currentCategory.id,
'categoryLevel': this.currentLevel,
+ 'ignore': false,
'search': this.query.search,
'page': this.page.page - 1,
'size': this.page.size
diff --git a/src/views/archivesManage/managementLibrary/anjuan/tableList.vue b/src/views/archivesManage/managementLibrary/anjuan/tableList.vue
index 819f29e..4c3e4cf 100644
--- a/src/views/archivesManage/managementLibrary/anjuan/tableList.vue
+++ b/src/views/archivesManage/managementLibrary/anjuan/tableList.vue
@@ -98,7 +98,7 @@
/>
-
+
diff --git a/src/views/archivesManage/managementLibrary/index.vue b/src/views/archivesManage/managementLibrary/index.vue
index 20c4679..06de6e6 100644
--- a/src/views/archivesManage/managementLibrary/index.vue
+++ b/src/views/archivesManage/managementLibrary/index.vue
@@ -133,7 +133,8 @@ export default {
'archive_year': null, // 年度
'fonds_no': null // 全宗
},
- fixedStatusBar: false
+ fixedStatusBar: false,
+ listCategory: null
}
},
watch: {
diff --git a/src/views/archivesManage/managementLibrary/juannei/index.vue b/src/views/archivesManage/managementLibrary/juannei/index.vue
index 0daed91..ebdc1a4 100644
--- a/src/views/archivesManage/managementLibrary/juannei/index.vue
+++ b/src/views/archivesManage/managementLibrary/juannei/index.vue
@@ -108,7 +108,7 @@
/>
-
+
diff --git a/src/views/archivesManage/managementLibrary/mixins/index.js b/src/views/archivesManage/managementLibrary/mixins/index.js
index 77469d8..598363e 100644
--- a/src/views/archivesManage/managementLibrary/mixins/index.js
+++ b/src/views/archivesManage/managementLibrary/mixins/index.js
@@ -1,4 +1,4 @@
-import { FetchInitCategoryViewTable, FetchInitCategoryView } from '@/api/archivesManage/library'
+import { FetchInitCategoryViewTable, FetchInitContorlView } from '@/api/archivesManage/library'
import { crud } from '@crud/crud'
export const manageLibraryCrud = {
mixins: [crud()],
@@ -111,6 +111,7 @@ export const manageLibraryCrud = {
'parentId': parentsId,
'categoryId': this.selectedCategory.id,
'categoryLevel': categoryLevel,
+ 'ignore': false,
'isdel': this.parentsData.isdel,
'checkTypes': this.selectStatus && this.selectStatus.length !== 0 ? this.selectStatus.join(',') : null,
'search': this.query.search,
@@ -126,8 +127,10 @@ export const manageLibraryCrud = {
'size': this.page.size,
'sort': this.arrySort
}
- FetchInitCategoryView(params).then((res) => {
+ FetchInitContorlView(params).then((res) => {
+ console.log('resssss', res)
if (res.code !== 500) {
+ this.parentsData.listCategory = res.category
if (categoryLevel === 1) {
// 项目
const projectObj = this.parentsData.$refs.projectEle
diff --git a/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue b/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue
index 141fb25..78e4afc 100644
--- a/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue
@@ -35,7 +35,7 @@
-
+
@@ -69,6 +69,10 @@ export default {
isTitleType: {
type: Number,
default: 2
+ },
+ isCollect: {
+ type: Boolean,
+ default: true
}
},
data() {
diff --git a/src/views/archivesManage/managementLibrary/module/collectHeader.vue b/src/views/archivesManage/managementLibrary/module/collectHeader.vue
index 92bc9d7..561e7e1 100644
--- a/src/views/archivesManage/managementLibrary/module/collectHeader.vue
+++ b/src/views/archivesManage/managementLibrary/module/collectHeader.vue
@@ -143,7 +143,7 @@
-
+
@@ -351,7 +351,8 @@ export default {
projectOptions: [],
classifyOptions: [],
isDesFormType: 'manageArcives', // 区分是门类得还是档案得
- arcId: null
+ arcId: null,
+ totalSumAll: 0
}
},
computed: {
@@ -725,7 +726,15 @@ export default {
},
// 装盒 / 分卷装盒
handlePackingBox(type) {
+ if (this.selections.length === 0) {
+ this.$message('您还未勾选需要操作的条目,请先确认!')
+ return false
+ }
if (this.selectedCategory.arrangeType === 2) {
+ if (this.selections.length > 1) {
+ this.$message('只可勾选唯一目标条目,请先确认!')
+ return false
+ }
if (this.selections[0].child === 0) {
this.$message.error('当前选中的档案无相关卷内文件,不可装盒!')
return
@@ -741,13 +750,25 @@ export default {
// this.$message('所选条目中存在已装盒档案,请勿重复操作!')
// return false
// }
+ console.log('box', this.parentsData.listCategory)
this.$refs.packingBox.packingVisible = true
this.$refs.packingBox.isPackingOrPartType = type
+ this.$refs.packingBox.packFileCategory = this.parentsData.listCategory
if (type === 0) {
this.$refs.packingBox.packingTitle = '装盒'
} else {
this.$refs.packingBox.packingTitle = '分卷装盒'
+ this.$refs.packingBox.getViewTable()
+ }
+ this.getTotalSumAll()
+ },
+ getTotalSumAll() {
+ this.totalSumAll = 0
+ this.selections.map((item) => { if (!isNaN(item.child)) this.totalSumAll += item.child })
+ if (isNaN(this.totalSumAll)) {
+ return 0
}
+ return this.totalSumAll
},
// 在线移交
handleOnlineHandover() {
diff --git a/src/views/archivesManage/managementLibrary/module/packingBox/index.vue b/src/views/archivesManage/managementLibrary/module/packingBox/index.vue
index d40fd26..e82dcfe 100644
--- a/src/views/archivesManage/managementLibrary/module/packingBox/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/packingBox/index.vue
@@ -20,7 +20,7 @@
数据来源:文件{{ selections.length }}条数据
-
数据来源:案卷{{ selections.length }}条数据 卷内{{ 111 }}条数据
+
数据来源:案卷{{ selections.length }}条数据 卷内{{ totalSumAll }}条数据
@@ -37,13 +37,13 @@
装盒
-
-
+
+
-
-
-
+
+
+
@@ -60,16 +60,16 @@
>
- 装盒
+ 装盒
-
+
-
-
-
+
+
+
@@ -88,13 +88,13 @@
撤销
-
+
-
-
-
+
+
+
@@ -112,8 +112,6 @@
@row-click="clickRowHandler"
>
-
-
-
diff --git a/src/views/archivesManage/managementLibrary/project/index.vue b/src/views/archivesManage/managementLibrary/project/index.vue
index ed3bf0a..2dedabe 100644
--- a/src/views/archivesManage/managementLibrary/project/index.vue
+++ b/src/views/archivesManage/managementLibrary/project/index.vue
@@ -55,7 +55,7 @@
/>
-
+
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue
index d53ccf2..dcdb297 100644
--- a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue
@@ -59,7 +59,7 @@
/>
-
+
diff --git a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue
index 975c0c7..47673b5 100644
--- a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue
@@ -67,7 +67,7 @@
/>
-
+
diff --git a/src/views/collectReorganizi/collectionLibrary/mixins/index.js b/src/views/collectReorganizi/collectionLibrary/mixins/index.js
index 5cfee33..c92e245 100644
--- a/src/views/collectReorganizi/collectionLibrary/mixins/index.js
+++ b/src/views/collectReorganizi/collectionLibrary/mixins/index.js
@@ -110,6 +110,7 @@ export const collectionLibraryCrud = {
'parentId': parentsId,
'categoryId': this.selectedCategory.id,
'categoryLevel': categoryLevel,
+ 'ignore': false,
'isdel': this.parentsData.isdel,
'search': this.query.search,
'retention': this.smartQuery.retention,
diff --git a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
index 3ee15f6..850ab3e 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
@@ -35,7 +35,7 @@
-
+
@@ -69,6 +69,10 @@ export default {
isTitleType: {
type: Number,
default: 2
+ },
+ isCollect: {
+ type: Boolean,
+ default: true
}
},
data() {
diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue b/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue
index a7a70ee..62f6b1e 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue
@@ -193,6 +193,7 @@ export default {
const params = {
'categoryId': this.currentCategory.id,
'categoryLevel': this.currentLevel,
+ 'ignore': false,
'search': this.query.search,
'page': this.page.page - 1,
'size': this.page.size
diff --git a/src/views/collectReorganizi/collectionLibrary/module/insertFile/index.vue b/src/views/collectReorganizi/collectionLibrary/module/insertFile/index.vue
index 640bece..1be4d6d 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/insertFile/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/insertFile/index.vue
@@ -154,6 +154,7 @@ export default {
const params = {
'parentId': parentsId,
'categoryId': this.selectedCategory.id,
+ 'ignore': false,
'categoryLevel': categoryLevel,
'search': this.query.search,
'page': this.page.page - 1,
diff --git a/src/views/collectReorganizi/collectionLibrary/project/index.vue b/src/views/collectReorganizi/collectionLibrary/project/index.vue
index 2a2ac11..db55d86 100644
--- a/src/views/collectReorganizi/collectionLibrary/project/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/project/index.vue
@@ -55,7 +55,7 @@
/>
-
+
diff --git a/src/views/components/archivesListModule/index.vue b/src/views/components/archivesListModule/index.vue
index 8cc1a7e..1e2d11a 100644
--- a/src/views/components/archivesListModule/index.vue
+++ b/src/views/components/archivesListModule/index.vue
@@ -41,6 +41,7 @@