财务-报告取号类型调整

src/views/cw/invoice/ProgramPageForm.vue

@@ -69,6 +69,8 @@
 				<vxe-column min-width="230" align="center" title="项目名称" field="projectName" show-overflow="title"></vxe-column>
 				<vxe-column min-width="230" align="center" title="项目编号" field="projectNumber"></vxe-column>
 				<vxe-column min-width="230" align="center" title="报告文号" field="reportNo"></vxe-column>
+				<vxe-column min-width="230" align="center" title="审定金额(含税/元)" field="approvedIncludingTax"></vxe-column>
+				<vxe-column min-width="230" align="center" title="审定金额(不含税/元)" field="approvedNoIncludingTax"></vxe-column>
 				<vxe-column min-width="160" align="center" title="合同名称" field="contractName"></vxe-column>
 				<vxe-column min-width="160" align="center" title="报告创建人" field="userName"></vxe-column>
 				<vxe-column min-width="160" align="center" title="报告创建时间" field="createTime"></vxe-column>

src/views/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -538,7 +538,12 @@
       push (row) {
         // 读取流程表单
         let title = `发起流程[会计-项目报告归档]`
-        let processTitle = `${this.$store.state.user.name} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ${row.reportNo} - ${row.projectName} [会计-项目报告归档]`
+		  let processTitle = ''
+		  if (this.commonJS.isEmpty(row.reportNo)){
+			  processTitle = `${this.$store.state.user.name} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了无报告号 - ${row.projectName} [会计-项目报告归档]`
+		  }else {
+			  processTitle = `${this.$store.state.user.name} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ${row.reportNo} - ${row.projectName} [会计-项目报告归档]`
+		  }
         let status = 'startAndHold'
         if (row.status === '3' || row.status === '4') {
           status = 'startAndClose'
@@ -629,7 +634,12 @@
 				if (!this.commonJS.isEmpty(data.id)) {
 					// console.log('data', data)
 					// 读取流程表单
-					let tabTitle = ' ' + row.reportNo + ' - ' + row.cwProjectRecordsDTO.projectName
+					let tabTitle = ''
+					if(this.commonJS.isEmpty(row.reportNo)){
+						tabTitle = '无报告号报告' + ' - ' + row.cwProjectRecordsDTO.projectName
+					}else {
+						tabTitle = ' ' + row.reportNo + ' - ' + row.cwProjectRecordsDTO.projectName
+					}
 					let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ` + tabTitle + '[会计-报告借用]'
 					taskService.getTaskDef({ procDefId: data.id,
 						businessId: row.id,

src/views/cw/reportManagement/ReportManagementForm.vue

@@ -1275,6 +1275,9 @@
             // this.$refs.uploadComponent.clearUpload()
             this.inputForm = this.recover(this.inputForm, data)
             this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+			  if (data.takeNumberType == '2'){
+			  	this.inputForm.reportNo = '无报告号报告'
+			  }
             // console.log('this.inputForm.cwWorkClientContactDTOList', data.cwWorkClientContactDTOList)
             if (this.commonJS.isEmpty(this.inputForm.createDate)) {
               this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD HH:mm:ss')

src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue

@@ -1436,7 +1436,7 @@
 				console.log("takeNumberTypeChange",this.inputForm.takeNumberType)
 				if(this.inputForm.takeNumberType === '1'){
 					this.reimbursementTypeFlag = true;
-				}else if (this.inputForm.takeNumberType === '0'){
+				}else if (this.inputForm.takeNumberType === '0' || this.inputForm.takeNumberType === '2'){
 					this.reimbursementTypeFlag = false;
 				}
 

src/views/cw/reportManagement/reportReviewNew/ReportReviewFormNew.vue

@@ -908,7 +908,8 @@
 			status2:'',
 			status3:'',
 			approvedIncludingTax:'',
-			approvedNoIncludingTax:''
+			approvedNoIncludingTax:'',
+			takeNumberType:''
         },
         keyWatch: '',
         activeName: 'enclosure',
@@ -1065,7 +1066,8 @@
 			status2:'',
 			status3:'',
 			approvedIncludingTax:'',
-			approvedNoIncludingTax:''
+			approvedNoIncludingTax:'',
+			takeNumberType:'',
         },
         this.inputForm.id = id
         this.loading = false