报销功能调整

src/api/ccpm/reimbursement/ReimbursementService.js

@@ -95,11 +95,11 @@ export default class ReimbursementService {
 			params: {invoiceNumber: invoiceNumber,id:id}
 		})
 	}
-	getEffectiveDataByNumbers2 (invoiceNumber) {
+	getEffectiveDataByNumbers2 (invoiceNumber,id) {
 		return request({
 			url: prefix + '/ccpmReimbursement/info/getEffectiveDataByNumbers2',
 			method: 'get',
-			params: {invoiceNumber: invoiceNumber}
+			params: {invoiceNumber: invoiceNumber,id:id}
 		})
 	}
 	deleteByIdAndNumber (id,invoiceNumber) {

src/api/consultancy/reimbursement/ReimbursementService.js

@@ -95,11 +95,11 @@ export default class ReimbursementService {
 			params: {invoiceNumber: invoiceNumber,id:id}
 		})
 	}
-	getEffectiveDataByNumbers2 (invoiceNumber) {
+	getEffectiveDataByNumbers2 (invoiceNumber,id) {
 		return request({
 			url: prefix + '/consultancyReimbursement/info/getEffectiveDataByNumbers2',
 			method: 'get',
-			params: {invoiceNumber: invoiceNumber}
+			params: {invoiceNumber: invoiceNumber,id: id}
 		})
 	}
 	deleteByIdAndNumber (id,invoiceNumber) {

src/api/cw/reimbursementApproval/ReimbursementApprovalService.js

@@ -148,11 +148,11 @@ export default class ReimbursementApprovalService {
 			params: {invoiceNumber: invoiceNumber,id:id}
 		})
 	}
-	getEffectiveDataByNumbers2 (invoiceNumber) {
+	getEffectiveDataByNumbers2 (invoiceNumber,id) {
 		return request({
 			url: prefix + '/reimbursementApproval/info/getEffectiveDataByNumbers2',
 			method: 'get',
-			params: {invoiceNumber: invoiceNumber}
+			params: {invoiceNumber: invoiceNumber,id: id}
 		})
 	}
 	deleteByIdAndNumber (id,invoiceNumber) {

src/api/sys/OSSService.js

@@ -82,8 +82,8 @@ export const client = new OSS({
   region: 'oss-cn-hangzhou', // oss地址
   accessKeyId: 'LTAI5tKa6kzGr5EyPWJB4EcD', // 通过阿里云控制台创建的AccessKey ID。
   accessKeySecret: 'arHxB7ZPhizrBYf4844TtyaRctPMgW', // 通过阿里云控制台创建的AccessKey Secret。
-	// bucket: 'xgxm-test', // 仓库名字
-	bucket: 'xg-pg', // 仓库名字
+	bucket: 'xgxm-test', // 仓库名字
+	// bucket: 'xg-pg', // 仓库名字
   useFetch: true, // 支持上传大于100KB的文件
   secure: false // 返回的url为https
 })
@@ -223,7 +223,6 @@ export async function httpRequest (file, name, type, maxValue) { // 阿里云OSS
   await client.multipartUpload(fileName, file.file, {
 	  // eslint-disable-next-line no-unused-vars
     progress: await function (p, checkpoint) {
-    	console.log(3231221131)
       file.onProgress({percent: Math.floor(p * 100)}) // 触发el-upload组件的onProgress方法
     }
     // mime: type,
@@ -306,7 +305,6 @@ export async function toHref (row) {
   const link = document.createElement('a')
   await getTemporaryByUrl(row.url).then((data) => {
     const url = data // 完整的url则直接使用
-	  console.log('导出uel0', url)
     // 这里是将url转成blob地址，
     fetch(url).then(res => res.blob()).then(blob => { // 将链接地址字符内容转变成blob地址
       link.href = URL.createObjectURL(blob)
@@ -329,7 +327,6 @@ export async function toHrefByUrlAndName (url,name) {
   const link = document.createElement('a')
   await getTemporaryByUrl(url).then((data) => {
     const url = data // 完整的url则直接使用
-	  console.log('导出uel0', url)
     // 这里是将url转成blob地址，
     fetch(url).then(res => res.blob()).then(blob => { // 将链接地址字符内容转变成blob地址
       link.href = URL.createObjectURL(blob)

src/api/sys/ReimbursementService.js

@@ -102,11 +102,11 @@ export default class ReimbursementService {
 			params: {invoiceNumber: invoiceNumber,id:id}
 		})
 	}
-	getEffectiveDataByNumbers2 (invoiceNumber) {
+	getEffectiveDataByNumbers2 (invoiceNumber,id) {
 		return request({
 			url: prefix + '/reimbursement/info/getEffectiveDataByNumbers2',
 			method: 'get',
-			params: {invoiceNumber: invoiceNumber}
+			params: {invoiceNumber: invoiceNumber,id: id}
 		})
 	}
 	deleteByIdAndNumber (id,invoiceNumber) {

src/api/zs/reimbursement/ReimbursementService.js

@@ -102,11 +102,11 @@ export default class ReimbursementService {
 			params: {invoiceNumber: invoiceNumber,id:id}
 		})
 	}
-	getEffectiveDataByNumbers2 (invoiceNumber) {
+	getEffectiveDataByNumbers2 (invoiceNumber,id) {
 		return request({
 			url: prefix + '/zsReimbursement/info/getEffectiveDataByNumbers2',
 			method: 'get',
-			params: {invoiceNumber: invoiceNumber}
+			params: {invoiceNumber: invoiceNumber,id: id}
 		})
 	}
 	findHistory (id) {

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

@@ -1485,7 +1485,7 @@
 				  for (let i = 0; i < this.inputForm.invoiceReimbursementFiles.length; i++) {
 					  numbers.push(this.inputForm.invoiceReimbursementFiles[i].number)
 				  }
-				  const decide = await this.reimbursementService.getEffectiveDataByNumbers2(numbers.join(","))
+				  const decide = await this.reimbursementService.getEffectiveDataByNumbers2(numbers.join(","),this.inputForm.id)
 				  // .then((decide) => {
 				  if (!decide.success) {
 					  //进行提醒

src/views/common/DigitalInvoiceUploadComponent.vue

@@ -449,7 +449,6 @@
       },
 		async changes(file, fileList) {
 			this.uploadKey = Math.random();
-			console.log('fileList',fileList)
 
 			// 用来存放没有重复且有有效URL的文件，准备上传
 			let filesToUpload = [];
@@ -544,20 +543,30 @@
 						const data = await this.ossService.disposeXmlFile(formBody);
 						if (Object.keys(data).length > 0) {
 							// 如果文件的公司名称与this.toCompany不一致，则删除该文件
+
+							// 检查 data 是否包含 BuyerInformationBuyerName 属性
+							if (data && 'BuyerInformationBuyerName' in data) {
+								// 验证是否有效，并进行替换操作
+								if (typeof data.BuyerInformationBuyerName === 'string') {
+									var buyerInformationBuyerName = data.BuyerInformationBuyerName
+										.replace(/（/g, '(')
+										.replace(/）/g, ')');
+									data.BuyerInformationBuyerName = buyerInformationBuyerName
+								}
+							}
+
 							if (this.toCompany !== data.BuyerInformationBuyerName) {
 								this.noXmlFiles.push(item.raw.name)
 								// this.$message.warning("仅可上传江苏兴光项目管理有限公司的报销数电发票");
 								continue;
 							}
 							var flag = this.invoiceReimbursementDispose(data)
-							console.log('flag',flag)
 							if (flag){
 								this.reNumFiles.push(data.InvoiceNumber)
 								continue;
 							}
 							//查询当前发票号是否已经被报销
 							let isUsed = await this.ossService.isUsedByInvoiceNumber(data.InvoiceNumber);
-							console.log('isUsed',isUsed)
 							if (isUsed){
 								isUsedFiles.push(data.InvoiceNumber)
 								continue;
@@ -569,22 +578,14 @@
 							}
 							validCompanyFiles.push(item);  // 符合条件的文件
 						}
-						// else {
-						// 	console.log('error',data)
-						// 	errorFiles.push(item.raw.name)
-						// 	continue;
-						// }
 					}
 				}
 			}
 			filesToUpload = validCompanyFiles;
 			// 将新符合条件的文件追加到原文件列表上
-			console.log('this.dataList',this.dataList)
-			console.log('validCompanyFiles',filesToUpload)
 			this.dataListNew = [...this.dataList, ...filesToUpload];
 			this.fileList = [...filesToUpload];
 			// 记录上传文件的数量
-			console.log('fileList',fileList)
 			this.totalCount = fileList.length;
 			//记录changes方法执行了多少次,此处加判定是为了处理防抖,change方法会对每一个文件执行两次,此处判定后只会增加一次
 			if (file.status !== 'ready'){
@@ -592,8 +593,6 @@
 			}
 
 			// 9. 检查是否是最后一个文件上传，如果是，执行一次去重和提示
-			console.log('this.totalCount',this.totalCount)
-			console.log('this.uploadingCount',this.uploadingCount)
 			if (this.uploadingCount === this.totalCount) {
 				this.duplicateFileNames = [...new Set(this.duplicateFileNames)];
 				this.noXmlFiles = [...new Set(this.noXmlFiles)];
@@ -628,7 +627,7 @@
 				}
 				//已经被报销的文件
 				if (isUsedFiles.length > 0){
-					this.$message.warning(`书店发票编号为: "\n${isUsedFiles.join('\n')}" 已经发起或已完成报销,无法重复报销`);
+					this.$message.warning(`数电发票编号为: "\n${isUsedFiles.join('\n')}" 已经发起或已完成报销,无法重复报销`);
 				}
 				// 重置计数器
 				this.uploadingCount = 0;
@@ -649,7 +648,6 @@
 
 		async handleUploadSuccess(response, file, fileList) {
 
-
 			// 遍历当前的数据列表
 			if (this.dataListNew.length>0){
 				for (let item of this.dataListNew) {
@@ -668,6 +666,17 @@
 							try {
 								// 调用后端接口解析 XML 文件
 								const data = await this.ossService.disposeXmlFile(formBody);
+								console.log(data)
+								// 检查 data 是否包含 BuyerInformationBuyerName 属性
+								if (data && 'BuyerInformationBuyerName' in data) {
+									// 验证是否有效，并进行替换操作
+									if (typeof data.BuyerInformationBuyerName === 'string') {
+										var buyerInformationBuyerName = data.BuyerInformationBuyerName
+											.replace(/（/g, '(')
+											.replace(/）/g, ')');
+										data.BuyerInformationBuyerName = buyerInformationBuyerName
+									}
+								}
 
 								if (Object.keys(data).length > 0) {
 									// 解析成功，更新数据行
@@ -698,8 +707,6 @@
 		},
 	  invoiceReimbursementDispose(data) {
 			var invoiceReimbursements = this.dataList;
-		  console.log('invoiceReimbursements',invoiceReimbursements)
-		  console.log('data',data)
 			//创建判断值，若行信息存在相同的发票号，则进行数据检查调整，若不存在发票号，则新增行，并将信息写入
 			var includeFlag = false;
 			if(!invoiceReimbursements) {

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

@@ -1432,7 +1432,7 @@
 				  for (let i = 0; i < this.inputForm.invoiceReimbursementFiles.length; i++) {
 					  numbers.push(this.inputForm.invoiceReimbursementFiles[i].number)
 				  }
-				  const decide = await this.reimbursementService.getEffectiveDataByNumbers2(numbers.join(","))
+				  const decide = await this.reimbursementService.getEffectiveDataByNumbers2(numbers.join(","),this.inputForm.id)
 				  // .then((decide) => {
 				  if (!decide.success) {
 					  //进行提醒

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

@@ -1638,7 +1638,7 @@
 							for (let i = 0; i < this.inputForm.invoiceReimbursementFiles.length; i++) {
 								numbers.push(this.inputForm.invoiceReimbursementFiles[i].number)
 							}
-							const decide = await this.reimbursementApprovalService.getEffectiveDataByNumbers2(numbers.join(","))
+							const decide = await this.reimbursementApprovalService.getEffectiveDataByNumbers2(numbers.join(","),this.inputForm.id)
 							// .then((decide) => {
 							if (!decide.success) {
 								//进行提醒

src/views/human/practice/register/RegistrationList.vue

@@ -20,7 +20,19 @@
 				size="default"
 				@getValue="(value,label) => {searchForm.practiceOffice=value}"/>
 		</el-form-item>
-		<el-form-item label="联系电话" prop="mobilePhone">
+		<el-form-item label="实习时间" prop="createDates">
+			<el-date-picker
+				placement="bottom-start"
+				format="YYYY-MM-DD"
+				value-format="YYYY-MM-DD"
+				v-model="searchForm.createDates"
+				type="datetimerange"
+				range-separator="至"
+				start-placeholder="开始日期"
+				end-placeholder="结束日期">
+			</el-date-picker>
+		</el-form-item>
+		<el-form-item v-if="showHideItem" label="联系电话" prop="mobilePhone">
 			<el-input v-model="searchForm.mobilePhone" placeholder="请输入联系电话" clearable></el-input>
 		</el-form-item>
 		<el-form-item v-if="showHideItem" label="性别" prop="sex">
@@ -42,9 +54,9 @@
 		<el-form-item v-if="showHideItem" label="专业" prop="speciality">
 			<el-input v-model="searchForm.speciality" placeholder="请输入专业" clearable></el-input>
 		</el-form-item>
-		<el-form-item v-if="showHideItem" label="QQ号/微信号" prop="qqNum">
+		<!--<el-form-item v-if="showHideItem" label="QQ号/微信号" prop="qqNum">
 			<el-input v-model="searchForm.qqNum" placeholder="请输入QQ号/微信号" clearable></el-input>
-		</el-form-item>
+		</el-form-item>-->
 		<el-form-item v-if="showHideItem" label="实习单位名称" prop="practiceUnitName">
 			<el-input v-model="searchForm.practiceUnitName" placeholder="请输入实习单位名称" clearable></el-input>
 		</el-form-item>
@@ -104,6 +116,8 @@
           <vxe-column min-width="160" align="center" title="毕业院校" field="graduatedFrom"></vxe-column>
           <vxe-column min-width="160" align="center" title="所属部门" field="departmentName"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目经理" field="projectManagerName"></vxe-column>
+          <vxe-column min-width="160" align="center" title="实习开始时间" field="practiceStartDay"></vxe-column>
+          <vxe-column min-width="160" align="center" title="实习结束时间" field="practiceCompleteDay"></vxe-column>
           <vxe-column min-width="160" align="center" title="实习状态" field="practiceStatus">
 			  <template #default="scope">
 				  {{$dictUtils.getDictLabel('practice_type', scope.row.practiceStatus, '')}}
@@ -170,6 +184,7 @@
 			qqNum:'',
 			practiceUnitName:'',
 			projectManager:'',
+			createDates: [],
         },
         dataList: [],
         tablePage: {

src/views/reimbursement/info/ReimbursementForm.vue

@@ -1533,7 +1533,7 @@
 							for (let i = 0; i < this.inputForm.invoiceReimbursementFiles.length; i++) {
 								numbers.push(this.inputForm.invoiceReimbursementFiles[i].number)
 							}
-							const decide = await this.reimbursementService.getEffectiveDataByNumbers2(numbers.join(","))
+							const decide = await this.reimbursementService.getEffectiveDataByNumbers2(numbers.join(","),this.inputForm.id)
 							// .then((decide) => {
 							if (!decide.success) {
 								//进行提醒

src/views/sys/log/LogList.vue

@@ -29,6 +29,14 @@
 									<span>异常日志</span>
 								</template>
 							</el-menu-item>
+							<el-menu-item index="7">
+								<template #title>
+									<el-icon class="no-inherit"
+										><circle-close-filled color="#f56c6d"
+									/></el-icon>
+									<span>异常登陆日志</span>
+								</template>
+							</el-menu-item>
 						</el-menu>
 					</el-main>
 				</el-container>

src/views/tools/TwoDimensionCode.vue

@@ -40,7 +40,7 @@ export default {
 	data() {
 		return {
 			inputForm: {
-				encoderContent: "http://demo1.jeeplus.org/h5/#/",
+				encoderContent: "http://cpaoa.xgccpm.com/h5/#/",
 			},
 			imageUrl: "",
 		};

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

@@ -130,72 +130,74 @@
             </el-button>
           </el-divider>
           <el-row  :gutter="15" >
-            <vxe-table
-              border
-              show-footer
-              show-overflow
-              :footer-method="footerMethod"
-              ref="detailTable"
-              :key="detailKey"
-              class="vxe-table-element"
-              :data="inputForm.detailInfos"
-              style="margin-left: 5em"
-              highlight-current-row
-              :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-              :edit-rules="validRules"
-            >
-              <vxe-table-column field="userName" title="报销人" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销人', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.userName" @focus="userPullListForm(scope.$rowIndex)"></el-input>
-                  <!--              <UserSelectV2 :limit='1' :userName="scope.row.userName" @getValue='(value, label) => {scope.row.userName = label}'></UserSelectV2>-->
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="deptName" title="报销部门" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input :disabled='true' v-model="scope.row.deptName" ></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.typeName" @focus="typePullForm(scope.$rowIndex)"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.projectName" @focus="openProgramPageForm(scope.$rowIndex, scope.row)"></el-input>
-                </template>
-              </vxe-table-column>
-<!--                          <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}">-->
-<!--                            <template v-slot:edit="scope">-->
-<!--                              <el-input :readonly="true" v-model="scope.row.reportNumber" @focus="openReportNoPageForm(scope.$rowIndex, scope.row)"></el-input>-->
-<!--                            </template>-->
-<!--                          </vxe-table-column>-->
-              <vxe-table-column field="number" title="费用(元)" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.receiptNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="days" title="出差天数" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.days" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.content" ></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column title="操作" width="100">
-                <template #default="scope">
-                  <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
-                </template>
-              </vxe-table-column>
-            </vxe-table>
+			  <el-col :span="24">
+				<vxe-table
+				  border
+				  show-footer
+				  show-overflow
+				  :footer-method="footerMethod"
+				  ref="detailTable"
+				  :key="detailKey"
+				  class="vxe-table-element"
+				  :data="inputForm.detailInfos"
+				  style="margin-left: 5em"
+				  highlight-current-row
+				  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
+				  :edit-rules="validRules"
+				>
+				  <vxe-table-column field="userName" title="报销人" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销人', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.userName" @focus="userPullListForm(scope.$rowIndex)"></el-input>
+					  <!--              <UserSelectV2 :limit='1' :userName="scope.row.userName" @getValue='(value, label) => {scope.row.userName = label}'></UserSelectV2>-->
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="deptName" title="报销部门" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input :disabled='true' v-model="scope.row.deptName" ></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.typeName" @focus="typePullForm(scope.$rowIndex)"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.projectName" @focus="openProgramPageForm(scope.$rowIndex, scope.row)"></el-input>
+					</template>
+				  </vxe-table-column>
+	<!--                          <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}">-->
+	<!--                            <template v-slot:edit="scope">-->
+	<!--                              <el-input :readonly="true" v-model="scope.row.reportNumber" @focus="openReportNoPageForm(scope.$rowIndex, scope.row)"></el-input>-->
+	<!--                            </template>-->
+	<!--                          </vxe-table-column>-->
+				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.receiptNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="days" title="出差天数" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.days" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.content" ></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column title="操作" width="100">
+					<template #default="scope">
+					  <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
+					</template>
+				  </vxe-table-column>
+				</vxe-table>
+			  </el-col>
           </el-row>
         </div>
         <div v-if="inputForm.sourceType === '2'">
@@ -206,74 +208,76 @@
             </el-button>
           </el-divider>
           <el-row  :gutter="15" >
-            <vxe-table
-              border
-              show-footer
-              show-overflow
-              :footer-method="footerMethod"
-              ref="detailTableContract"
-              :key="detailKeyContract"
-              class="vxe-table-element"
-              :data="inputForm.detailInfoContracts"
-              style="margin-left: 5em"
-              @cell-click=""
-              @edit-closed=""
-              highlight-current-row
-              :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-              :edit-rules="validRules"
-            >
-              <vxe-table-column field="userName" title="报销人" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销人', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.userName" @focus="userPullListForm2(scope.$rowIndex)"></el-input>
-                  <!--              <UserSelectV2 :limit='1' :userName="scope.row.userName" @getValue='(value, label) => {scope.row.userName = label}'></UserSelectV2>-->
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="deptName" title="报销部门" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input :disabled='true' v-model="scope.row.deptName" ></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.typeName" @focus="typePullForm2(scope.$rowIndex)"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="contractName" title="报销合同" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销合同', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.contractName" @focus="openContractForm(scope.$rowIndex, scope.row)"></el-input>
-                </template>
-              </vxe-table-column>
-              <!--            <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}">-->
-              <!--              <template v-slot:edit="scope">-->
-              <!--                <el-input :readonly="true" v-model="scope.row.reportNumber" @focus="openReportNoPageForm(scope.$rowIndex, scope.row)"></el-input>-->
-              <!--              </template>-->
-              <!--            </vxe-table-column>-->
-              <vxe-table-column field="number" title="费用(元)" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.receiptNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="days" title="出差天数" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.days" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.content" ></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column title="操作" width="100">
-                <template #default="scope">
-                  <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
-                </template>
-              </vxe-table-column>
-            </vxe-table>
+			  <el-col :span="24">
+				<vxe-table
+				  border
+				  show-footer
+				  show-overflow
+				  :footer-method="footerMethod"
+				  ref="detailTableContract"
+				  :key="detailKeyContract"
+				  class="vxe-table-element"
+				  :data="inputForm.detailInfoContracts"
+				  style="margin-left: 5em"
+				  @cell-click=""
+				  @edit-closed=""
+				  highlight-current-row
+				  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
+				  :edit-rules="validRules"
+				>
+				  <vxe-table-column field="userName" title="报销人" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销人', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.userName" @focus="userPullListForm2(scope.$rowIndex)"></el-input>
+					  <!--              <UserSelectV2 :limit='1' :userName="scope.row.userName" @getValue='(value, label) => {scope.row.userName = label}'></UserSelectV2>-->
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="deptName" title="报销部门" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input :disabled='true' v-model="scope.row.deptName" ></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.typeName" @focus="typePullForm2(scope.$rowIndex)"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="contractName" title="报销合同" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销合同', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.contractName" @focus="openContractForm(scope.$rowIndex, scope.row)"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <!--            <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}">-->
+				  <!--              <template v-slot:edit="scope">-->
+				  <!--                <el-input :readonly="true" v-model="scope.row.reportNumber" @focus="openReportNoPageForm(scope.$rowIndex, scope.row)"></el-input>-->
+				  <!--              </template>-->
+				  <!--            </vxe-table-column>-->
+				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.receiptNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="days" title="出差天数" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.days" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.content" ></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column title="操作" width="100">
+					<template #default="scope">
+					  <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'detail')">删除</el-button>
+					</template>
+				  </vxe-table-column>
+				</vxe-table>
+			  </el-col>
           </el-row>
         </div>
         <div v-if="inputForm.sourceType === '3'">
@@ -443,74 +447,76 @@
             </el-button>
           </el-divider>
           <el-row  :gutter="15" >
-            <vxe-table
-              border
-              show-footer
-              show-overflow
-              :footer-method="footerMethod"
-              ref="detailTableProcured"
-              class="vxe-table-element"
-              :data="inputForm.detailInfoProcured"
-              style="margin-left: 5em"
-              :key="detailKeyProcured"
-              @cell-click=""
-              @edit-closed=""
-              highlight-current-row
-              :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
-              :edit-rules="validRules"
-            >
-              <vxe-table-column field="userName" title="报销人" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销人', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.userName" @focus="userPullListForm5(scope.$rowIndex)"></el-input>
-                  <!--              <UserSelectV2 :limit='1' :userName="scope.row.userName" @getValue='(value, label) => {scope.row.userName = label}'></UserSelectV2>-->
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="deptName" title="报销部门" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input :disabled='true' v-model="scope.row.deptName" ></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.typeName" @focus="typePullForm5(scope.$rowIndex)"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.projectName" @focus="openProgramPageForm5(scope.$rowIndex, scope.row)"></el-input>
-                </template>
-              </vxe-table-column>
-              <!--            <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}">-->
-              <!--              <template v-slot:edit="scope">-->
-              <!--                <el-input :readonly="true" v-model="scope.row.reportNumber" @focus="openReportNoPageForm(scope.$rowIndex, scope.row)"></el-input>-->
-              <!--              </template>-->
-              <!--            </vxe-table-column>-->
-              <vxe-table-column field="number" title="费用(元)" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
-                <template #edit="scope">
-                  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.receiptNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="days" title="出差天数" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.days" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title">
-                <template #edit="scope">
-                  <el-input v-model="scope.row.content" ></el-input>
-                </template>
-              </vxe-table-column>
-              <vxe-table-column title="操作" width="100">
-                <template #default="scope">
-                  <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'procured')">删除</el-button>
-                </template>
-              </vxe-table-column>
-            </vxe-table>
+			  <el-col :span="24">
+				<vxe-table
+				  border
+				  show-footer
+				  show-overflow
+				  :footer-method="footerMethod"
+				  ref="detailTableProcured"
+				  class="vxe-table-element"
+				  :data="inputForm.detailInfoProcured"
+				  style="margin-left: 5em"
+				  :key="detailKeyProcured"
+				  @cell-click=""
+				  @edit-closed=""
+				  highlight-current-row
+				  :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon:'_'}"
+				  :edit-rules="validRules"
+				>
+				  <vxe-table-column field="userName" title="报销人" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销人', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.userName" @focus="userPullListForm5(scope.$rowIndex)"></el-input>
+					  <!--              <UserSelectV2 :limit='1' :userName="scope.row.userName" @getValue='(value, label) => {scope.row.userName = label}'></UserSelectV2>-->
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="deptName" title="报销部门" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input :disabled='true' v-model="scope.row.deptName" ></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="typeName" title="报销类别" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销类别', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.typeName" @focus="typePullForm5(scope.$rowIndex)"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.projectName" @focus="openProgramPageForm5(scope.$rowIndex, scope.row)"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <!--            <vxe-table-column field="reportNumber" title="报告号" :edit-render="{}">-->
+				  <!--              <template v-slot:edit="scope">-->
+				  <!--                <el-input :readonly="true" v-model="scope.row.reportNumber" @focus="openReportNoPageForm(scope.$rowIndex, scope.row)"></el-input>-->
+				  <!--              </template>-->
+				  <!--            </vxe-table-column>-->
+				  <vxe-table-column field="number" title="费用(元)" :edit-render="{}" show-overflow="title" :rules="[{required: true, message:'请输入费用', trigger:'blur'}]">
+					<template #edit="scope">
+					  <el-input maxlength="15" v-model="scope.row.number" @input="scope.row.number = twoDecimalPlaces(scope.row.number)"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="receiptNumber" title="收据张数" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.receiptNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="days" title="出差天数" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.days" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="content" title="内容" :edit-render="{}" show-overflow="title">
+					<template #edit="scope">
+					  <el-input v-model="scope.row.content" ></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column title="操作" width="100">
+					<template #default="scope">
+					  <el-button size="mini" type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'procured')">删除</el-button>
+					</template>
+				  </vxe-table-column>
+				</vxe-table>
+			</el-col>
           </el-row>
         </div>
 

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

@@ -1442,7 +1442,7 @@
 				  for (let i = 0; i < this.inputForm.invoiceReimbursementFiles.length; i++) {
 					  numbers.push(this.inputForm.invoiceReimbursementFiles[i].number)
 				  }
-				  const decide = await this.reimbursementService.getEffectiveDataByNumbers2(numbers.join(","))
+				  const decide = await this.reimbursementService.getEffectiveDataByNumbers2(numbers.join(","),this.inputForm.id)
 				  // .then((decide) => {
 				  if (!decide.success) {
 					  //进行提醒