diff --git a/src/api/eam/eamProofing.js b/src/api/eam/eamProofing.js
index 048beea..f312361 100644
--- a/src/api/eam/eamProofing.js
+++ b/src/api/eam/eamProofing.js
@@ -13,6 +13,7 @@ export const deleteProofingRecord= data => createAPI(`/plm/proofingInformation/d
export const getProofDocument= data => createAPI(`/plm/proofingInformation/getProofDocument`,'post',data)
export const deleteDocumentType= data => createAPI(`/plm/proofingInformation/deleteDocumentType`,'post',data)
+export const batchDeleteDocumentType= data => createAPI(`/plm/proofingInformation/batchDeleteDocumentType`,'post',data)
//proofingDocumentSave
export const proofingDocumentSave = data => createAPI(`/plm/proofingInformation/proofingDocumentSave`,'post',data)
diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue
index 7dbec48..4b2ed85 100644
--- a/src/views/modules/eam/com_project_proof_record.vue
+++ b/src/views/modules/eam/com_project_proof_record.vue
@@ -211,11 +211,20 @@
新增
+ 批量删除
+
+
- 关闭
+ 关闭
@@ -645,7 +654,7 @@
import Chooselist from '@/views/modules/common/Chooselist'
import { deleteFileInfo, saveFileInfo, updateUploadedFlag } from '@/api/test/fileService.js';
import
- {proofingInformationSearch,deleteProofingRecord,proofingDocumentNEW,getExtraDocumentList,editProofingRecord,proofingInformationSave,getProofDocument,deleteDocumentType,proofingDocumentSave,getCopyDocumentFileList} from "@/api/eam/eamProofing.js";
+ {proofingInformationSearch,deleteProofingRecord,proofingDocumentNEW,getExtraDocumentList,editProofingRecord,proofingInformationSave,getProofDocument,deleteDocumentType,batchDeleteDocumentType,proofingDocumentSave,getCopyDocumentFileList} from "@/api/eam/eamProofing.js";
import row from "element-ui/packages/row";
import UploadFileList1 from "../common/uploadFileList1.vue";
import he from "element-ui/src/locale/lang/he";
@@ -762,6 +771,7 @@
documentTypeId: ''
},
documentSelection: [],
+ documentDefinitionSelection: [],
documentCopySelection: [],
extraDocumentList:[],
cProjectTypeDbList: [
@@ -1544,6 +1554,12 @@
} else {
this.proofDocumentList = []
}
+ this.documentDefinitionSelection = []
+ this.$nextTick(() => {
+ if (this.$refs.documentDefinitionTable) {
+ this.$refs.documentDefinitionTable.clearSelection()
+ }
+ })
})
},
@@ -1572,6 +1588,10 @@
documentListVisibleFalse() {
this.documentListVisible = false
this.proofDocumentListDefinition = []
+ this.documentDefinitionSelection = []
+ if (this.$refs.documentDefinitionTable) {
+ this.$refs.documentDefinitionTable.clearSelection()
+ }
},
addDocumentList(row) {
this.proofDocumenCurrentRow = row
@@ -2010,6 +2030,63 @@
});
});
},
+ selectionDocumentDefinition(val) {
+ this.documentDefinitionSelection = val
+ },
+ batchDeleteDocumentTypeHandle() {
+ if (this.documentDefinitionSelection.length === 0) {
+ this.$message({
+ message: '请选择需要删除的文档清单',
+ type: 'error'
+ })
+ return
+ }
+ const hasUploadedDocument = this.documentDefinitionSelection.some(item => item.documentId !== null && item.documentId !== undefined && item.documentId !== '')
+ if (hasUploadedDocument) {
+ this.$alert('选中的文档类型存在上传文件，不允许批量删除！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return
+ }
+ const documentDefinitionListIds = this.documentDefinitionSelection
+ .filter(item => item.documentDefinitionListId !== null && item.documentDefinitionListId !== undefined && item.documentDefinitionListId !== '')
+ .map(item => String(item.documentDefinitionListId))
+ if (documentDefinitionListIds.length === 0) {
+ this.$message({
+ message: '选中的文档清单无有效ID',
+ type: 'error'
+ })
+ return
+ }
+ this.$confirm(`是否删除选中的 ${documentDefinitionListIds.length} 条文档清单?`, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ const inData = {
+ site: this.$store.state.user.site,
+ documentDefinitionListIds: documentDefinitionListIds
+ }
+ batchDeleteDocumentType(inData).then(({data}) => {
+ if (data && data.code === 0) {
+ this.$message({
+ message: '批量删除成功',
+ type: 'success'
+ })
+ this.getProofDocument()
+ } else {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ })
+ }
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ });
+ },
addDocumentTypeModal() {
this.addDocumentTypeFlag = true
},
diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue
index a9202a2..8567f18 100644
--- a/src/views/modules/eam/eamFeedBack.vue
+++ b/src/views/modules/eam/eamFeedBack.vue
@@ -45,6 +45,9 @@
+
+
+
@@ -78,7 +81,7 @@
- 查询
+ 查询
新增
{{'导出'}}
@@ -587,6 +590,7 @@
urgency: '',
repairReportingType: '',
repairType: '',
+ feedbackBy: '',
matterTrackingFlag: '',
},
height: 200,
@@ -1450,6 +1454,7 @@
// 获取数据列表
getDataList () {
+ this.dataListLoading = true
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
eamFeedBackSearch(this.searchData).then(({data}) => {
@@ -1459,6 +1464,9 @@
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
}
+ }).catch(() => {
+ this.$message.error('查询异常')
+ }).finally(() => {
this.dataListLoading = false
})
},