Merge remote-tracking branch 'origin/master'

src/api/cw/reportManagement/ProjectReportService.js

@@ -290,4 +290,11 @@ saveSignatureAnnotator: function (inputForm) {
 			responseType: 'blob'
 		})
 	},
+	exportTemplate () {
+		return request({
+			url: prefix + '/cwProjectReport/importDetail/template',
+			method: 'get',
+			responseType: 'blob'
+		})
+	}
 }

src/views/attachment/Form.vue

@@ -102,7 +102,7 @@ export default {
 		selectMethod(e) {
 			if (e.target.value !== '') {
 				this.inputForm.classification = e.target.value;
-				this.$forceUpdate(); // 强制更新 
+				this.$forceUpdate(); // 强制更新
 			}
 		},
 		init(method, id) {
@@ -163,7 +163,7 @@ export default {
 			}
 			if (files.length <= 0) {
 				this.loading = false
-				this.$message.error(`请上传附件后提交`);
+				//this.$message.error(`待附件上传完毕后提交`);
 				return
 			}
 			this.loading = true

src/views/cw/reportManagement/NumberReplace.vue

@@ -42,6 +42,7 @@
 
 			<template #footer>
 						<span class="dialog-footer">
+					  		<el-button  type="warning" @click="downloadTpl()" plain>下载模板</el-button>
 					  		<el-button  @click="close()" icon="el-icon-circle-close">关闭</el-button>
 					  		<el-button  v-if="method !== 'view'" type="primary" icon="el-icon-circle-check" @click="doSubmit()">确定</el-button>
 					 	</span>
@@ -82,6 +83,20 @@
 			beforeUploadDetail(file){
 				this.inputForm.file.push(file)
 			},
+			// 下载模板
+			downloadTpl () {
+				this.loading = true
+				projectReportService.exportTemplate().then((res) => {
+					// 将二进制流文件写入excel表，以下为重要步骤
+					this.$utils.downloadExcel(res, '报告号调整模板' + ".xls")
+					this.loading = false
+				}).catch(function (err) {
+					this.loading = false
+					if (err.response) {
+						console.log(err.response)
+					}
+				})
+			},
 			doSubmit(){
 				if (this.commonJS.isEmpty(this.inputForm.year)) {
 					this.$message.warning('年份不可以为空,请输入年份')

src/views/cw/reportManagement/ReportManagementList.vue

@@ -169,7 +169,7 @@
         <template #buttons>
           <el-button v-if="hasPermission('cw_work_client:info:add')" type="primary" icon="el-icon-plus" @click="start()">新建</el-button>
 		  <el-button type="warning" icon="el-icon-download" @click="exportAllSignatureFile()" :disabled="$refs.clientTable && $refs.clientTable.getCheckboxRecords().length === 0" plain>已盖章文件下载</el-button>
-		  <el-button type="warning" icon="el-icon-download" @click="importReplaceNumber()" plain>报告号替换</el-button>
+		  <el-button v-if="hasPermission('cw_report_number:replace')" type="primary" @click="importReplaceNumber()" plain>报告号替换</el-button>
         </template>
 		  <template #tools>
 			  <vxe-button

src/views/program/registered/ProjectArchiveForm.vue

@@ -803,11 +803,11 @@
             if (this.commonJS.isEmpty(this.inputForm.otherFileList)) {
               this.inputForm.otherFileList = []
             }
-            this.$refs.uploadComponentReport.newUpload(method, this.inputForm.reportFileList, 'program', null, '评估报告及评估明细表')
-            this.$refs.uploadComponentExplain.newUpload(method, this.inputForm.explainFileList, 'program', null, '评估说明')
-            this.$refs.uploadComponentDetail.newUpload(method, this.inputForm.detailFileList, 'program', null, '开票文件')
-            this.$refs.uploadComponentPapers.newUpload(method, this.inputForm.papersFileList, 'program', null, '评估操作计算底稿')
-            this.$refs.uploadComponentOther.newUpload(method, this.inputForm.otherFileList, 'program', 1024, '其他')
+            this.$refs.uploadComponentReport.newUpload(method, this.inputForm.reportFileList, 'program', 2048, '评估报告及评估明细表')
+            this.$refs.uploadComponentExplain.newUpload(method, this.inputForm.explainFileList, 'program', 2048, '评估说明')
+            this.$refs.uploadComponentDetail.newUpload(method, this.inputForm.detailFileList, 'program', 2048, '开票文件')
+            this.$refs.uploadComponentPapers.newUpload(method, this.inputForm.papersFileList, 'program', 2048, '评估操作计算底稿')
+            this.$refs.uploadComponentOther.newUpload(method, this.inputForm.otherFileList, 'program', 2048, '其他')
             this.loading = false
           })
         })

src/views/program/registered/ProjectThreeAuditForm.vue

@@ -381,11 +381,11 @@ export default {
           if (this.status === 'taskFormDetail') {
             this.$refs.uploadComponent.newUpload('view', this.inputForm.workAttachmentDtoList, 'program_audit')
           } else if (this.status === 'audit') {
-            this.$refs.uploadComponent.newUpload('view', this.inputForm.workAttachmentDtoList, 'program_audit', null, null, true, this.$store.state.user.name)
+            this.$refs.uploadComponent.newUpload('view', this.inputForm.workAttachmentDtoList, 'program_audit', 500, null, true, this.$store.state.user.name)
           } else if (this.method === 'view') {
             this.$refs.uploadComponent.newUpload('view', this.inputForm.workAttachmentDtoList, 'program_audit')
           } else {
-            this.$refs.uploadComponent.newUpload('view', this.inputForm.workAttachmentDtoList, 'program_audit', null, null, true, this.$store.state.user.name)
+            this.$refs.uploadComponent.newUpload('view', this.inputForm.workAttachmentDtoList, 'program_audit', 500, null, true, this.$store.state.user.name)
           }
           this.loading = false
         })
@@ -394,7 +394,7 @@ export default {
     reapplyForm(callback) {
       this.loading = true
       this.programProjectListInfoService.findByIdAudit(this.inputForm.id).then((data) => {
-        if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示  2 
+        if (data.status !== '4') { // 审核状态不是“驳回”，就弹出提示  2
           taskService.getTaskAuditUsersByprocInstId(this.$route.query.procInsId).then(res => {
             let userInfo = this.$TOOL.data.get("USER_INFO");
             // 如果审核人是本人的话，则跳过数据状态的限制