报销发票上传和回显优化

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

@@ -159,7 +159,7 @@ import processService from '@/api/flowable/processService'
 //import MaterialManagementDialog from '../../../'
 import userService from '@/api/sys/UserService'
 import InfoHistory from "./InfoHistory";
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 export default {
 	props: {
 		businessId: {
@@ -1791,8 +1791,6 @@ export default {
 				this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
 				this.loading = false
 				throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-			} else {
-				this.loading = false
 			}
 		},
 		handleDefaultExpand() {

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

@@ -287,7 +287,7 @@ import processService from '@/api/flowable/processService'
 // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 //import MaterialManagementDialog from '../../../'
 import userService from '@/api/sys/UserService'
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 export default {
   props: {
     businessId: {

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

@@ -175,7 +175,7 @@ import processService from '@/api/flowable/processService'
 // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 //import MaterialManagementDialog from '../../../'
 import userService from '@/api/sys/UserService'
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 import ReimbursementImage from '@/views/common/reimbursement/ReimbursementImage.vue'
 export default {
   props: {
@@ -514,7 +514,6 @@ export default {
           //   this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, [], 'reimbursement')
           this.$refs.uploadComponent.newUpload(method, [], 'reimbursement')
           this.$refs.uploadComponent.isReimbursement = true
-          this.loading = false
         }
         userService.isZj().then((data) => {
           this.isZj = data
@@ -2028,8 +2027,6 @@ export default {
         this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
         this.loading = false
         throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-      } else {
-        this.loading = false
       }
     },
     handleDefaultExpand() {

src/views/common/NewDigitalInvoiceUploadComponentTest.vue

@@ -320,6 +320,8 @@ export default {
 		 *
 		 */
 		async newUpload(auth, fileList, directory, maxValue, dividerName, uploadFlag, delFlag, showDivider, toCompany, uniqueId) {
+			this.loading = true
+			this.$emit('changeLoading', true)
 			this.uploadKey = Math.random()
 			await this.fileLoadingFalse()
 			if (this.commonJS.isEmpty(fileList)) {
@@ -391,6 +393,9 @@ export default {
 			this.oldDataList = [...filtered]
 			this.dataListNew = [...filtered]
 			this.fileLoading = true
+			// 防止数据未更新完成，用户操作上传
+			this.loading = false
+			this.$emit('changeLoading', false)
 			// this.dataList = JSON.parse(JSON.stringify(fileList))
 			// this.dataListNew = JSON.parse(JSON.stringify(fileList))
 			if (this.commonJS.isEmpty(showDivider)) {
@@ -441,10 +446,9 @@ export default {
 			await httpRequest(file, fileNameInvoice(file), this.directory, this.maxValue)
 		},
 		handleSuccessUpload(response, file, fileList) {
-			// console.log(response, file, fileList);
-
 
 		},
+
 		async beforeUpload(file) {
 			if (this.uploadDelFlag) {
 				this.$message.warning('该文件已上传，请勿重复上传');
@@ -491,29 +495,6 @@ export default {
 			this.loadProgress = parseInt(event.percent) // 动态获取文件上传进度
 			if (this.loadProgress >= 100) {
 				this.loadProgress = 100
-				// var fileName = file.raw.name;
-				//
-				// const spliceLength2 = fileName.lastIndexOf(".");
-				// var fileNameSuffix = fileName.slice(spliceLength2 + 1);
-				// let lowerFileNameSuffix = fileNameSuffix.toLowerCase();
-				// if(lowerFileNameSuffix === "xml" ) {
-				// 	//对上传的xml文件信息进行处理并通过后端接口进行解析返回到父页面进行调整
-				// 	const formBody = new FormData()
-				// 	formBody.append('file', file.raw)
-				// 	this.ossService.disposeXmlFile(formBody).then((data) => {
-				// 		if(Object.keys(data).length > 0){
-				// 			this.invoiceReimbursementDisposeData(data,file)
-				// 		} else{
-				// 			this.$message.warning('上传的数电发票格式错误')
-				// 			this.loading = false;
-				// 			// 在验证失败时删除已经添加的行
-				// 			const index = this.fileList.findIndex(item => item.name === file.name);
-				// 			if (index !== -1) {
-				// 				this.deleteFileById(this.fileList[index], index, this.fileList);
-				// 			}
-				// 		}
-				// 	})
-				// }
 				setTimeout(() => {
 					this.progressFlag = false
 				}, 1000) // 一秒后关闭进度条
@@ -599,6 +580,7 @@ export default {
 			}
 		},
 		async changes(file, fileList) {
+			// 防止上传多次触发changes
 			if (file.status == 'ready') return //阻止上传多次触发changes
 			try {
 				this.uploadKey = Math.random();
@@ -722,8 +704,6 @@ export default {
 					return
 				}
 
-
-
 				// 发票号赋值给文件
 				file.remarks = this.uniqueId
 				file.number = fileData.InvoiceNumber
@@ -734,6 +714,7 @@ export default {
 				this.fileList.push(file)
 				this.dataList = this.dataListNew
 
+
 				// 清空 fileList，如果 fileList 不为空
 				if (fileList && fileList.length > 0) {
 					this.fileList = [];

src/views/common/reimbursement/ReimbursementComponent.vue

@@ -3199,8 +3199,6 @@ export default {
                 this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
                 this.loading = false
                 throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-            } else {
-                this.loading = false
             }
         },
         handleDefaultExpand() {

src/views/common/reimbursement/ReimbursementComponentTest.vue

@@ -65,8 +65,9 @@
                             </template>
                             <template #content="{ row, rowIndex }">
                                 <InvoiceReimbursementUpLoadComponent @changeConfirmList="changeConfirmList"
-                                    @handleCount="handleCount" @handleUploadSuccess="handleUploadSuccess"
-                                    @handleDelete="handleDelete" :ref="row.uniqueId + 'Upload'">
+                                    @changeLoading="handleChangeLoading" @handleCount="handleCount"
+                                    @handleUploadSuccess="handleUploadSuccess" @handleDelete="handleDelete"
+                                    :ref="row.uniqueId + 'Upload'">
                                 </InvoiceReimbursementUpLoadComponent>
                             </template>
                         </vxe-column>
@@ -169,7 +170,7 @@
                         <vxe-table-column title="操作" width="180">
                             <template #default="scope">
                                 <el-button size="default" @click="uploadFile(scope.row, scope.$rowIndex,)"
-                                    type="primary">新增</el-button>
+                                    :loading="loading" type="primary">新增</el-button>
                                 <el-button size="default" type="danger"
                                     @click="removeEvent(scope.row, scope.$rowIndex, 'detail')">删除</el-button>
                             </template>
@@ -209,8 +210,9 @@
                             </template>
                             <template #content="{ row, rowIndex }">
                                 <InvoiceReimbursementUpLoadComponent @changeConfirmList="changeConfirmList"
-                                    @handleCount="handleCount" @handleUploadSuccess="handleUploadSuccess"
-                                    @handleDelete="handleDelete" :ref="row.uniqueId + 'Upload'">
+                                    @changeLoading="handleChangeLoading" @handleCount="handleCount"
+                                    @handleUploadSuccess="handleUploadSuccess" @handleDelete="handleDelete"
+                                    :ref="row.uniqueId + 'Upload'">
                                 </InvoiceReimbursementUpLoadComponent>
                             </template>
                         </vxe-column>
@@ -313,7 +315,7 @@
                         <vxe-table-column title="操作" width="180">
                             <template #default="scope">
                                 <el-button size="default" @click="uploadFile(scope.row, scope.$rowIndex,)"
-                                    type="primary">新增</el-button>
+                                    :loading="loading" type="primary">新增</el-button>
                                 <el-button size="default" type="danger"
                                     @click="removeEvent(scope.row, scope.$rowIndex, 'detail')">删除</el-button>
                             </template>
@@ -353,8 +355,9 @@
                             </template>
                             <template #content="{ row, rowIndex }">
                                 <InvoiceReimbursementUpLoadComponent @changeConfirmList="changeConfirmList"
-                                    @handleCount="handleCount" @handleUploadSuccess="handleUploadSuccess"
-                                    @handleDelete="handleDelete" :ref="row.uniqueId + 'Upload'">
+                                    @changeLoading="handleChangeLoading" @handleCount="handleCount"
+                                    @handleUploadSuccess="handleUploadSuccess" @handleDelete="handleDelete"
+                                    :ref="row.uniqueId + 'Upload'">
                                 </InvoiceReimbursementUpLoadComponent>
                             </template>
                         </vxe-column>
@@ -452,7 +455,7 @@
                         <vxe-table-column title="操作" width="180">
                             <template #default="scope">
                                 <el-button size="default" @click="uploadFile(scope.row, scope.$rowIndex,)"
-                                    type="primary">新增</el-button>
+                                    :loading="loading" type="primary">新增</el-button>
                                 <el-button size="default" type="danger"
                                     @click="removeEvent(scope.row, scope.$rowIndex, 'detail')">删除</el-button>
                             </template>
@@ -576,7 +579,7 @@
                     <vxe-table-column title="操作" width="180">
                         <template #default="scope">
                             <el-button size="default" @click="uploadFile(scope.row, scope.$rowIndex,)"
-                                type="primary">新增</el-button>
+                                :loading="loading" type="primary">新增</el-button>
                             <el-button size="default" type="danger"
                                 @click="removeEvent(scope.row, scope.$rowIndex, 'contract_detail')">删除</el-button>
                         </template>
@@ -614,8 +617,9 @@
                             </template>
                             <template #content="{ row, rowIndex }">
                                 <InvoiceReimbursementUpLoadComponent @changeConfirmList="changeConfirmList"
-                                    @handleCount="handleCount" @handleUploadSuccess="handleUploadSuccess"
-                                    @handleDelete="handleDelete" :ref="row.uniqueId + 'Upload'">
+                                    @changeLoading="handleChangeLoading" @handleCount="handleCount"
+                                    @handleUploadSuccess="handleUploadSuccess" @handleDelete="handleDelete"
+                                    :ref="row.uniqueId + 'Upload'">
                                 </InvoiceReimbursementUpLoadComponent>
                             </template>
                         </vxe-column>
@@ -720,7 +724,7 @@
                         <vxe-table-column title="操作" width="180">
                             <template #default="scope">
                                 <el-button size="default" @click="uploadFile(scope.row, scope.$rowIndex,)"
-                                    type="primary">新增</el-button>
+                                    :loading="loading" type="primary">新增</el-button>
                                 <el-button size="default" type="danger"
                                     @click="removeEvent(scope.row, scope.$rowIndex, 'report_detail')">删除</el-button>
                             </template>
@@ -759,8 +763,9 @@
                             </template>
                             <template #content="{ row, rowIndex }">
                                 <InvoiceReimbursementUpLoadComponent @changeConfirmList="changeConfirmList"
-                                    @handleCount="handleCount" @handleUploadSuccess="handleUploadSuccess"
-                                    @handleDelete="handleDelete" :ref="row.uniqueId + 'Upload'">
+                                    @changeLoading="handleChangeLoading" @handleCount="handleCount"
+                                    @handleUploadSuccess="handleUploadSuccess" @handleDelete="handleDelete"
+                                    :ref="row.uniqueId + 'Upload'">
                                 </InvoiceReimbursementUpLoadComponent>
                             </template>
                         </vxe-column>
@@ -858,7 +863,7 @@
                         <vxe-table-column title="操作" width="180">
                             <template #default="scope">
                                 <el-button size="default" @click="uploadFile(scope.row, scope.$rowIndex,)"
-                                    type="primary">新增</el-button>
+                                    :loading="loading" type="primary">新增</el-button>
                                 <el-button size="default" type="danger"
                                     @click="removeEvent(scope.row, scope.$rowIndex, 'report_detail')">删除</el-button>
                             </template>
@@ -898,8 +903,9 @@
                             </template>
                             <template #content="{ row, rowIndex }">
                                 <InvoiceReimbursementUpLoadComponent @changeConfirmList="changeConfirmList"
-                                    @handleCount="handleCount" @handleUploadSuccess="handleUploadSuccess"
-                                    @handleDelete="handleDelete" :ref="row.uniqueId + 'Upload'">
+                                    @changeLoading="handleChangeLoading" @handleCount="handleCount"
+                                    @handleUploadSuccess="handleUploadSuccess" @handleDelete="handleDelete"
+                                    :ref="row.uniqueId + 'Upload'">
                                 </InvoiceReimbursementUpLoadComponent>
 
                             </template>
@@ -999,7 +1005,7 @@
                         <vxe-table-column title="操作" width="180">
                             <template #default="scope">
                                 <el-button size="default" @click="uploadFile(scope.row, scope.$rowIndex,)"
-                                    type="primary">新增</el-button>
+                                    :loading="loading" type="primary">新增</el-button>
                                 <el-button size="default" type="danger"
                                     @click="removeEvent(scope.row, scope.$rowIndex, 'others')">删除</el-button>
                             </template>
@@ -1159,8 +1165,9 @@
                             </template>
                             <template #content="{ row, rowIndex }">
                                 <InvoiceReimbursementUpLoadComponent @changeConfirmList="changeConfirmList"
-                                    @handleCount="handleCount" @handleUploadSuccess="handleUploadSuccess"
-                                    @handleDelete="handleDelete" :ref="row.uniqueId + 'Upload'">
+                                    @changeLoading="handleChangeLoading" @handleCount="handleCount"
+                                    @handleUploadSuccess="handleUploadSuccess" @handleDelete="handleDelete"
+                                    :ref="row.uniqueId + 'Upload'">
                                 </InvoiceReimbursementUpLoadComponent>
 
                             </template>
@@ -1279,7 +1286,7 @@
                         <vxe-table-column title="操作" width="180">
                             <template #default="scope">
                                 <el-button size="default" @click="uploadFile(scope.row, scope.$rowIndex,)"
-                                    type="primary">新增</el-button>
+                                    :loading="loading" type="primary">新增</el-button>
                                 <el-button size="default" type="danger"
                                     @click="removeEvent(scope.row, scope.$rowIndex, 'zs_project_detail')">删除</el-button>
                             </template>
@@ -3199,8 +3206,6 @@ export default {
                 this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
                 this.loading = false
                 throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-            } else {
-                this.loading = false
             }
         },
         handleDefaultExpand() {
@@ -3322,6 +3327,9 @@ export default {
 
             }
 
+        },
+        handleChangeLoading(value) {
+            this.loading = value
         }
     }
 }

src/views/common/reimbursement/ReimbursementImage.vue

@@ -1,4 +1,4 @@
-<!--文件上传组件-->
+<!--报销单图片预览组件-->
 <template>
   <el-dialog append-to-body title="报销单图片预览" @open="handleOpenDialog" :close-on-click-modal="true" draggable
     @close="close" @keyup.enter.native="" v-model="visible">

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

@@ -233,7 +233,7 @@ import InvoiceReimbursementUpLoadComponent from '@/views/common/NewDigitalInvoic
 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 ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 export default {
   data() {
     return {

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

@@ -151,7 +151,7 @@ import processService from '@/api/flowable/processService'
 //import MaterialManagementDialog from '../../../'
 import userService from '@/api/sys/UserService'
 import InfoHistory from "./InfoHistory";
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 export default {
   props: {
     businessId: {
@@ -1797,8 +1797,6 @@ export default {
         this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
         this.loading = false
         throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-      } else {
-        this.loading = false
       }
     },
     handleDefaultExpand() {

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

@@ -287,7 +287,7 @@ import processService from '@/api/flowable/processService'
 // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 //import MaterialManagementDialog from '../../../'
 import userService from '@/api/sys/UserService'
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 export default {
   props: {
     businessId: {

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

@@ -146,7 +146,7 @@ import processService from '@/api/flowable/processService'
 // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 //import MaterialManagementDialog from '../../../'
 import userService from '@/api/sys/UserService'
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 import ReimbursementImage from '@/views/common/reimbursement/ReimbursementImage.vue'
 export default {
   props: {
@@ -481,7 +481,6 @@ export default {
           //   this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, [], 'reimbursement')
           this.$refs.uploadComponent.newUpload(method, [], 'reimbursement')
           this.$refs.uploadComponent.isReimbursement = true
-          this.loading = false
         }
         userService.isZj().then((data) => {
           this.isZj = data
@@ -1937,8 +1936,6 @@ export default {
         this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
         this.loading = false
         throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-      } else {
-        this.loading = false
       }
     },
     handleDefaultExpand() {

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

@@ -150,7 +150,7 @@ import ReimbursementApprovalService from '@/api/cw/reimbursementApproval/Reimbur
 import UpLoadComponent from '@/views/common/UpLoadComponent'
 import InvoiceReimbursementUpLoadComponent from '@/views/common/NewDigitalInvoiceUploadComponent'
 import XEUtils from 'xe-utils'
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 import InvoiceConfirmStatusService from '@/api/finance/invoice/InvoiceConfirmStatusService'
 // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 // import MaterialManagementDialog from '../../../materialManagement/file/MaterialManagementDialog'

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

@@ -159,7 +159,7 @@ import ProjectListForm from './ProgramForm'
 import CwProgramPageForm2 from './CwProgramPageForm2'
 import userService from '@/api/sys/UserService'
 import InfoHistory from "./InfoHistory";
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 export default {
 	props: {
 		businessId: {
@@ -2042,8 +2042,6 @@ export default {
 				this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
 				this.loading = false
 				throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-			} else {
-				this.loading = false
 			}
 		},
 		handleDefaultExpand() {

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

@@ -240,7 +240,7 @@ import processService from '@/api/flowable/processService'
 import ProjectListForm from './ProgramForm'
 import CwProgramPageForm2 from './CwProgramPageForm2'
 import userService from '@/api/sys/UserService'
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 import InvoiceConfirmStatusService from '@/api/finance/invoice/InvoiceConfirmStatusService'
 export default {
 	props: {

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

@@ -486,8 +486,6 @@ export default {
 				})
 				if (method !== 'edit' && method !== 'view') {
 					// this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, [], 'reimbursement')
-
-
 					this.$refs.uploadComponent.newUpload(method, [], 'reimbursement')
 					this.$refs.uploadComponent.isReimbursement = true
 				}
@@ -2304,8 +2302,6 @@ export default {
 				this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
 				this.loading = false
 				throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-			} else {
-				this.loading = false
 			}
 		},
 		handleDefaultExpand() {

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

@@ -93,7 +93,7 @@ import InvoiceReimbursementUpLoadComponent from '@/views/common/InvoiceReimburse
 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 ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 import InvoiceConfirmStatusService from '@/api/finance/invoice/InvoiceConfirmStatusService'
 
 export default {

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

@@ -311,7 +311,7 @@ import ProjectListForm from './ProgramForm'
 import CwProgramPageForm2 from './CwProgramPageForm2'
 import userService from '@/api/sys/UserService'
 import InfoHistory from "./InfoHistory";
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 export default {
 	props: {
 		businessId: {

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

@@ -144,7 +144,7 @@ import ProjectListForm from './ProgramForm'
 import CwProgramPageForm2 from './CwProgramPageForm2'
 import userService from '@/api/sys/UserService'
 import taskService from "@/api/flowable/taskService.js";
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 import ReimbursementImage from '@/views/common/reimbursement/ReimbursementImage.vue'
 
 export default {

src/views/reimbursement/info/NewInfoUpdateForm.vue

@@ -169,7 +169,7 @@ import processService from '@/api/flowable/processService'
 // import MaterialManagementDialog from '@/views/materialManagement/file/MaterialManagementDialog'
 import ProjectListForm from './ProgramForm'
 import InfoHistory from "./InfoHistory";
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 export default {
 	data() {
 		return {
@@ -1899,8 +1899,6 @@ export default {
 				this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
 				this.loading = false
 				throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-			} else {
-				this.loading = false
 			}
 		},
 		handleDefaultExpand() {

src/views/reimbursement/info/NewReimbursementFileSupplementForm.vue

@@ -303,7 +303,7 @@ import processService from '@/api/flowable/processService'
 // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 // import MaterialManagementDialog from '@/views/materialManagement/file/MaterialManagementDialog'
 import ProjectListForm from './ProgramForm'
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 export default {
 	data() {
 		return {

src/views/reimbursement/info/NewReimbursementForm.vue

@@ -147,7 +147,7 @@ import processService from '@/api/flowable/processService'
 // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 // import MaterialManagementDialog from '@/views/materialManagement/file/MaterialManagementDialog'
 import ProjectListForm from './ProgramForm'
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 import ReimbursementImage from '@/views/common/reimbursement/ReimbursementImage.vue'
 
 export default {
@@ -414,8 +414,6 @@ export default {
 				this.reimbursementService.findById(this.inputForm.id).then((data) => {
 					this.inputForm = this.recover(this.inputForm, data)
 					this.inputForm = JSON.parse(JSON.stringify(this.inputForm))
-					console.log('data', data)
-					console.log('this.inputForm', this.inputForm)
 					// this.$refs.invoiceReimbursementUpLoadComponent.clearUpload()
 					this.$refs.uploadComponent.clearUpload()
 					if (this.status === 'audit' || this.status === 'taskFormDetail') {
@@ -1978,8 +1976,6 @@ export default {
 				this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
 				this.loading = false
 				throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-			} else {
-				this.loading = false
 			}
 		},
 		handleDefaultExpand() {

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

@@ -101,7 +101,7 @@ import ReimbursementService from '@/api/zs/reimbursement/ReimbursementService'
 import UpLoadComponent from '@/views/common/UpLoadComponent'
 import InvoiceReimbursementUpLoadComponent from '@/views/common/NewDigitalInvoiceUploadComponent'
 import XEUtils from 'xe-utils'
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 // import MaterialManagementDialog from '../../../materialManagement/file/MaterialManagementDialog'
 export default {

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

@@ -137,7 +137,7 @@ import processService from '@/api/flowable/processService'
 //import MaterialManagementDialog from '../../../'
 import userService from '@/api/sys/UserService'
 import InfoHistory from "./InfoHistory";
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 export default {
   props: {
     businessId: {
@@ -1787,8 +1787,6 @@ export default {
         this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
         this.loading = false
         throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-      } else {
-        this.loading = false
       }
     },
     handleDefaultExpand() {

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

@@ -283,7 +283,7 @@ import processService from '@/api/flowable/processService'
 // import MaterialManagementService from '@/api/materialManagement/MaterialManagementService'
 //import MaterialManagementDialog from '../../../'
 import userService from '@/api/sys/UserService'
-import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponent.vue'
+import ReimbursementComponent from '@/views/common/reimbursement/ReimbursementComponentTest.vue'
 
 export default {
   props: {

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

@@ -472,6 +472,7 @@ export default {
       this.$refs.reimbursementComponent.initComponent("reimbursement", "zs", "中审众环会计师事务所(特殊普通合伙)江苏分所", this.inputForm, this.isConfirm, this.status)
     },
     init(method, id) {
+      this.loading = true
       this.method = method
       this.inputForm = {
         reimbursementType: '1',
@@ -584,7 +585,6 @@ export default {
           //   this.$refs.invoiceReimbursementUpLoadComponent.newUpload(method, [], 'reimbursement')
           this.$refs.uploadComponent.newUpload(method, [], 'reimbursement')
           this.$refs.uploadComponent.isReimbursement = true
-          this.loading = false
         }
         userService.isZj().then((data) => {
           this.isZj = data
@@ -944,6 +944,8 @@ export default {
     },
     // 送审
     async startForm(callback) {
+      console.log("提交审批");
+
       this.getReimbursementData()
       let title = `发起流程【中审-报销审批】`
       let describe = `[中审-报销审批]`
@@ -2060,11 +2062,6 @@ export default {
 
     },
     handleTableInfo(value) {
-      console.log(value);
-      console.log(value);
-      console.log(value);
-      console.log(value);
-
       if (value === '1') {
         this.tableRef = this.$refs.detailTable
         this.tableData = this.inputForm.detailInfos
@@ -2135,8 +2132,6 @@ export default {
         this.$message.warning(`第${countIndex + 1}行报销费用与发票金额不一致`);
         this.loading = false
         throw new Error(`第${countIndex + 1}行报销费用与发票金额不一致`);
-      } else {
-        this.loading = false
       }
     },
     handleDefaultExpand() {