苏州领跨年报告号

src/views/cw/reportManagement/ReportManagementAddForm.vue

@@ -243,7 +243,7 @@
 			<el-col :span="12" v-if="inputForm.reportType === '1'">
 				<el-form-item label="审定金额(不含税/元)" prop="approvedNoIncludingTax"
 							  :rules="[
-							  	{required: true, message:'审定金额(不含税/元)不能为空', trigger:'change'}
+
                    ]">
 					<el-input v-model="inputForm.approvedNoIncludingTax" placeholder="请填写审定金额（不含税/元）" v-on:input="inputForm.approvedNoIncludingTax=inputForm.approvedNoIncludingTax.replace(/[^\d.]/g,'')
 							  .replace(/^\./g,'')
@@ -255,7 +255,7 @@
 			<el-col :span="12" v-if="inputForm.reportType === '1'">
 				<el-form-item label="审定金额(含税/元)" prop="approvedIncludingTax"
 							  :rules="[
-							  	{required: true, message:'审定金额(不含税/元)不能为空', trigger:'change'}
+
                    ]">
 					<el-input  v-model="inputForm.approvedIncludingTax" placeholder="请填写审定金额（含税/元）" v-on:input="inputForm.approvedIncludingTax=inputForm.approvedIncludingTax.replace(/[^\d.]/g,'')
 							  .replace(/^\./g,'')

src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue

@@ -28,7 +28,7 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
-							<el-form-item label="项目经理1" prop="projectMasterName" :rules="[
+							<el-form-item label="项目经理1111" prop="projectMasterName" :rules="[
 							]">
 								<el-input :disabled="true" v-model="inputForm.projectMasterName" placeholder="请填写项目经理1"
 									clearable></el-input>
@@ -390,6 +390,12 @@
 								</el-date-picker>
 							</el-form-item>
 						</el-col>
+
+						<el-col :span="12">
+							<el-form-item label="报告号类型" prop="crossYearFlag">
+								<el-input :disabled="true" :value="inputForm.crossYearFlag === '1' ? '跨年报告号' : '当年报告号'" placeholder="报告号类型"></el-input>
+							</el-form-item>
+						</el-col>
 						<!--            <el-col :span="12">-->
 						<!--              <el-form-item label="盖章状态" prop="sealType"-->
 						<!--                            :rules="[-->
@@ -621,6 +627,7 @@ export default {
 				approvedNoIncludingTax: '',
 				bankLettersCount: "0",
 				digitalLetterCount: "0",
+				crossYearFlag: '0', // 跨年标识 1:跨年 0:当年
 			},
 			keyWatch: '',
 			activeName: 'enclosure',
@@ -786,6 +793,7 @@ export default {
 				approvedNoIncludingTax: '',
 				bankLettersCount: "0",
 				digitalLetterCount: "0",
+				crossYearFlag: '0', // 跨年标识 1:跨年 0:当年
 			}
 			this.inputForm.id = id
 			this.loading = false
@@ -799,6 +807,14 @@ export default {
 					// this.$refs.uploadComponent.clearUpload()
 					this.inputForm = this.recover(this.inputForm, data)
 					this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
+					// 从路由参数中接收跨年标识
+					if (this.$route.query.crossYearFlag === '1') {
+						this.inputForm.crossYearFlag = '1'
+					} else if (!this.inputForm.crossYearFlag) {
+						// 如果数据库中也没有值，则默认为当年
+						this.inputForm.crossYearFlag = '0'
+					}
+					console.log('crossYearFlag最终值:', this.inputForm.crossYearFlag)
 					if (!this.inputForm.bankLettersCount || this.inputForm.bankLettersCount == "") {
 						this.inputForm.bankLettersCount = "0"
 					}
@@ -1150,7 +1166,30 @@ export default {
 				this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
 				this.inputForm.agreeDate = this.moment(new Date()).format('YYYY-MM-DD')
 				this.inputForm.agreeUserId = this.$store.state.user.id
-				this.inputForm.reviewStatus = '5'
+				// 根据跨年标识和当前审核节点决定reviewStatus的值
+				if (this.inputForm.crossYearFlag === '1') {
+					// 跨年领号：需要判断当前审核节点是否为所长审核
+					console.log('procInsId的值为：',this.$route.query.procInsId)
+					this.commonApi.getTaskNameByProcInsId(this.$route.query.procInsId).then((taskName) => {
+						if (this.commonJS.isNotEmpty(taskName) && taskName === '所长审核') {
+							// 如果是所长审核节点，设置为5（审核通过）
+							this.inputForm.reviewStatus = '5'
+						} else {
+							// 其他节点，设置为2（审核中）
+							this.inputForm.reviewStatus = '2'
+						}
+						// 继续执行后续的保存逻辑
+						this.doAgreeSave(callback)
+					}).catch(() => {
+						// 如果获取任务名称失败，默认为2
+						this.inputForm.reviewStatus = '2'
+						this.doAgreeSave(callback)
+					})
+					return // 提前返回，等待异步完成后再执行保存
+				} else {
+					// 当年领号：直接设置为5
+					this.inputForm.reviewStatus = '5'
+				}
 			} else if (status === 'reapply') {
 				this.inputForm.reviewStatus = '2'
 				this.inputForm.assignee = this.inputForm.reviewBy
@@ -1206,6 +1245,36 @@ export default {
 				}
 			})
 		},
+		// 审核同意的保存逻辑
+		doAgreeSave(callback) {
+			this.$refs['inputForm2'].validate((valid) => {
+				if (valid) {
+					this.loading = true
+					if (this.commonJS.isEmpty(this.inputForm.createDate)) {
+						this.inputForm.createDate = this.moment(new Date()).format('YYYY-MM-DD')
+					}
+					// 列表处理
+					this.inputForm.details = []
+					this.inputForm.detailFor1010.forEach(item => { this.inputForm.details.push(item) })
+					this.inputForm.detailFor1020.forEach(item => { this.inputForm.details.push(item) })
+					this.inputForm.detailFor1030.forEach(item => { this.inputForm.details.push(item) })
+					this.ReportNumberApplyService.save(this.inputForm).then((data) => {
+						this.inputForm.cwFileInfoList3 = this.$refs.enclosure.getDataList()
+						console.log('this.inputForm', this.inputForm)
+						projectReportService.saveForm2(this.inputForm).then((da) => {
+							callback(data.businessTable, data.businessId, this.inputForm)
+							this.loading = false
+						}).catch(() => {
+							this.loading = false
+						})
+					}).catch(() => {
+						this.loading = false
+					})
+				} else {
+					this.loading = false
+				}
+			})
+		},
 		async updateStatusById(type, callback) {
 			this.loading = true
 			console.log('type', type)

src/views/flowable/task/TaskForm.vue

@@ -729,6 +729,7 @@ export default {
 		// Process_1701829547129 会计-复核及签章
 		// Process_1702005929963 完善个人信息
 		// Process_1702369424692 会计-报告号申请
+		// Process_1702369424693 会计-报告号申请
 		// Process_1670486210440 会计-报告号复核
 		// Process_1704851888818 会计-所长报销
 		// Process_1705370333755 会计-所长报销-电子发票
@@ -833,6 +834,7 @@ export default {
 				this.procDefId.includes('Process_1701829547129') ||
 				this.procDefId.includes('Process_1702005929963') ||
 				this.procDefId.includes('Process_1702369424692') ||
+				this.procDefId.includes('Process_1702369424693') ||
 				this.procDefId.includes('Process_1670486210440') ||
 				this.procDefId.includes('Process_1704851888818') ||
 				this.procDefId.includes('Process_1705370333755') ||