|
|
@@ -114,7 +114,7 @@
|
|
|
$("#attachment_file").click();
|
|
|
});
|
|
|
$("#attachment_btn_InvoiceReimbursement").click(function () {
|
|
|
- $("#attachment_file_InvoiceReimbursement").click();
|
|
|
+ $("#attachment_InvoiceReimbursement_file").click();
|
|
|
});
|
|
|
// getRandom();
|
|
|
|
|
|
@@ -545,7 +545,7 @@
|
|
|
var list = "${workReimbursement.workAttachmentInvoiceReimbursements}";
|
|
|
var id = "${workReimbursement.id}";
|
|
|
var size = (list.split('url')).length-1;
|
|
|
- var files = $("#attachment_file_InvoiceReimbursement")[0].files;
|
|
|
+ var files = $("#attachment_InvoiceReimbursement_file")[0].files;
|
|
|
//判断报销类型是否为电子报销
|
|
|
for(var i = 0;i<files.length;i++) {
|
|
|
var file = files[i];
|
|
|
@@ -579,7 +579,7 @@
|
|
|
for(var i = 0;i < trlen;i++){
|
|
|
var invoiceNumber = $("#reimbursementElectronicInvoiceVATTaxes tr").eq(i).find("td").eq(3).find("input").eq(0).val();
|
|
|
|
|
|
- if(invoiceNumber === data.InvoiceNumber){
|
|
|
+ if(invoiceNumber === data.InvoiceNumber && data.InvoiceNumber){
|
|
|
includeFlag = true
|
|
|
//数据处理
|
|
|
$("#reimbursementElectronicInvoiceVATTaxes tr").eq(i).find("td").eq(0).find("input").eq(2).val(data.InherentLabelGeneralOrSpecialVATLabelCode);
|
|
|
@@ -597,7 +597,7 @@
|
|
|
}
|
|
|
}
|
|
|
//若发票号不存在。则新增行将对应信息添加进去
|
|
|
- if(!includeFlag){
|
|
|
+ if(!includeFlag && data.InvoiceNumber){
|
|
|
addRow('#reimbursementElectronicInvoiceVATTaxes', reimbursementElectronicInvoiceVATTaxesRowIdx, reimbursementElectronicInvoiceVATTaxesTpl);
|
|
|
|
|
|
$("#reimbursementElectronicInvoiceVATTaxes tr").eq(trlen).find("td").eq(0).find("input").eq(0).val("");
|
|
|
@@ -1276,7 +1276,7 @@
|
|
|
</td>
|
|
|
<%--发票项目名--%>
|
|
|
<td>
|
|
|
- <input id="reimbursementElectronicInvoiceVATTaxes${index.index}_invoiceProjectName" onmouseover="this.title=this.value" readOnly="true" maxlength="50" name="reimbursementElectronicInvoiceVATTaxes[${index.index}].invoiceProjectName" type="text" value="${reimbursementElectronicInvoiceVATTaxes.invoiceProjectName}" onmouseover="this.title=this.value" placeholder="请输入发票项目名" class="form-control judgment "/>
|
|
|
+ <input id="reimbursementElectronicInvoiceVATTaxes${index.index}_invoiceProjectName" onmouseover="this.title=this.value" readOnly="true" maxlength="500" name="reimbursementElectronicInvoiceVATTaxes[${index.index}].invoiceProjectName" type="text" value="${reimbursementElectronicInvoiceVATTaxes.invoiceProjectName}" onmouseover="this.title=this.value" placeholder="请输入发票项目名" class="form-control judgment "/>
|
|
|
</td>
|
|
|
<%--发票号--%>
|
|
|
<td>
|
|
|
@@ -1327,7 +1327,7 @@
|
|
|
</td>
|
|
|
<%--发票项目名--%>
|
|
|
<td>
|
|
|
- <input id="reimbursementElectronicInvoiceVATTaxes{{idx}}_invoiceProjectName" readOnly="true" onmouseover="this.title=this.value" maxlength="50" name="reimbursementElectronicInvoiceVATTaxes[{{idx}}].invoiceProjectName" type="text" value="{{row.invoiceNumber}}" onmouseover="this.title=this.value" placeholder="请输入发票项目名" class="form-control judgment "/>
|
|
|
+ <input id="reimbursementElectronicInvoiceVATTaxes{{idx}}_invoiceProjectName" readOnly="true" onmouseover="this.title=this.value" maxlength="500" name="reimbursementElectronicInvoiceVATTaxes[{{idx}}].invoiceProjectName" type="text" value="{{row.invoiceNumber}}" onmouseover="this.title=this.value" placeholder="请输入发票项目名" class="form-control judgment "/>
|
|
|
</td>
|
|
|
<%--发票号--%>
|
|
|
<td>
|
|
|
@@ -1395,7 +1395,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <input id="attachment_file_InvoiceReimbursement" type="file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitleInvoiceReimbursement(this.value);"/>
|
|
|
+ <input id="attachment_InvoiceReimbursement_file" type="file" multiple="multiple" style="display: none;" onChange="if(this.value)insertTitleInvoiceReimbursement(this.value);"/>
|
|
|
<span id="attachment_title"></span>
|
|
|
<div class="layui-item layui-col-xs12" style="padding:0 16px;">
|
|
|
<table id="listAttachment" class="table table-bordered table-condensed details">
|
|
|
@@ -1562,7 +1562,7 @@
|
|
|
<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn op-btn-delete" style="background-color: #FFB800"><i class="layui-icon layui-icon-rate"></i> 收藏</a>
|
|
|
</c:if>
|
|
|
<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
|
|
|
- <a href="javascript:void(0)" onclick="deleteFileFromAliyunByInvoiceReimbursement(this,'${ctx}/sys/workattachment/deleteFileFromAliyunByInvoiceReimbursement?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment','_attachment')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i> 删除</a>
|
|
|
+ <a href="javascript:void(0)" onclick="deleteFileFromAliyunByInvoiceReimbursement(this,'${ctx}/sys/workattachment/deleteFileFromAliyunByInvoiceReimbursement?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile_attachment_InvoiceReimbursement','_attachment_InvoiceReimbursement')" class="op-btn op-btn-delete" ><i class="fa fa-trash"></i> 删除</a>
|
|
|
</c:if>
|
|
|
|
|
|
</div>
|
user5