苏州-业务操作报销调整

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

@@ -6,7 +6,7 @@
 				:disabled="method === 'view'" label-width="100px" @submit.native.prevent>
 
 				<el-divider content-position="left"><i class="el-icon-document"></i> 基础信息</el-divider>
-				<el-row>
+				<!-- <el-row>
 					<el-col :span="12">
 						<el-form-item label="报销项" prop="reimbursementType"
 							:disabled="status === 'audit' || status === 'taskFormDetail'" :rules="[
@@ -18,7 +18,7 @@
 								{{ item.label }}</el-radio>
 						</el-form-item>
 					</el-col>
-				</el-row>
+				</el-row> -->
 				<el-row :gutter="26">
 					<el-col :span="12">
 						<el-form-item label="经办人" prop="userName">
@@ -73,8 +73,6 @@
 
 			</el-form>
 			<!-- 附件 -->
-			<InvoiceReimbursementUpLoadComponent ref="invoiceReimbursementUpLoadComponent"
-				v-show="'1' === this.inputForm.reimbursementType"></InvoiceReimbursementUpLoadComponent>
 			<UpLoadComponent ref="uploadComponent"></UpLoadComponent>
 			<template #footer>
 				<span class="dialog-footer">
@@ -96,6 +94,8 @@ import XEUtils from 'xe-utils'
 // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 // import MaterialManagementDialog from '../../../materialManagement/file/MaterialManagementDialog'
 import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import InvoiceConfirmStatusService from '@/api/finance/invoice/InvoiceConfirmStatusService'
+
 export default {
 	data() {
 		return {
@@ -134,10 +134,14 @@ export default {
 		}
 	},
 	reimbursementApprovalService: null,
+	invoiceConfirmStatusService: null,
+
 	// materialManagementService: null,
 	created() {
 		this.reimbursementApprovalService = new ReimbursementApprovalService()
 		// this.materialManagementService = new MaterialManagementService()
+		this.invoiceConfirmStatusService = new InvoiceConfirmStatusService()
+
 	},
 	components: {
 		InvoiceReimbursementUpLoadComponent,

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

@@ -267,8 +267,6 @@
 
 			</el-form>
 			<!-- 附件 -->
-			<InvoiceReimbursementUpLoadComponent ref="invoiceReimbursementUpLoadComponent"
-				v-show="'1' === this.inputForm.reimbursementType"></InvoiceReimbursementUpLoadComponent>
 			<UpLoadComponent ref="uploadComponent"></UpLoadComponent>
 			<WorkContractChooseCom ref="workContractChooseCom" @getContract="getContract"></WorkContractChooseCom>
 			<ReportNoChooseRadio ref="reportNoChooseRadio" @getWorkClientRadioChoose="getWorkClientChoose2">
@@ -519,7 +517,7 @@ export default {
 		'loading': {
 			handler(newVal) {
 				this.$emit('changeLoading', newVal)
-				this.$refs.invoiceReimbursementUpLoadComponent.changeLoading(newVal)
+				// this.$refs.invoiceReimbursementUpLoadComponent.changeLoading(newVal)
 				this.$refs.uploadComponent.changeLoading(newVal)
 			}
 		}
@@ -575,7 +573,7 @@ export default {
 				this.loading = true
 				this.$refs.inputForm.resetFields()
 				this.reimbursementApprovalService.findById(this.inputForm.id).then((data) => {
-					this.$refs.invoiceReimbursementUpLoadComponent.clearUpload()
+					// this.$refs.invoiceReimbursementUpLoadComponent.clearUpload()
 					this.$refs.uploadComponent.clearUpload()
 					if (this.status === 'audit' || this.status === 'taskFormDetail') {
 						method = 'view'
@@ -643,10 +641,10 @@ export default {
 			this.$refs['inputForm'].validate((valid) => {
 				if (valid) {
 					this.loading = true
-					if (this.$refs.invoiceReimbursementUpLoadComponent.checkProgress()) {
-						this.loading = false
-						return
-					}
+					// if (this.$refs.invoiceReimbursementUpLoadComponent.checkProgress()) {
+					// 	this.loading = false
+					// 	return
+					// }
 					if (this.$refs.uploadComponent.checkProgress()) {
 						this.loading = false
 						return
@@ -658,7 +656,7 @@ export default {
 						this.inputForm.files = []
 					}
 					this.dataFiltering()
-					this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
+					// this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 					this.inputForm.files = this.$refs.uploadComponent.getDataList()
 					this.reimbursementApprovalService.save(this.inputForm).then((data) => {
 						this.close()
@@ -767,7 +765,7 @@ export default {
 			this.$refs.inputForm.resetFields()
 			this.inputForm.amountInfos = []
 			this.inputForm.invoiceReimbursements = []
-			this.$refs.invoiceReimbursementUpLoadComponent.clearUpload()
+			// this.$refs.invoiceReimbursementUpLoadComponent.clearUpload()
 			this.$refs.uploadComponent.clearUpload()
 			this.visible = false
 		},
@@ -924,10 +922,10 @@ export default {
 		// 暂存
 		async saveForm(callback) {
 			this.loading = true
-			if (this.$refs.invoiceReimbursementUpLoadComponent.checkProgress()) {
-				this.loading = false
-				return
-			}
+			// if (this.$refs.invoiceReimbursementUpLoadComponent.checkProgress()) {
+			// 	this.loading = false
+			// 	return
+			// }
 			if (this.$refs.uploadComponent.checkProgress()) {
 				this.loading = false
 				return
@@ -938,7 +936,7 @@ export default {
 			if (this.commonJS.isEmpty(this.inputForm.files)) {
 				this.inputForm.files = []
 			}
-			this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
+			// this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 			this.inputForm.files = this.$refs.uploadComponent.getDataList()
 			this.inputForm.type = '1'
 			this.reimbursementApprovalService.save(this.inputForm).then((data) => {
@@ -1079,10 +1077,10 @@ export default {
 				if (valid) {
 					this.loading = true
 					this.submitCheck()
-					if (this.$refs.invoiceReimbursementUpLoadComponent.checkProgress()) {
-						this.loading = false
-						return
-					}
+					// if (this.$refs.invoiceReimbursementUpLoadComponent.checkProgress()) {
+					// 	this.loading = false
+					// 	return
+					// }
 					if (this.$refs.uploadComponent.checkProgress()) {
 						this.loading = false
 						return
@@ -1098,7 +1096,7 @@ export default {
 					//   this.loading = false
 					//   return
 					// }
-					this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
+					// this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 					this.inputForm.files = this.$refs.uploadComponent.getDataList()
 					this.dataFiltering()
 					if (this.inputForm.invoiceReimbursementFiles <= 0 && "1" === this.inputForm.reimbursementType) {
@@ -1169,10 +1167,10 @@ export default {
 						if (valid) {
 							this.loading = true
 							this.submitCheck()
-							if (this.$refs.invoiceReimbursementUpLoadComponent.checkProgress()) {
-								this.loading = false
-								return
-							}
+							// if (this.$refs.invoiceReimbursementUpLoadComponent.checkProgress()) {
+							// 	this.loading = false
+							// 	return
+							// }
 							if (this.$refs.uploadComponent.checkProgress()) {
 								this.loading = false
 								return
@@ -1184,7 +1182,7 @@ export default {
 								this.inputForm.files = []
 							}
 							this.dataFiltering()
-							this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
+							// this.inputForm.invoiceReimbursementFiles = this.$refs.invoiceReimbursementUpLoadComponent.getDataList()
 							this.inputForm.files = this.$refs.uploadComponent.getDataList()
 							this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
 								if (this.commonJS.isNotEmpty(data)) {
@@ -1227,10 +1225,10 @@ export default {
 						this.$message.error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 						throw new Error('任务数据已发生改变或不存在，请在待办任务中确认此任务是否存在')
 					}
-					if (this.$refs.invoiceReimbursementUpLoadComponent.checkProgress()) {
-						this.loading = false
-						throw new Error()
-					}
+					// if (this.$refs.invoiceReimbursementUpLoadComponent.checkProgress()) {
+					// 	this.loading = false
+					// 	throw new Error()
+					// }
 
 					if (this.$refs.uploadComponent.checkProgress()) {
 						this.loading = false
@@ -1924,7 +1922,7 @@ export default {
 			this.reimbursementApprovalService.getEffectiveDataByInvoiceNumber(data.InvoiceNumber, this.inputForm.id).then((decide) => {
 				if (!decide.success) {
 					//删除上传的附件信息
-					this.$refs.invoiceReimbursementUpLoadComponent.parentDeleteById(file)
+					// this.$refs.invoiceReimbursementUpLoadComponent.parentDeleteById(file)
 					//进行提醒
 					this.$message.warning(decide.message)
 				} else {