diff --git a/src/api/archivesManage/caseManage.js b/src/api/archivesManage/caseManage.js
index f34240a..05c282d 100644
--- a/src/api/archivesManage/caseManage.js
+++ b/src/api/archivesManage/caseManage.js
@@ -47,6 +47,15 @@ export function FetchInitCaseList(parameter) {
})
}
+// 档案盒装盒列表
+export function FetchInitCartoningList(parameter) {
+ return request({
+ url: 'api/case/initCartoningList',
+ method: 'get',
+ params: parameter
+ })
+}
+
// 装盒
export function FetchCartoning(data) {
return request({
diff --git a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue
index e60fb89..4b12764 100644
--- a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue
@@ -352,15 +352,17 @@ export default {
methods: {
doExport(fileName = '未知文件') {
this.crud.downloadLoading = true
- if (this.selectedCategory.pid !== '0') {
- this.parentsId = this.selectedCategory.pid
+ if (this.selectedCategory.isType !== 3 || this.selectedCategory.isType !== 5) {
+ this.parentsId = this.projectSelection.id
} else {
this.parentsId = null
}
+ console.log(this.parentsId)
const params = {
- 'categoryId': this.selectedCategory.id,
+ 'categoryId': this.categoryId,
'parentsId': this.parentsId
}
+ console.log(params)
exportFile(this.baseApi + '/api/archives/exportArchives?' + qs.stringify(params))
this.crud.downloadLoading = false
},
@@ -644,7 +646,7 @@ export default {
this.$refs.packing.packingVisible = true
this.$refs.packing.isPackingOrPartType = type
if (type) {
- this.$refs.packing.archivesTable = this.recycleMain.$refs.file.junneiData
+ this.$refs.packing.archivesTable = JSON.parse(JSON.stringify(this.recycleMain.$refs.file.junneiData))
}
this.getTotalSumAll()
}
diff --git a/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue b/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue
index 9ff61a1..52c22de 100644
--- a/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue
@@ -104,7 +104,7 @@
- {{ scope.row.case_no ? '已装': '未装' }}
+ {{ scope.row.case_no ? '已装': '未装' }}
diff --git a/src/views/archivesManage/archivesList/module/packing/index.vue b/src/views/archivesManage/archivesList/module/packing/index.vue
index 64e8d4d..546680a 100644
--- a/src/views/archivesManage/archivesList/module/packing/index.vue
+++ b/src/views/archivesManage/archivesList/module/packing/index.vue
@@ -158,7 +158,7 @@