发票

src/views/cw/invoice/InvoiceFormTask.vue

@@ -22,6 +22,7 @@
 				style="margin-left: 5em"
 				@cell-click=""
 				@edit-closed=""
+				keep-source
 				highlight-current-row
 				:edit-rules="tableRules"
 				:edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true, icon: '-'}"
@@ -750,7 +751,8 @@
           financeInvoiceInvalidDTO: {},
           isMultiple: '',
           billingId: '',
-			reportType:''
+			reportType:'',
+			recordType:''
         },
         programRow: '',
         bankList: [],
@@ -761,7 +763,8 @@
         baseKey: '',
         detailKey: '',
         receivablesKey: '',
-	    isShow:false
+	    isShow:false,
+
       }
     },
     created () {
@@ -860,7 +863,8 @@
 				},
 				isMultiple: '',
 				billingId: '',
-				reportType: ''
+				reportType: '',
+				recordType:''
 			}
 			// if (method === 'add') {
 			//   this.title = `新建发票`
@@ -929,6 +933,9 @@
 					if (this.status === 'audit' || this.status === 'taskFormDetail') {
 						method = 'view'
 					}
+					if (this.commonJS.isEmpty(this.inputForm.programId)){
+						this.inputForm.recordType='0'
+					}
 					// if (this.status === 'audit') {
 					//   if (this.commonJS.isEmpty(this.inputForm.billingDate)) {
 					//     this.inputForm.billingDate = this.moment(new Date()).format('YYYY-MM-DD')
@@ -980,6 +987,7 @@
 			}
 		},
 		async agreeForm(callback) {
+			console.log('进入方法')
 			this.loading = true
 			await financeInvoiceService.queryById(this.inputForm.id).then((data) => {
 				if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
@@ -1025,8 +1033,24 @@
 				}).catch(() => {
 					this.loading = false
 				})
+				if (this.commonJS.isEmpty(this.inputForm.programId)) {
+					if (this.commonJS.isEmpty(this.inputForm.reportType)) {
+						this.$message.error('请选择报备类型')
+						return;
+					}
+				}
 				return
 			} else if (status === 'start') {
+				if (this.commonJS.isEmpty(this.inputForm.programId)) {
+					if (this.commonJS.isEmpty(this.inputForm.reportType)) {
+						this.$message.error('请选择报备类型')
+						return;
+					}
+
+				}
+				if (this.inputForm.programId==null){
+					this.inputForm.recordType='0'
+				}
 				// 送审  待审核
 				this.inputForm.status = '2'
 			} else if (status === 'agree') {
@@ -1046,12 +1070,7 @@
 					throw new Error()
 				}
 			}
-			if (this.commonJS.isEmpty(this.inputForm.programId)) {
-				if (this.commonJS.isEmpty(this.inputForm.reportType)) {
-					this.$message.error('请选择报备类型')
-					return;
-				}
-			}
+
 			if (this.commonJS.isNotEmpty(this.inputForm.financeInvoiceBaseDTOList)) {
 				let i = this.inputForm.financeInvoiceBaseDTOList.length
 				for (let j = 0; j < i; j++) {
@@ -1582,9 +1601,7 @@
 				this.inputForm.billingId = ''
 			}
 		},
-
-
-		footerMethod({columns, data}) {
+		footerMethod2({columns, data}) {
 			const footerData = [
 				columns.map((column, columnIndex) => {
 					if (columnIndex === 0) {