报销可上传相同名称，不同发票号的发票

src/main/webapp/webpage/modules/workreimbursement/treeForm/all/workReimbursementAllFormAdd.jsp

@@ -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>" +
@@ -1209,6 +1209,7 @@
 
 
         async function newInsertTitleInvoiceReimbursement(idValue,fileValue) {
+            console.log(8888888888)
             // 将原生DOM元素转换为jQuery对象（关键修复）
             var $idElement = $(idValue);
             // 再调用attr()方法获取name属性
@@ -1283,7 +1284,6 @@
                                 }
                                 //reimbursementElectronicInvoiceVATTaxesRowIdx++;
                             }
-
                         }
                     } catch (error) {
                         console.error('文件上传失败', error);
@@ -1295,6 +1295,7 @@
                     return false;
                 }
             }
+            files.value=""
         }
 
         // 处理文件上传
@@ -1309,23 +1310,33 @@
             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标签时才获取文件名
                 if (previewA) {
                     fileName = (previewA.textContent || "").trim() || (previewA.innerText || "").trim();
                 }
-
                 // 对比文件名（同时确保file和file.name存在）
                 if (file && file.name ) {
                     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; // 无重复文件
                     }
                 }
             }
@@ -2541,7 +2552,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"/>

src/main/webapp/webpage/modules/workreimbursement/treeForm/all/workReimbursementAllModifyApply.jsp

@@ -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>" +
@@ -1290,10 +1290,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标签时才获取文件名
@@ -1304,9 +1306,22 @@
                 // 对比文件名（同时确保file和file.name存在）
                 if (file && file.name ) {
                     var disposeFileName = await fileNameDispose(file);
-                    if(fileName === disposeFileName.trim()){
-                        fileNameFlag = false; // 存在重复文件
-                        break; // 跳出循环，无需继续检查
+                    // 对比文件名（同时确保file和file.name存在）
+                    if (file && file.name ) {
+                        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; // 无重复文件
+                        }
                     }
                 }
             }
@@ -2527,7 +2542,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"/>

src/main/webapp/webpage/modules/workreimbursement/treeForm/new/workReimbursementNewFormAdd.jsp

@@ -237,7 +237,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>" +
@@ -1308,17 +1308,16 @@
             var fileName = "";
             var fileNameFlag = true;
 
-
             // 检查文件是否已上传
             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标签时才获取文件名
                 if (previewA) {
                     fileName = (previewA.textContent || "").trim() || (previewA.innerText || "").trim();
@@ -1327,9 +1326,23 @@
                 // 对比文件名（同时确保file和file.name存在）
                 if (file && file.name ) {
                     var disposeFileName = await fileNameDispose(file);
-                    if(fileName === disposeFileName.trim()){
-                        fileNameFlag = false; // 存在重复文件
-                        break; // 跳出循环，无需继续检查
+
+                    // 对比文件名（同时确保file和file.name存在）
+                    if (file && file.name ) {
+                        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; // 无重复文件
+                        }
                     }
                 }
             }
@@ -2548,7 +2561,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"/>
@@ -2652,7 +2665,7 @@
                                     </td>
 
                                     <td>
-                                        <input id="reimbursementVATTaxes${index.index}_invoiceNumber" maxlength="30" name="reimbursementVATTaxes[${index.index}].invoiceNumber" type="text" maxlength="32" value="${reimbursementVATTaxes.invoiceNumber}"  placeholder="请输入发票号"  class="form-control judgment number "/>
+                                        <input id="reimbursementVATTaxes${index.index}_invoiceNumber" maxlength="30" name="reimbursementVATTaxes[${index.index}].invoiceNumber" type="text" maxlength="32" value="${reimbursementVATTaxes.invoiceNumber}"  placeholder="请输入发票号"  class="form-control judgment number"/>
                                     </td>
                                     <td>
                                         <input id="reimbursementVATTaxes${index.index}_money" onchange="getMoneyVATT(${index.index})" name="reimbursementVATTaxes[${index.index}].money" type="text" maxlength="32" value="${reimbursementVATTaxes.money}"  placeholder="请输入金额"  class="form-control judgment number "/>

src/main/webapp/webpage/modules/workreimbursement/treeForm/new/workReimbursementNewModifyApply.jsp

@@ -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>" +
@@ -1287,10 +1287,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标签时才获取文件名
@@ -1301,9 +1303,22 @@
                 // 对比文件名（同时确保file和file.name存在）
                 if (file && file.name ) {
                     var disposeFileName = await fileNameDispose(file);
-                    if(fileName === disposeFileName.trim()){
-                        fileNameFlag = false; // 存在重复文件
-                        break; // 跳出循环，无需继续检查
+                    // 对比文件名（同时确保file和file.name存在）
+                    if (file && file.name ) {
+                        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; // 无重复文件
+                        }
                     }
                 }
             }
@@ -2525,7 +2540,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"/>

src/main/webapp/webpage/modules/workreimbursement/treeForm/specific/workReimbursementSpecificModifyApply.jsp

@@ -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>" +
@@ -1293,10 +1293,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标签时才获取文件名
@@ -1307,9 +1309,22 @@
                 // 对比文件名（同时确保file和file.name存在）
                 if (file && file.name ) {
                     var disposeFileName = await fileNameDispose(file);
-                    if(fileName === disposeFileName.trim()){
-                        fileNameFlag = false; // 存在重复文件
-                        break; // 跳出循环，无需继续检查
+                    // 对比文件名（同时确保file和file.name存在）
+                    if (file && file.name ) {
+                        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; // 无重复文件
+                        }
                     }
                 }
             }
@@ -2530,7 +2545,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"/>