|
|
@@ -236,7 +236,7 @@
|
|
|
$("#workAccountList").append("<tr id='workAccountList" + index + "' class='rowSize'>" +
|
|
|
"<td class='hide'>" +
|
|
|
"<input id='workAccountList" + index + "_id' name='workAccountList[" + index + "].id' type='hidden' value='" + obj.id + "'/>" +
|
|
|
- "<input id='workAccountList" + index + "_file' type='file' multiple='multiple' style='display: none;' onChange='newInsertTitleInvoiceReimbursement(workAccountList" + index + "_id,workAccountList" + index + "_file);'/>" +
|
|
|
+ "<input id='workAccountList" + index + "_file' type='file' multiple='multiple' style='display: none;' onclick='this.value = null' onChange='newInsertTitleInvoiceReimbursement(workAccountList" + index + "_id,workAccountList" + index + "_file);'/>" +
|
|
|
"<input id='workAccountList" + index + "_projectRadio' name='workAccountList[" + index + "].projectRadio' type='hidden' value='" + (obj.projectRadio ?? "") + "'/>" +
|
|
|
"<input id='workAccountList" + index + "_delFlag' name='workAccountList[" + index + "].delFlag' type='hidden' value='0'/>" +
|
|
|
"</td>" +
|
|
|
@@ -1280,10 +1280,12 @@
|
|
|
for (var i = 0; i < attachmentFileLength; i++) {
|
|
|
var fileName = ""; // 每次循环初始化,避免残留上一次的值
|
|
|
var previewA = null;
|
|
|
+ var invoiceNumber = null;
|
|
|
|
|
|
// 安全获取a标签:先判断attachmentFile[i]是否存在,再查找a标签
|
|
|
if (attachmentFile && attachmentFile[i]) {
|
|
|
previewA = attachmentFile[i].querySelector("a.attention-info");
|
|
|
+ invoiceNumber = $("#reimbursementElectronicInvoiceVATTaxes"+i+"_invoiceNumber").val();
|
|
|
}
|
|
|
|
|
|
// 只有在找到a标签时才获取文件名
|
|
|
@@ -1296,7 +1298,16 @@
|
|
|
var disposeFileName = await fileNameDispose(file);
|
|
|
if(fileName === disposeFileName.trim()){
|
|
|
fileNameFlag = false; // 存在重复文件
|
|
|
+ }
|
|
|
+ var formdata = new FormData();
|
|
|
+ formdata.append("multipartFile", file);
|
|
|
+ formdata.append("id", id);
|
|
|
+ const fileData = await uploadXmlFile(formdata);
|
|
|
+ if(invoiceNumber == fileData.InvoiceNumber){
|
|
|
+ fileNameFlag = false; // 存在重复文件
|
|
|
break; // 跳出循环,无需继续检查
|
|
|
+ }else{
|
|
|
+ fileNameFlag = true; // 无重复文件
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -2513,7 +2524,7 @@
|
|
|
<tr id="workAccountList{{idx}}">
|
|
|
<td class="hide">
|
|
|
<input id="workAccountList{{idx}}_id" name="workAccountList[{{idx}}].id" type="hidden" value="{{row.id}}" />
|
|
|
- <input id="workAccountList{{idx}}_file" type="file" multiple="multiple" style="display: none;" onChange="newInsertTitleInvoiceReimbursement(workAccountList{{idx}}_id,workAccountList{{idx}}_file);"/>
|
|
|
+ <input id="workAccountList{{idx}}_file" type="file" multiple="multiple" style="display: none;" onclick='this.value = null' onChange="newInsertTitleInvoiceReimbursement(workAccountList{{idx}}_id,workAccountList{{idx}}_file);"/>
|
|
|
|
|
|
<input id="workAccountList{{idx}}_projectRadio" name="workAccountList[{{idx}}].projectRadio" type="hidden" value="{{row.projectRadio}}"/>
|
|
|
<input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
|