Merge remote-tracking branch 'origin/master'

src/api/ccpm/reimbursement/ReimbursementService.js

@@ -88,6 +88,13 @@ export default class ReimbursementService {
 		params: {invoiceNumber: invoiceNumber,id:id}
 	})
   }
+	deleteByIdAndNumber (id,invoiceNumber) {
+		return request({
+			url: prefix + '/ccpmReimbursement/info/deleteByIdAndNumber',
+			method: 'post',
+			params: {id:id,invoiceNumber: invoiceNumber}
+		})
+	}
 	findHistory (id) {
 		return request({
 			url: prefix + '/ccpmReimbursement/info/findHistory',

src/api/consultancy/reimbursement/ReimbursementService.js

@@ -88,6 +88,13 @@ export default class ReimbursementService {
 		params: {invoiceNumber: invoiceNumber,id:id}
 	})
   }
+	deleteByIdAndNumber (id,invoiceNumber) {
+		return request({
+			url: prefix + '/consultancyReimbursement/info/deleteByIdAndNumber',
+			method: 'post',
+			params: {id:id,invoiceNumber: invoiceNumber}
+		})
+	}
 	findHistory (id) {
 		return request({
 			url: prefix + '/consultancyReimbursement/info/findHistory',

src/api/cw/reimbursementApproval/ReimbursementApprovalService.js

@@ -120,6 +120,13 @@ export default class ReimbursementApprovalService {
 		params: {invoiceNumber: invoiceNumber,id:id}
 	})
   }
+	deleteByIdAndNumber (id,invoiceNumber) {
+	return request({
+		url: prefix + '/reimbursementApproval/info/deleteByIdAndNumber',
+		method: 'post',
+		params: {id:id,invoiceNumber: invoiceNumber}
+	})
+  }
 	findHistory (id) {
 		return request({
 			url: prefix + '/reimbursementApproval/info/findHistory',

src/api/sys/ReimbursementService.js

@@ -95,6 +95,13 @@ export default class ReimbursementService {
 			params: {invoiceNumber: invoiceNumber,id:id}
 		})
 	}
+	deleteByIdAndNumber (id,invoiceNumber) {
+		return request({
+			url: prefix + '/reimbursement/info/deleteByIdAndNumber',
+			method: 'post',
+			params: {id:id,invoiceNumber: invoiceNumber}
+		})
+	}
 	findHistory (id) {
 		return request({
 			url: prefix + '/reimbursement/info/findHistory',

src/api/zs/reimbursement/ReimbursementService.js

@@ -81,6 +81,13 @@ export default class ReimbursementService {
 			responseType: 'blob'
 		})
 	}
+	deleteByIdAndNumber (id,invoiceNumber) {
+		return request({
+			url: prefix + '/zsReimbursement/info/deleteByIdAndNumber',
+			method: 'post',
+			params: {id:id,invoiceNumber: invoiceNumber}
+		})
+	}
   getEffectiveDataByInvoiceNumber (invoiceNumber,id) {
 	return request({
 		url: prefix + '/zsReimbursement/info/getEffectiveDataByInvoiceNumber',

src/views/ccpm/reimbursement/info/InfoUpdateForm.vue

@@ -622,6 +622,11 @@
 									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+								<template #edit="scope">
+									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 								<template #edit="scope">
 									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -780,6 +785,9 @@
 					invoiceUnit: [
 						{required: true, message: '开票单位不能为空'}
 					],
+					buyerName: [
+						{required: true, message: '购买方名称不能为空'}
+					],
 					amount: [
 						{required: true, message: '金额不能为空'}
 					],
@@ -1115,10 +1123,10 @@
 							this.loading = false
 							throw new Error('电子发票信息 第' + k + '行请填写发票单位')
 						}
-						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-							this.$message.error('电子发票信息 第' + k + '行请填写发票单位')
+						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+							this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 							this.loading = false
-							throw new Error('电子发票信息 第' + k + '行请填写发票单位')
+							throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 							this.$message.error('电子发票信息 第' + k + '行请填写金额')
@@ -2149,6 +2157,7 @@
 								item.amount = data.BasicInformationTotalAmWithoutTax;
 								item.taxAmount = data.BasicInformationTotalTaxAm;
 								item.count = data.BasicInformationTotalTaxincludedAmount;
+								item.buyerName = data.BuyerInformationBuyerName;
 							}
 						})
 						//列表中未查到相同发票号
@@ -2162,6 +2171,7 @@
 								amount: data.BasicInformationTotalAmWithoutTax,
 								taxAmount: data.BasicInformationTotalTaxAm,
 								count: data.BasicInformationTotalTaxincludedAmount,
+								buyerName: data.BuyerInformationBuyerName,
 								remarks: ''
 							}
 							this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)

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

@@ -611,6 +611,11 @@
 								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 							</template>
 						</vxe-table-column>
+						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+							<template #edit="scope">
+								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+							</template>
+						</vxe-table-column>
 						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 							<template #edit="scope">
 								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -760,6 +765,9 @@
 				invoiceUnit: [
 				{required: true, message: '开票单位不能为空'}
 			],
+			buyerName: [
+				{required: true, message: '购买方名称不能为空'}
+			],
 				amount: [
 				{required: true, message: '金额不能为空'}
 			],
@@ -1101,10 +1109,10 @@
 						this.loading = false
 						throw new Error('电子发票信息 第' + k + '行请填写发票单位')
 					}
-					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-						this.$message.error('电子发票信息 第' + k + '行请填写发票单位')
+					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+						this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 						this.loading = false
-						throw new Error('电子发票信息 第' + k + '行请填写发票单位')
+						throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 						this.$message.error('电子发票信息 第' + k + '行请填写金额')
@@ -2163,6 +2171,7 @@
 							item.amount = data.BasicInformationTotalAmWithoutTax;
 							item.taxAmount = data.BasicInformationTotalTaxAm;
 							item.count = data.BasicInformationTotalTaxincludedAmount;
+							item.buyerName = data.BuyerInformationBuyerName;
 						}
 					})
 					//列表中未查到相同发票号
@@ -2176,6 +2185,7 @@
 							amount: data.BasicInformationTotalAmWithoutTax,
 							taxAmount: data.BasicInformationTotalTaxAm,
 							count: data.BasicInformationTotalTaxincludedAmount,
+							buyerName: data.BuyerInformationBuyerName,
 							remarks: ''
 						}
 						this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)
@@ -2216,6 +2226,14 @@
 					this.removeEvent(item,i,'invoiceReimbursement')
 				}
 			}
+			if(this.inputForm.id && item.number){
+				//根据电子发票号和报销表id去删除数据库中存在的数据
+				this.reimbursementService.deleteByIdAndNumber(this.inputForm.id,data.InvoiceNumber).then((data) => {
+					if(!data.success){
+						this.$message.error(data.message)
+					}
+				})
+			}
 
 		}
     }

src/views/common/InvoiceReimbursementUpLoadComponent.vue

@@ -452,6 +452,7 @@
         toHref(row)
       },
       async deleteById (row, index,fileList) {
+      	console.log("dasfgasdas")
 	  	// this.$refs.upload.handleRemove(this.dataListNew[index])
         await this.dataListNew.splice(index, 1)
 		await this.dataList.splice(index, 1)

src/views/consultancy/reimbursement/info/InfoUpdateForm.vue

@@ -616,6 +616,11 @@
 								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 							</template>
 						</vxe-table-column>
+						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+							<template #edit="scope">
+								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+							</template>
+						</vxe-table-column>
 						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 							<template #edit="scope">
 								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -774,6 +779,9 @@
 				invoiceUnit: [
 				{required: true, message: '开票单位不能为空'}
 			],
+			buyerName: [
+				{required: true, message: '购买方名称不能为空'}
+			],
 				amount: [
 				{required: true, message: '金额不能为空'}
 			],
@@ -1098,10 +1106,10 @@
 						this.loading = false
 						throw new Error('电子发票信息 第' + k + '行请填写发票单位')
 					}
-					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-						this.$message.error('电子发票信息 第' + k + '行请填写发票单位')
+					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+						this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 						this.loading = false
-						throw new Error('电子发票信息 第' + k + '行请填写发票单位')
+						throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 						this.$message.error('电子发票信息 第' + k + '行请填写金额')
@@ -2112,6 +2120,7 @@
 							item.amount = data.BasicInformationTotalAmWithoutTax;
 							item.taxAmount = data.BasicInformationTotalTaxAm;
 							item.count = data.BasicInformationTotalTaxincludedAmount;
+							item.buyerName = data.BuyerInformationBuyerName;
 						}
 					})
 					//列表中未查到相同发票号
@@ -2125,6 +2134,7 @@
 							amount: data.BasicInformationTotalAmWithoutTax,
 							taxAmount: data.BasicInformationTotalTaxAm,
 							count: data.BasicInformationTotalTaxincludedAmount,
+							buyerName: data.BuyerInformationBuyerName,
 							remarks: ''
 						}
 						this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)

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

@@ -612,6 +612,11 @@
 								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 							</template>
 						</vxe-table-column>
+						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+							<template #edit="scope">
+								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+							</template>
+						</vxe-table-column>
 						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 							<template #edit="scope">
 								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -761,6 +766,9 @@
 				invoiceUnit: [
 				{required: true, message: '开票单位不能为空'}
 			],
+			buyerName: [
+				{required: true, message: '购买方名称不能为空'}
+			],
 				amount: [
 				{required: true, message: '金额不能为空'}
 			],
@@ -1089,10 +1097,10 @@
 						this.loading = false
 						throw new Error('电子发票信息 第' + k + '行请填写发票单位')
 					}
-					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-						this.$message.error('电子发票信息 第' + k + '行请填写发票单位')
+					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+						this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 						this.loading = false
-						throw new Error('电子发票信息 第' + k + '行请填写发票单位')
+						throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 						this.$message.error('电子发票信息 第' + k + '行请填写金额')
@@ -2104,6 +2112,7 @@
 							item.amount = data.BasicInformationTotalAmWithoutTax;
 							item.taxAmount = data.BasicInformationTotalTaxAm;
 							item.count = data.BasicInformationTotalTaxincludedAmount;
+							item.buyerName = data.BuyerInformationBuyerName;
 						}
 					})
 					//列表中未查到相同发票号
@@ -2117,6 +2126,7 @@
 							amount: data.BasicInformationTotalAmWithoutTax,
 							taxAmount: data.BasicInformationTotalTaxAm,
 							count: data.BasicInformationTotalTaxincludedAmount,
+							buyerName: data.BuyerInformationBuyerName,
 							remarks: ''
 						}
 						this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)
@@ -2157,6 +2167,14 @@
 					this.removeEvent(item,i,'invoiceReimbursement')
 				}
 			}
+			if(this.inputForm.id && item.number){
+				//根据电子发票号和报销表id去删除数据库中存在的数据
+				this.reimbursementService.deleteByIdAndNumber(this.inputForm.id,data.InvoiceNumber).then((data) => {
+					if(!data.success){
+						this.$message.error(data.message)
+					}
+				})
+			}
 
 		}
     }

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

@@ -728,6 +728,11 @@
 									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+								<template #edit="scope">
+									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 								<template #edit="scope">
 									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -894,6 +899,9 @@
 					invoiceUnit: [
 						{required: true, message: '开票单位不能为空'}
 					],
+					buyerName: [
+						{required: true, message: '购买方名称不能为空'}
+					],
 					amount: [
 						{required: true, message: '金额不能为空'}
 					],
@@ -1237,10 +1245,10 @@
 							this.loading = false
 							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
 						}
-						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-							this.$message.error('数电发票信息 第' + k + '行请填写发票单位')
+						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+							this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 							this.loading = false
-							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
+							throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 							this.$message.error('数电发票信息 第' + k + '行请填写金额')
@@ -2440,6 +2448,7 @@
 								item.amount = data.BasicInformationTotalAmWithoutTax;
 								item.taxAmount = data.BasicInformationTotalTaxAm;
 								item.count = data.BasicInformationTotalTaxincludedAmount;
+								item.buyerName = data.BuyerInformationBuyerName;
 							}
 						})
 						//列表中未查到相同发票号
@@ -2453,6 +2462,7 @@
 								amount: data.BasicInformationTotalAmWithoutTax,
 								taxAmount: data.BasicInformationTotalTaxAm,
 								count: data.BasicInformationTotalTaxincludedAmount,
+								buyerName: data.BuyerInformationBuyerName,
 								remarks: ''
 							}
 							this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)

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

@@ -723,6 +723,11 @@
 									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+								<template #edit="scope">
+									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 								<template #edit="scope">
 									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -880,6 +885,9 @@
 					invoiceUnit: [
 						{required: true, message: '开票单位不能为空'}
 					],
+					buyerName: [
+						{required: true, message: '购买方名称不能为空'}
+					],
 					amount: [
 						{required: true, message: '金额不能为空'}
 					],
@@ -1230,10 +1238,10 @@
 							this.loading = false
 							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
 						}
-						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-							this.$message.error('数电发票信息 第' + k + '行请填写发票单位')
+						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+							this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 							this.loading = false
-							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
+							throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 							this.$message.error('数电发票信息 第' + k + '行请填写金额')
@@ -2435,6 +2443,7 @@
 								item.amount = data.BasicInformationTotalAmWithoutTax;
 								item.taxAmount = data.BasicInformationTotalTaxAm;
 								item.count = data.BasicInformationTotalTaxincludedAmount;
+								item.buyerName = data.BuyerInformationBuyerName;
 							}
 						})
 						//列表中未查到相同发票号
@@ -2448,6 +2457,7 @@
 								amount: data.BasicInformationTotalAmWithoutTax,
 								taxAmount: data.BasicInformationTotalTaxAm,
 								count: data.BasicInformationTotalTaxincludedAmount,
+								buyerName: data.BuyerInformationBuyerName,
 								remarks: ''
 							}
 							this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)
@@ -2486,6 +2496,14 @@
 				if(item.number === data.InvoiceNumber) {
 					this.removeEvent(item,i,'invoiceReimbursement')
 				}
+				if(this.inputForm.id && item.number){
+					//根据电子发票号和报销表id去删除数据库中存在的数据
+					this.reimbursementApprovalService.deleteByIdAndNumber(this.inputForm.id,data.InvoiceNumber).then((data) => {
+						if(!data.success){
+							this.$message.error(data.message)
+						}
+					})
+				}
 			}
 
 			},

src/views/cw/reportManagement/ReportManagementList.vue

@@ -426,7 +426,7 @@
                                   (scope.row.signatureType === '1' && scope.row.status1 === '5') ||
                                   (scope.row.signatureType === '2' && scope.row.status2 === '5') ||
                                   (scope.row.signatureType === '3' && scope.row.status3 === '5'))
-                                   && scope.row.newType !== '0' && scope.row.reviewStatus === '5'  && scope.row.repetitionReviewFlag === false && (scope.row.rebackStatus === '5' ||scope.row.rebackStatus === '3' ||scope.row.rebackStatus === '1' ||scope.row.rebackStatus === '0' || scope.row.rebackStatus === null || scope.row.rebackStatus === '' || scope.row.rebackStatus === undefined))"
+                                   && scope.row.newType !== '0' && scope.row.reviewStatus === '5'  && scope.row.createById === $store.state.user.id&& scope.row.repetitionReviewFlag === false && (scope.row.rebackStatus === '5' ||scope.row.rebackStatus === '3' ||scope.row.rebackStatus === '1' ||scope.row.rebackStatus === '0' || scope.row.rebackStatus === null || scope.row.rebackStatus === '' || scope.row.rebackStatus === undefined))"
 							 text type="primary" @click="revocationEdit(scope.row)">撤回签章</el-button>
 				  <!--              审核-->
 				  <el-button v-if="scope.row.rebackStatus==='2' && checkIsAuditReview(scope.row)" text type="primary" @click="examineRevocation(scope.row)">审核</el-button>

src/views/cw/szfbReimbursementApproval/info/InfoUpdateForm.vue

@@ -728,6 +728,11 @@
 									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+								<template #edit="scope">
+									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 								<template #edit="scope">
 									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -894,6 +899,9 @@
 					invoiceUnit: [
 						{required: true, message: '开票单位不能为空'}
 					],
+					buyerName: [
+						{required: true, message: '购买方名称不能为空'}
+					],
 					amount: [
 						{required: true, message: '金额不能为空'}
 					],
@@ -1237,10 +1245,10 @@
 							this.loading = false
 							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
 						}
-						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-							this.$message.error('数电发票信息 第' + k + '行请填写发票单位')
+						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+							this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 							this.loading = false
-							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
+							throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 							this.$message.error('数电发票信息 第' + k + '行请填写金额')
@@ -2440,6 +2448,7 @@
 								item.amount = data.BasicInformationTotalAmWithoutTax;
 								item.taxAmount = data.BasicInformationTotalTaxAm;
 								item.count = data.BasicInformationTotalTaxincludedAmount;
+								item.buyerName = data.BuyerInformationBuyerName;
 							}
 						})
 						//列表中未查到相同发票号
@@ -2453,6 +2462,7 @@
 								amount: data.BasicInformationTotalAmWithoutTax,
 								taxAmount: data.BasicInformationTotalTaxAm,
 								count: data.BasicInformationTotalTaxincludedAmount,
+								buyerName: data.BuyerInformationBuyerName,
 								remarks: ''
 							}
 							this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)

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

@@ -717,6 +717,11 @@
 									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+								<template #edit="scope">
+									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 								<template #edit="scope">
 									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -874,6 +879,9 @@
 					invoiceUnit: [
 						{required: true, message: '开票单位不能为空'}
 					],
+					buyerName: [
+						{required: true, message: '购买方名称不能为空'}
+					],
 					amount: [
 						{required: true, message: '金额不能为空'}
 					],
@@ -1199,10 +1207,10 @@
 							this.loading = false
 							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
 						}
-						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-							this.$message.error('数电发票信息 第' + k + '行请填写发票单位')
+						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+							this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 							this.loading = false
-							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
+							throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 							this.$message.error('数电发票信息 第' + k + '行请填写金额')
@@ -2328,6 +2336,7 @@
 								item.amount = data.BasicInformationTotalAmWithoutTax;
 								item.taxAmount = data.BasicInformationTotalTaxAm;
 								item.count = data.BasicInformationTotalTaxincludedAmount;
+								item.buyerName = data.BuyerInformationBuyerName;
 							}
 						})
 						//列表中未查到相同发票号
@@ -2341,6 +2350,7 @@
 								amount: data.BasicInformationTotalAmWithoutTax,
 								taxAmount: data.BasicInformationTotalTaxAm,
 								count: data.BasicInformationTotalTaxincludedAmount,
+								buyerName: data.BuyerInformationBuyerName,
 								remarks: ''
 							}
 							this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)
@@ -2379,6 +2389,14 @@
 				if(item.number === data.InvoiceNumber) {
 					this.removeEvent(item,i,'invoiceReimbursement')
 				}
+				if(this.inputForm.id && item.number){
+					//根据电子发票号和报销表id去删除数据库中存在的数据
+					this.reimbursementApprovalService.deleteByIdAndNumber(this.inputForm.id,data.InvoiceNumber).then((data) => {
+						if(!data.success){
+							this.$message.error(data.message)
+						}
+					})
+				}
 			}
 
 			},

src/views/reimbursement/info/InfoUpdateForm.vue

@@ -698,6 +698,11 @@
 									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+								<template #edit="scope">
+									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 								<template #edit="scope">
 									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -848,6 +853,9 @@
 					invoiceUnit: [
 						{required: true, message: '开票单位不能为空'}
 					],
+					buyerName: [
+						{required: true, message: '购买方名称不能为空'}
+					],
 					amount: [
 						{required: true, message: '金额不能为空'}
 					],
@@ -1196,10 +1204,10 @@
 							this.loading = false
 							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
 						}
-						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-							this.$message.error('数电发票信息 第' + k + '行请填写发票单位')
+						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+							this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 							this.loading = false
-							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
+							throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 							this.$message.error('数电发票信息 第' + k + '行请填写金额')
@@ -2242,6 +2250,7 @@
 								item.amount = data.BasicInformationTotalAmWithoutTax;
 								item.taxAmount = data.BasicInformationTotalTaxAm;
 								item.count = data.BasicInformationTotalTaxincludedAmount;
+								item.buyerName = data.BuyerInformationBuyerName;
 							}
 						})
 						//列表中未查到相同发票号
@@ -2255,6 +2264,7 @@
 								amount: data.BasicInformationTotalAmWithoutTax,
 								taxAmount: data.BasicInformationTotalTaxAm,
 								count: data.BasicInformationTotalTaxincludedAmount,
+								buyerName: data.BuyerInformationBuyerName,
 								remarks: ''
 							}
 							this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)

src/views/reimbursement/info/ReimbursementForm.vue

@@ -687,6 +687,11 @@
 									<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 								</template>
 							</vxe-table-column>
+							<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+								<template #edit="scope">
+									<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+								</template>
+							</vxe-table-column>
 							<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 								<template #edit="scope">
 									<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -828,6 +833,9 @@
 					invoiceUnit: [
 						{required: true, message: '开票单位不能为空'}
 					],
+					buyerName: [
+						{required: true, message: '购买方名称不能为空'}
+					],
 					amount: [
 						{required: true, message: '金额不能为空'}
 					],
@@ -1178,10 +1186,10 @@
 							this.loading = false
 							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
 						}
-						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-							this.$message.error('数电发票信息 第' + k + '行请填写发票单位')
+						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+							this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 							this.loading = false
-							throw new Error('数电发票信息 第' + k + '行请填写发票单位')
+							throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 						}
 						if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 							this.$message.error('数电发票信息 第' + k + '行请填写金额')
@@ -2225,6 +2233,7 @@
 									item.amount = data.BasicInformationTotalAmWithoutTax;
 									item.taxAmount = data.BasicInformationTotalTaxAm;
 									item.count = data.BasicInformationTotalTaxincludedAmount;
+									item.buyerName = data.BuyerInformationBuyerName;
 								}
 							})
 							//列表中未查到相同发票号
@@ -2238,6 +2247,7 @@
 									amount: data.BasicInformationTotalAmWithoutTax,
 									taxAmount: data.BasicInformationTotalTaxAm,
 									count: data.BasicInformationTotalTaxincludedAmount,
+									buyerName: data.BuyerInformationBuyerName,
 									remarks: ''
 								}
 								this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)
@@ -2277,6 +2287,14 @@
 						if(item.number === data.InvoiceNumber) {
 							this.removeEvent(item,i,'invoiceReimbursement')
 						}
+						if(this.inputForm.id && item.number){
+							//根据电子发票号和报销表id去删除数据库中存在的数据
+							this.reimbursementService.deleteByIdAndNumber(this.inputForm.id,data.InvoiceNumber).then((data) => {
+								if(!data.success){
+									this.$message.error(data.message)
+								}
+							})
+						}
 					}
 
 			},

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

@@ -616,6 +616,11 @@
 								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 							</template>
 						</vxe-table-column>
+						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+							<template #edit="scope">
+								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+							</template>
+						</vxe-table-column>
 						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 							<template #edit="scope">
 								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -774,6 +779,9 @@
 				invoiceUnit: [
 				{required: true, message: '开票单位不能为空'}
 			],
+			buyerName: [
+				{required: true, message: '购买方名称不能为空'}
+			],
 				amount: [
 				{required: true, message: '金额不能为空'}
 			],
@@ -1094,10 +1102,10 @@
 						this.loading = false
 						throw new Error('数电发票信息 第' + k + '行请填写发票单位')
 					}
-					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-						this.$message.error('数电发票信息 第' + k + '行请填写发票单位')
+					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+						this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 						this.loading = false
-						throw new Error('数电发票信息 第' + k + '行请填写发票单位')
+						throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 						this.$message.error('数电发票信息 第' + k + '行请填写金额')
@@ -2082,6 +2090,7 @@
 							item.amount = data.BasicInformationTotalAmWithoutTax;
 							item.taxAmount = data.BasicInformationTotalTaxAm;
 							item.count = data.BasicInformationTotalTaxincludedAmount;
+							item.buyerName = data.BuyerInformationBuyerName;
 						}
 					})
 					//列表中未查到相同发票号
@@ -2095,6 +2104,7 @@
 							amount: data.BasicInformationTotalAmWithoutTax,
 							taxAmount: data.BasicInformationTotalTaxAm,
 							count: data.BasicInformationTotalTaxincludedAmount,
+							buyerName: data.BuyerInformationBuyerName,
 							remarks: ''
 						}
 						this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)

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

@@ -611,6 +611,11 @@
 								<el-input maxlength="50" readonly="true" v-model="scope.row.invoiceUnit" ></el-input>
 							</template>
 						</vxe-table-column>
+						<vxe-table-column field="buyerName" title="购买方名称" :edit-render="{}" show-overflow="title">
+							<template #edit="scope">
+								<el-input maxlength="50" readonly="true" v-model="scope.row.buyerName" ></el-input>
+							</template>
+						</vxe-table-column>
 						<vxe-table-column field="amount" title="金额" :edit-render="{}" show-overflow="title">
 							<template #edit="scope">
 								<el-input maxlength="15" readonly="true" v-model="scope.row.amount" @input="scope.row.amount = twoDecimalPlaces(scope.row.amount)" @change="countAmount(scope.row)"></el-input>
@@ -760,6 +765,9 @@
 				invoiceUnit: [
 				{required: true, message: '开票单位不能为空'}
 			],
+			buyerName: [
+				{required: true, message: '购买方名称不能为空'}
+			],
 				amount: [
 				{required: true, message: '金额不能为空'}
 			],
@@ -1088,10 +1096,10 @@
 						this.loading = false
 						throw new Error('数电发票信息 第' + k + '行请填写发票单位')
 					}
-					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].invoiceUnit)) {
-						this.$message.error('数电发票信息 第' + k + '行请填写发票单位')
+					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].buyerName)) {
+						this.$message.error('数电发票信息 第' + k + '行请填写购买方名称')
 						this.loading = false
-						throw new Error('数电发票信息 第' + k + '行请填写发票单位')
+						throw new Error('数电发票信息 第' + k + '行请填写购买方名称')
 					}
 					if (this.commonJS.isEmpty(this.inputForm.invoiceReimbursements[j].amount)) {
 						this.$message.error('数电发票信息 第' + k + '行请填写金额')
@@ -2080,6 +2088,7 @@
 							item.amount = data.BasicInformationTotalAmWithoutTax;
 							item.taxAmount = data.BasicInformationTotalTaxAm;
 							item.count = data.BasicInformationTotalTaxincludedAmount;
+							item.buyerName = data.BuyerInformationBuyerName;
 						}
 					})
 					//列表中未查到相同发票号
@@ -2093,6 +2102,7 @@
 							amount: data.BasicInformationTotalAmWithoutTax,
 							taxAmount: data.BasicInformationTotalTaxAm,
 							count: data.BasicInformationTotalTaxincludedAmount,
+							buyerName: data.BuyerInformationBuyerName,
 							remarks: ''
 						}
 						this.insertInvoiceReimbursementEvent('invoiceReimbursement',value)
@@ -2132,6 +2142,14 @@
 				if(item.number === data.InvoiceNumber) {
 					this.removeEvent(item,i,'invoiceReimbursement')
 				}
+				if(this.inputForm.id && item.number){
+					//根据电子发票号和报销表id去删除数据库中存在的数据
+					this.reimbursementService.deleteByIdAndNumber(this.inputForm.id,data.InvoiceNumber).then((data) => {
+						if(!data.success){
+							this.$message.error(data.message)
+						}
+					})
+				}
 			}
 
 		},