报告号领取功能调整

src/api/cw/reportManagement/ReportNumberApplyService.js

@@ -16,6 +16,13 @@ export default class ReportReviewService {
       data: param
     })
   }
+	reviewSave (param) {
+    return request({
+      url: prefix + '/projectReport/numberReviewApply/saveForm',
+      method: 'post',
+      data: param
+    })
+  }
   updateReviewStatysByReportId (data) {
     return request({
       url: prefix + '/projectReport/numberApply/updateReviewStatysByReportId',
@@ -51,4 +58,19 @@ export default class ReportReviewService {
       params: {reportId: id}
     })
   }
+
+queryReviewByReportId (id) {
+	return request({
+		url: prefix + '/projectReport/numberReviewApply/queryByReportId',
+		method: 'get',
+		params: {id: id}
+	})
+}
+updateStatysReviewByReportId (data) {
+	return request({
+		url: prefix + '/projectReport/numberReviewApply/updateReviewStatysByReportId',
+		method: 'post',
+		data: data
+	})
+}
 }

src/views/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -2314,9 +2314,9 @@
 							item.number = data.InvoiceNumber;
 							item.invoiceDate = data.IssueTime;
 							item.invoiceUnit = data.SellerInformationSellerName;
-							item.amount = data.IssuItemInformationAmount;
-							item.taxAmount = data.IssuItemInformationComTaxAm;
-							item.count = data.IssuItemInformationTotaltaxIncludedAmount;
+							item.amount = data.BasicInformationTotalAmWithoutTax;
+							item.taxAmount = data.BasicInformationTotalTaxAm;
+							item.count = data.BasicInformationTotalTaxincludedAmount;
 						}
 					})
 					//列表中未查到相同发票号
@@ -2327,9 +2327,9 @@
 							number: data.InvoiceNumber,
 							invoiceDate: data.IssueTime,
 							invoiceUnit: data.SellerInformationSellerName,
-							amount: data.IssuItemInformationAmount,
-							taxAmount: data.IssuItemInformationComTaxAm,
-							count: data.IssuItemInformationTotaltaxIncludedAmount,
+							amount: data.BasicInformationTotalAmWithoutTax,
+							taxAmount: data.BasicInformationTotalTaxAm,
+							count: data.BasicInformationTotalTaxincludedAmount,
 							remarks: ''
 						}
 						this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)

src/views/cw/reportManagement/ReportReviewTakeNumberForm.vue

@@ -397,7 +397,9 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
-					<el-divider content-position="left"><i class="el-icon-document"></i> 报告审核信息</el-divider>
+					<el-divider content-position="left"><i class="el-icon-document"></i> 报告号申请信息
+						<span style="color: red;font-weight: bold;font-size: 15px">送审底稿至质控部后进行取号</span>
+					</el-divider>
 					<el-row  :gutter="15">
 						<el-col :span="12">
 							<el-form-item label="下一节点审核人" prop="reviewBy"

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

@@ -1230,8 +1230,18 @@
         this.$refs['inputForm2'].validate((valid) => {
           if (valid) {
             this.loading = true
+			  console.log(31231231)
 
 			  this.$refs.archiveFile.getDataList().then((list) => {
+
+				  if(this.inputForm.signatureType === '1'){
+					  if (list.length === 0) {
+						  // 附件至少上传一条
+						  this.$message.error('请上传需要电子签章的文件')
+						  this.loading = false
+						  throw new Error('请上传需要电子签章的文件')
+					  }
+				  }
 				  if (this.commonJS.isNotEmpty(list)) {
 					  list.forEach((item, index) => {
 						  if (this.commonJS.isEmpty(item.fileType)) {

src/views/flowable/task/TaskForm.vue

@@ -468,7 +468,12 @@ export default {
 					if (!this.commonJS.isEmpty(this.$route.query.routePath)) {
 						this.$router.push({path: this.$route.query.routePath})
 					} else {
-						this.$router.push({path: '/flowable/task/TodoList'})
+						this.$router.push({
+							path: '/sys/dashboard/workBench/PendingList',
+							query: {
+								num: 3
+							}
+						})
 					}
 					// this.$router.push({path: this.$route.query.routePath})
 				})
@@ -525,7 +530,12 @@ export default {
 								if (!this.commonJS.isEmpty(this.$route.query.routePath)) {
 									this.$router.push({path: this.$route.query.routePath})
 								} else {
-									this.$router.push({path: '/flowable/task/TodoList'})
+									this.$router.push({
+										path: '/sys/dashboard/workBench/PendingList',
+										query: {
+											num: 3
+										}
+									})
 								}
 								this.cc(data);
 							});
@@ -546,7 +556,12 @@ export default {
 						if (!this.commonJS.isEmpty(this.$route.query.routePath)) {
 							this.$router.push({path: this.$route.query.routePath})
 						} else {
-							this.$router.push({path: '/flowable/task/TodoList'})
+							this.$router.push({
+								path: '/sys/dashboard/workBench/PendingList',
+								query: {
+									num: 3
+								}
+							})
 						}
 						this.cc(data);
 					}
@@ -624,7 +639,12 @@ export default {
 								this.$router.push({path: '/sys/dashboard/workBench/PendingList'})
 								this.cc(data)
 							} else {
-								this.$router.push({path: '/flowable/task/TodoList'})
+								this.$router.push({
+									path: '/sys/dashboard/workBench/PendingList',
+									query: {
+										num: 3
+									}
+								})
 								this.cc(data)
 							}
 						}
@@ -648,7 +668,12 @@ export default {
 							this.$router.push({path: '/sys/dashboard/workBench/PendingList'})
 							this.cc(data)
 						} else {
-							this.$router.push({path: '/flowable/task/TodoList'})
+							this.$router.push({
+								path: '/sys/dashboard/workBench/PendingList',
+								query: {
+									num: 3
+								}
+							})
 							this.cc(data)
 						}
 					}
@@ -712,6 +737,7 @@ export default {
 		// Process_1701829547129 会计-复核及签章
 		// Process_1702005929963 完善个人信息
 		// Process_1702369424692 会计-报告号申请
+		// Process_1670486210440 会计-报告号复核
 
 		// 驳回
 		reject(vars) {
@@ -771,7 +797,8 @@ export default {
 				this.procDefId.includes('Process_1698129477831') ||
 				this.procDefId.includes('Process_1701829547129') ||
 				this.procDefId.includes('Process_1702005929963') ||
-				this.procDefId.includes('Process_1702369424692')
+				this.procDefId.includes('Process_1702369424692') ||
+				this.procDefId.includes('Process_1670486210440')
 			) {
 				console.log('进入新版驳回')
 				this.$confirm(`确定驳回流程吗?`, '提示', {
@@ -821,7 +848,12 @@ export default {
 										this.$router.push({path: '/home'})
 										this.cc(data)
 									} else {
-										this.$router.push({path: '/flowable/task/TodoList'})
+										this.$router.push({
+											path: '/sys/dashboard/workBench/PendingList',
+											query: {
+												num: 3
+											}
+										})
 										this.cc(data)
 									}
 								}
@@ -962,7 +994,12 @@ export default {
 									this.$router.push({path: '/home'})
 									this.cc(data)
 								} else {
-									this.$router.push({path: '/flowable/task/TodoList'})
+									this.$router.push({
+										path: '/sys/dashboard/workBench/PendingList',
+										query: {
+											num: 3
+										}
+									})
 									this.cc(data)
 								}
 							}
@@ -1010,7 +1047,12 @@ export default {
 						if (!this.commonJS.isEmpty(this.$route.query.routePath)) {
 							this.$router.push({path: this.$route.query.routePath})
 						} else {
-							this.$router.push({path: '/flowable/task/TodoList'})
+							this.$router.push({
+								path: '/sys/dashboard/workBench/PendingList',
+								query: {
+									num: 3
+								}
+							})
 						}
 					}
 					// this.$refs.form.close()
@@ -1039,7 +1081,12 @@ export default {
 					} else if (num === '3') {
 						this.$router.push({path: '/sys/dashboard/workBench/PendingList'})
 					} else {
-						this.$router.push({path: '/flowable/task/TodoList'})
+						this.$router.push({
+							path: '/sys/dashboard/workBench/PendingList',
+							query: {
+								num: 3
+							}
+						})
 					}
 					this.cc(data);
 				});
@@ -1074,7 +1121,12 @@ export default {
 		selectUsersToTransferTask(user) {
 			taskService.transfer(this.taskId, user[0].id).then((data) => {
 				this.$message.success(data);
-				this.$router.push({path: '/flowable/task/TodoList'});
+				this.$router.push({
+					path: '/sys/dashboard/workBench/PendingList',
+					query: {
+						num: 3
+					}
+				})
 			});
 		},
 		// 委托
@@ -1084,7 +1136,12 @@ export default {
 		selectUsersToDelateTask(user) {
 			taskService.delegate(this.taskId, user[0].id).then((data) => {
 				this.$message.success(data);
-				this.$router.push({path: '/flowable/task/TodoList'});
+				this.$router.push({
+					path: '/sys/dashboard/workBench/PendingList',
+					query: {
+						num: 3
+					}
+				})
 			});
 		},
 		// 终止
@@ -1112,7 +1169,12 @@ export default {
 								this.$router.push({path: '/sys/dashboard/workBench/PendingList'})
 								this.cc(data)
 							} else {
-								this.$router.push({path: '/flowable/task/TodoList'})
+								this.$router.push({
+									path: '/sys/dashboard/workBench/PendingList',
+									query: {
+										num: 3
+									}
+								})
 								this.cc(data)
 							}
 						}
@@ -1127,7 +1189,12 @@ export default {
 			if (!this.commonJS.isEmpty(this.$route.query.routePath)) {
 				this.$router.push({path: this.$route.query.routePath})
 			} else {
-				this.$router.push({path: '/flowable/task/TodoList'})
+				this.$router.push({
+					path: '/sys/dashboard/workBench/PendingList',
+					query: {
+						num: 3
+					}
+				})
 			}
 		},
 		// 自定义按钮提交
@@ -1203,7 +1270,12 @@ export default {
 										this.$router.push({path: '/home'})
 										this.cc(data)
 									} else {
-										this.$router.push({path: '/flowable/task/TodoList'})
+										this.$router.push({
+											path: '/sys/dashboard/workBench/PendingList',
+											query: {
+												num: 3
+											}
+										})
 										this.cc(data)
 									}
 								}
@@ -1234,7 +1306,12 @@ export default {
 								this.$router.push({path: '/sys/dashboard/workBench/PendingList'})
 								this.cc(data)
 							} else {
-								this.$router.push({path: '/flowable/task/TodoList'})
+								this.$router.push({
+									path: '/sys/dashboard/workBench/PendingList',
+									query: {
+										num: 3
+									}
+								})
 								this.cc(data)
 							}
 						}

src/views/flowable/task/TaskFormEdit.vue

@@ -333,7 +333,12 @@ export default {
 							.then((data) => {
 								this.$message.success("启动成功");
 								useTabs.close();
-								this.$router.push("/flowable/task/TodoList");
+								this.$router.push({
+									path: '/sys/dashboard/workBench/PendingList',
+									query: {
+										num: 3
+									}
+								})
 								this.cc(data);
 							});
 					}
@@ -349,7 +354,12 @@ export default {
 					},
 					(data) => {
 						useTabs.close();
-						this.$router.push("/flowable/task/TodoList");
+						this.$router.push({
+							path: '/sys/dashboard/workBench/PendingList',
+							query: {
+								num: 3
+							}
+						})
 						this.cc(data);
 					}
 				);
@@ -391,7 +401,12 @@ export default {
 				.then((data) => {
 					this.$message.success("回退成功");
 					useTabs.close();
-					this.$router.push("/flowable/task/TodoList");
+					this.$router.push({
+						path: '/sys/dashboard/workBench/PendingList',
+						query: {
+							num: 3
+						}
+					})
 					this.cc(data);
 				});
 		},
@@ -425,7 +440,12 @@ export default {
 		selectUsersToTransferTask(user) {
 			taskService.transfer(this.taskId, user[0].id).then((data) => {
 				this.$message.success(data);
-				this.$router.push("/flowable/task/TodoList");
+				this.$router.push({
+					path: '/sys/dashboard/workBench/PendingList',
+					query: {
+						num: 3
+					}
+				})
 			});
 		},
 		// 委托
@@ -435,7 +455,12 @@ export default {
 		selectUsersToDelateTask(user) {
 			taskService.delegate(this.taskId, user[0].id).then((data) => {
 				this.$message.success(data);
-				this.$router.push("/flowable/task/TodoList");
+				this.$router.push({
+					path: '/sys/dashboard/workBench/PendingList',
+					query: {
+						num: 3
+					}
+				})
 			});
 		},
 		// 终止
@@ -449,7 +474,12 @@ export default {
 					.stop(this.procInsId, this.auditForm.message)
 					.then((data) => {
 						this.$message.success(data);
-						this.$router.push("/flowable/task/TodoList");
+						this.$router.push({
+							path: '/sys/dashboard/workBench/PendingList',
+							query: {
+								num: 3
+							}
+						})
 					});
 			});
 		},
@@ -474,7 +504,12 @@ export default {
 							.then((data) => {
 								this.$message.success("提交成功");
 								useTabs.close();
-								this.$router.push("/flowable/task/TodoList");
+								this.$router.push({
+									path: '/sys/dashboard/workBench/PendingList',
+									query: {
+										num: 3
+									}
+								})
 								this.cc(data);
 							});
 					}
@@ -489,7 +524,12 @@ export default {
 					this.auditForm,
 					(data) => {
 						useTabs.close();
-						this.$router.push("/flowable/task/TodoList");
+						this.$router.push({
+							path: '/sys/dashboard/workBench/PendingList',
+							query: {
+								num: 3
+							}
+						})
 						this.cc(data);
 					}
 				);

src/views/reimbursement/info/ReimbursementForm.vue

@@ -2141,9 +2141,9 @@
 									item.number = data.InvoiceNumber;
 									item.invoiceDate = data.IssueTime;
 									item.invoiceUnit = data.SellerInformationSellerName;
-									item.amount = data.IssuItemInformationAmount;
-									item.taxAmount = data.IssuItemInformationComTaxAm;
-									item.count = data.IssuItemInformationTotaltaxIncludedAmount;
+									item.amount = data.BasicInformationTotalAmWithoutTax;
+									item.taxAmount = data.BasicInformationTotalTaxAm;
+									item.count = data.BasicInformationTotalTaxincludedAmount;
 								}
 							})
 							//列表中未查到相同发票号
@@ -2154,9 +2154,9 @@
 									number: data.InvoiceNumber,
 									invoiceDate: data.IssueTime,
 									invoiceUnit: data.SellerInformationSellerName,
-									amount: data.IssuItemInformationAmount,
-									taxAmount: data.IssuItemInformationComTaxAm,
-									count: data.IssuItemInformationTotaltaxIncludedAmount,
+									amount: data.BasicInformationTotalAmWithoutTax,
+									taxAmount: data.BasicInformationTotalTaxAm,
+									count: data.BasicInformationTotalTaxincludedAmount,
 									remarks: ''
 								}
 								this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)

src/views/sys/cert/CertForm.vue

@@ -147,13 +147,14 @@
 						  <el-upload slot="reference"
 									 class="avatar"
 									 style="height: 43px;line-height: 43px"
-									 :action="`${$http.BASE_URL}/oss/file/webUpload/fileUpload?dir=sys_cert`"
+									 :action="`${$http.BASE_URL}/public-modules-server/oss/file/webUpload/fileUpload?dir=sys_cert`"
 									 :on-success="(res,file)=> handleAvatarSuccess(res,file,scope)"
 									 :before-upload="beforeAvatarUpload"
 									 :show-file-list="false">
 							  <el-button type="info" slot="trigger" style="margin-right: 10px" class="avatar-uploader-table">上传</el-button>
 							  <img style="max-height: 43px;max-width: 56px" slot="tip" :readonly="true" @click="showPhoto(scope.row.fileLsUrl)" v-if="scope.row.fileLsUrl" :src="scope.row.fileLsUrl" class="el-upload-list__item-thumbnail">
 						  </el-upload>
+
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column title="操作" width="100">
@@ -308,31 +309,62 @@ export default {
           this.loading = true
 			console.log('this.inputForm.certDTOList', this.inputForm.certDTOList)
           this.inputForm.certDTOList.forEach((item, index) => {
-			  this.testList.push(item.row)
+          	if(item.row){
+				this.testList.push(item.row)
+			}else{
+				this.testList.push(item)
+			}
           	console.log('item',item.type)
-            if (this.commonJS.isEmpty(item.row.type)) {
-              this.$message.error('执业资格证书中第' + (index + 1) + '条数据的“证书类型”未填写')
-              this.loading = false
-              throw new Error()
-            }
-            if (this.commonJS.isEmpty(item.row.no)) {
-              this.$message.error('执业资格证书中第' + (index + 1) + '条数据的“证书编号”未填写')
-              this.loading = false
-              throw new Error()
-            }
-            if (this.commonJS.isNotEmpty(item.row.issuedDate)) {
-              item.issuedDate = this.moment(item.row.issuedDate).format('YYYY-MM-DD')
-            }
-            if (this.commonJS.isNotEmpty(item.row.enrollDate)) {
-              item.enrollDate = this.moment(item.row.enrollDate).format('YYYY-MM-DD')
-            }
-            if (this.commonJS.isNotEmpty(item.row.expireDate)) {
-              item.expireDate = this.moment(item.row.expireDate).format('YYYY-MM-DD')
-            } else {
-              this.$message.error('执业资格证书中第' + (index + 1) + '条数据的“到期日期”未填写')
-              this.loading = false
-              throw new Error()
-            }
+			  if(item.row){
+			  	if (this.commonJS.isEmpty(item.row.type)) {
+				  this.$message.error('执业资格证书中第' + (index + 1) + '条数据的“证书类型”未填写')
+				  this.loading = false
+				  throw new Error()
+			  }
+				  if (this.commonJS.isEmpty(item.row.no)) {
+					  this.$message.error('执业资格证书中第' + (index + 1) + '条数据的“证书编号”未填写')
+					  this.loading = false
+					  throw new Error()
+				  }
+				  if (this.commonJS.isNotEmpty(item.row.issuedDate)) {
+					  item.issuedDate = this.moment(item.row.issuedDate).format('YYYY-MM-DD')
+				  }
+				  if (this.commonJS.isNotEmpty(item.row.enrollDate)) {
+					  item.enrollDate = this.moment(item.row.enrollDate).format('YYYY-MM-DD')
+				  }
+				  if (this.commonJS.isNotEmpty(item.row.expireDate)) {
+					  item.expireDate = this.moment(item.row.expireDate).format('YYYY-MM-DD')
+				  } else {
+					  this.$message.error('执业资格证书中第' + (index + 1) + '条数据的“到期日期”未填写')
+					  this.loading = false
+					  throw new Error()
+				  }
+			  }else{
+				  if (this.commonJS.isEmpty(item.type)) {
+					  this.$message.error('执业资格证书中第' + (index + 1) + '条数据的“证书类型”未填写')
+					  this.loading = false
+					  throw new Error()
+				  }
+				  if (this.commonJS.isEmpty(item.no)) {
+					  this.$message.error('执业资格证书中第' + (index + 1) + '条数据的“证书编号”未填写')
+					  this.loading = false
+					  throw new Error()
+				  }
+				  if (this.commonJS.isNotEmpty(item.issuedDate)) {
+					  item.issuedDate = this.moment(item.issuedDate).format('YYYY-MM-DD')
+				  }
+				  if (this.commonJS.isNotEmpty(item.enrollDate)) {
+					  item.enrollDate = this.moment(item.enrollDate).format('YYYY-MM-DD')
+				  }
+				  if (this.commonJS.isNotEmpty(item.expireDate)) {
+					  item.expireDate = this.moment(item.expireDate).format('YYYY-MM-DD')
+				  } else {
+					  this.$message.error('执业资格证书中第' + (index + 1) + '条数据的“到期日期”未填写')
+					  this.loading = false
+					  throw new Error()
+				  }
+			  }
+
           })
 			console.log('this.testList', this.testList)
 			this.inputForm.certDTOList = this.testList

src/views/zs/reimbursement/info/ReimbursementForm.vue

@@ -1996,9 +1996,9 @@
 							item.number = data.InvoiceNumber;
 							item.invoiceDate = data.IssueTime;
 							item.invoiceUnit = data.SellerInformationSellerName;
-							item.amount = data.IssuItemInformationAmount;
-							item.taxAmount = data.IssuItemInformationComTaxAm;
-							item.count = data.IssuItemInformationTotaltaxIncludedAmount;
+							item.amount = data.BasicInformationTotalAmWithoutTax;
+							item.taxAmount = data.BasicInformationTotalTaxAm;
+							item.count = data.BasicInformationTotalTaxincludedAmount;
 						}
 					})
 					//列表中未查到相同发票号
@@ -2009,9 +2009,9 @@
 							number: data.InvoiceNumber,
 							invoiceDate: data.IssueTime,
 							invoiceUnit: data.SellerInformationSellerName,
-							amount: data.IssuItemInformationAmount,
-							taxAmount: data.IssuItemInformationComTaxAm,
-							count: data.IssuItemInformationTotaltaxIncludedAmount,
+							amount: data.BasicInformationTotalAmWithoutTax,
+							taxAmount: data.BasicInformationTotalTaxAm,
+							count: data.BasicInformationTotalTaxincludedAmount,
 							remarks: ''
 						}
 						this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)