报销恢复新增功能，修改提示文字

src/main/java/com/jeeplus/modules/workreimbursement/entity/WorkAccount.java

@@ -34,7 +34,7 @@ public class WorkAccount extends DataEntity<WorkAccount> {
     private BigDecimal money;  //报销费用（元）
 	private BigDecimal eInvoiceMoney;		// 数电发票报销金额
 	private BigDecimal invoiceMoney;		// 普通发票报销金额
-	private BigDecimal subsidyMoney;		// 补贴金额
+	private BigDecimal subsidyMoney;		// 其他金额
 	private BigDecimal tax; //税金（元）
 	private WorkReimbursement workReimbursement;		// 报销单主键 父类
 	private List<WorkAccountAudit> workAccountAuditList;		// 报销单主键 父类

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

@@ -275,7 +275,7 @@
                                     "</td>" +
 
                                     "<td>" +
-                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='补贴金额' maxlength='10'  class='form-control number'/>" +
+                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='其他金额' maxlength='10'  class='form-control number'/>" +
                                     "</td>" +
 
                                     "<td>" +
@@ -2342,7 +2342,9 @@
                             <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogView('历史调整信息', '${ctx}/workReimbursementNew/workReimbursementNew/historyReimbursementInfo?id=${workReimbursement.id}','1100px', '35%','','关闭')" class="layui-btn layui-btn-sm" >历史调整信息</a>
                         </c:if>
                     </div>
-                    <h2>基础信息</h2>
+                    <h2>基础信息
+                        <span style="color: red;font-size: 14px"> （每个报销流程仅针对一张白色或蓝色报销单。提交报销单时需要将报销编号书写在报销单右上角处，流程生成后可在列表中查看报销编号）</span>
+                    </h2>
                 </div>
                     <%--<div class="layui-item layui-col-sm6">
                         <label class="layui-form-label"><span class="require-item">*</span>报销类型：</label>
@@ -2394,15 +2396,15 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
-                    <%--<div class="layui-item nav-btns">
+                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
+                    <div class="layui-item nav-btns">
                         <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
-                    </div>--%>
+                    </div>
                 <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
                         <thead>
                         <tr>
-                            <th style="width: 50px;padding: 0px" rowspan="2">报销单</th>
+                            <th style="width: 50px;padding: 0px" rowspan="2">报销项</th>
                             <th style="width:150px" rowspan="2"><font color="red">*</font>报销人</th>
                             <th style="width:150px" rowspan="2">报销部门</th>
                             <th style="width:180px" rowspan="2"><font color="red">*</font>报销类型</th>
@@ -2420,7 +2422,7 @@
                             <!-- 费用子表头 -->
                             <th style="width:100px">数电发票</th>
                             <th style="width:100px">非数电票</th>
-                            <th style="width:100px">补贴</th>
+                            <th style="width:100px">其他</th>
                             <th style="width:100px"><font color="red">*</font>汇总</th>
                             <!-- 收据张数子表头 -->
                             <th style="width:100px">数电发票</th>
@@ -2473,7 +2475,7 @@
                                             <input id="workAccountList${index.index}_invoiceMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].invoiceMoney" type="text" value="${workAccount.invoiceMoney}"  placeholder="非数电票金额" maxlength="10"  class="form-control number"/>
                                         </td>
                                         <td>
-                                            <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                                            <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                                         </td>
                                         <td>
                                             <input id="workAccountList${index.index}_money" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  readonly="readonly"  class="form-control number judgment" style="background-color: #f5f5f5;"/>
@@ -2574,7 +2576,7 @@
                     <input id="workAccountList{{idx}}_invoiceMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].invoiceMoney" type="text" value="{{row.invoiceMoney}}"  placeholder="非数电票金额" maxlength="10" class="form-control number"/>
                 </td>
                 <td>
-                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                 </td>
                 <td>
                     <input id="workAccountList{{idx}}_money" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  readonly="readonly" class="form-control number judgment" style="background-color: #f5f5f5;"/>

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

@@ -214,7 +214,7 @@
                                     "</td>" +
 
                                     "<td>" +
-                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' readonly name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='补贴金额' maxlength='10'  class='form-control number'/>" +
+                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' readonly name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='其他金额' maxlength='10'  class='form-control number'/>" +
                                     "</td>" +
 
                                     "<td>" +
@@ -813,7 +813,7 @@
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
                         <thead>
                         <tr>
-                            <th style="width: 50px;padding: 0px" rowspan="2">报销单</th>
+                            <th style="width: 50px;padding: 0px" rowspan="2">报销项</th>
                             <th style="width:150px" rowspan="2"><font color="red">*</font>报销人</th>
                             <th style="width:150px" rowspan="2">报销部门</th>
                             <th style="width:180px" rowspan="2"><font color="red">*</font>报销类型</th>
@@ -831,7 +831,7 @@
                             <!-- 费用子表头 -->
                             <th style="width:100px">数电发票</th>
                             <th style="width:100px">非数电票</th>
-                            <th style="width:100px">补贴</th>
+                            <th style="width:100px">其他</th>
                             <th style="width:100px"><font color="red">*</font>汇总</th>
                             <!-- 收据张数子表头 -->
                             <th style="width:100px">数电发票</th>

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

@@ -275,7 +275,7 @@
                                     "</td>" +
 
                                     "<td>" +
-                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='补贴金额' maxlength='10'  class='form-control number'/>" +
+                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='其他金额' maxlength='10'  class='form-control number'/>" +
                                     "</td>" +
 
                                     "<td>" +
@@ -2329,7 +2329,9 @@
                             <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogView('历史调整信息', '${ctx}/workReimbursementNew/workReimbursementNew/historyReimbursementInfo?id=${workReimbursement.id}','1100px', '35%','','关闭')" class="layui-btn layui-btn-sm" >历史调整信息</a>
                         </c:if>
                     </div>
-                    <h2>基础信息</h2>
+                    <h2>基础信息
+                        <span style="color: red;font-size: 14px"> （每个报销流程仅针对一张白色或蓝色报销单。提交报销单时需要将报销编号书写在报销单右上角处，流程生成后可在列表中查看报销编号）</span>
+                    </h2>
                 </div>
                     <%--<div class="layui-item layui-col-sm6">
                         <label class="layui-form-label"><span class="require-item">*</span>报销类型：</label>
@@ -2381,15 +2383,15 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
-                    <%--<div class="layui-item nav-btns">
+                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
+                    <div class="layui-item nav-btns">
                         <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
-                    </div>--%>
+                    </div>
                 <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
                         <thead>
                         <tr>
-                            <th style="width: 50px;padding: 0px" rowspan="2">报销单</th>
+                            <th style="width: 50px;padding: 0px" rowspan="2">报销项</th>
                             <th style="width:150px" rowspan="2"><font color="red">*</font>报销人</th>
                             <th style="width:150px" rowspan="2">报销部门</th>
                             <th style="width:180px" rowspan="2"><font color="red">*</font>报销类型</th>
@@ -2407,7 +2409,7 @@
                             <!-- 费用子表头 -->
                             <th style="width:100px">数电发票</th>
                             <th style="width:100px">非数电票</th>
-                            <th style="width:100px">补贴</th>
+                            <th style="width:100px">其他</th>
                             <th style="width:100px"><font color="red">*</font>汇总</th>
                             <!-- 收据张数子表头 -->
                             <th style="width:100px">数电发票</th>
@@ -2460,7 +2462,7 @@
                                             <input id="workAccountList${index.index}_invoiceMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].invoiceMoney" type="text" value="${workAccount.invoiceMoney}"  placeholder="非数电票金额" maxlength="10"  class="form-control number"/>
                                         </td>
                                         <td>
-                                            <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                                            <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                                         </td>
                                         <td>
                                             <input id="workAccountList${index.index}_money" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  readonly="readonly"  class="form-control number required" style="background-color: #f5f5f5;"/>
@@ -2561,7 +2563,7 @@
                     <input id="workAccountList{{idx}}_invoiceMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].invoiceMoney" type="text" value="{{row.invoiceMoney}}"  placeholder="非数电票金额" maxlength="10" class="form-control number"/>
                 </td>
                 <td>
-                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                 </td>
                 <td>
                     <input id="workAccountList{{idx}}_money" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  readonly="readonly" class="form-control number required" style="background-color: #f5f5f5;"/>

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

@@ -214,7 +214,7 @@
                                     "</td>" +
 
                                     "<td>" +
-                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' readonly name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='补贴金额' maxlength='10'  class='form-control number'/>" +
+                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' readonly name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='其他金额' maxlength='10'  class='form-control number'/>" +
                                     "</td>" +
 
                                     "<td>" +
@@ -868,7 +868,7 @@
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
                         <thead>
                         <tr>
-                            <th style="width: 50px;padding: 0px" rowspan="2">报销单</th>
+                            <th style="width: 50px;padding: 0px" rowspan="2">报销项</th>
                             <th style="width:150px" rowspan="2"><font color="red">*</font>报销人</th>
                             <th style="width:150px" rowspan="2">报销部门</th>
                             <th style="width:180px" rowspan="2"><font color="red">*</font>报销类型</th>
@@ -886,7 +886,7 @@
                             <!-- 费用子表头 -->
                             <th style="width:100px">数电发票</th>
                             <th style="width:100px">非数电票</th>
-                            <th style="width:100px">补贴</th>
+                            <th style="width:100px">其他</th>
                             <th style="width:100px"><font color="red">*</font>汇总</th>
                             <!-- 收据张数子表头 -->
                             <th style="width:100px">数电发票</th>

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

@@ -276,7 +276,7 @@
                                     "</td>" +
 
                                     "<td>" +
-                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='补贴金额' maxlength='10'  class='form-control number'/>" +
+                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='其他金额' maxlength='10'  class='form-control number'/>" +
                                     "</td>" +
 
                                     "<td>" +
@@ -2388,7 +2388,9 @@
                             <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogView('历史调整信息', '${ctx}/workReimbursementNew/workReimbursementNew/historyReimbursementInfo?id=${workReimbursement.id}','1100px', '35%','','关闭')" class="layui-btn layui-btn-sm" >历史调整信息</a>
                         </c:if>
                     </div>
-                    <h2>基础信息</h2>
+                    <h2>基础信息
+                        <span style="color: red;font-size: 14px"> （每个报销流程仅针对一张白色或蓝色报销单。提交报销单时需要将报销编号书写在报销单右上角处，流程生成后可在列表中查看报销编号）</span>
+                    </h2>
                 </div>
                     <%--<div class="layui-item layui-col-sm6">
                         <label class="layui-form-label"><span class="require-item">*</span>报销类型：</label>
@@ -2440,15 +2442,15 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
-                    <%--<div class="layui-item nav-btns">
+                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
+                    <div class="layui-item nav-btns">
                         <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
-                    </div>--%>
+                    </div>
                 <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
                         <thead>
                         <tr>
-                            <th style="width: 50px;padding: 0px" rowspan="2">报销单</th>
+                            <th style="width: 50px;padding: 0px" rowspan="2">报销项</th>
                             <th style="width:150px" rowspan="2"><font color="red">*</font>报销人</th>
                             <th style="width:150px" rowspan="2">报销部门</th>
                             <th style="width:180px" rowspan="2"><font color="red">*</font>报销类型</th>
@@ -2466,7 +2468,7 @@
                             <!-- 费用子表头 -->
                             <th style="width:100px">数电发票</th>
                             <th style="width:100px">非数电票</th>
-                            <th style="width:100px">补贴</th>
+                            <th style="width:100px">其他</th>
                             <th style="width:100px"><font color="red">*</font>汇总</th>
                             <!-- 收据张数子表头 -->
                             <th style="width:100px">数电发票</th>
@@ -2519,7 +2521,7 @@
                                             <input id="workAccountList${index.index}_invoiceMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].invoiceMoney" type="text" value="${workAccount.invoiceMoney}"  placeholder="非数电票金额" maxlength="10"  class="form-control number"/>
                                         </td>
                                         <td>
-                                            <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                                            <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                                         </td>
                                         <td>
                                             <input id="workAccountList${index.index}_money" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  readonly="readonly"  class="form-control number judgment" style="background-color: #f5f5f5;"/>
@@ -2620,7 +2622,7 @@
                     <input id="workAccountList{{idx}}_invoiceMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].invoiceMoney" type="text" value="{{row.invoiceMoney}}"  placeholder="非数电票金额" maxlength="10" class="form-control number"/>
                 </td>
                 <td>
-                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                 </td>
                 <td>
                     <input id="workAccountList{{idx}}_money" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  readonly="readonly" class="form-control number judgment" style="background-color: #f5f5f5;"/>

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

@@ -275,7 +275,7 @@
                                     "</td>" +
 
                                     "<td>" +
-                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='补贴金额' maxlength='10'  class='form-control number'/>" +
+                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='其他金额' maxlength='10'  class='form-control number'/>" +
                                     "</td>" +
 
                                     "<td>" +
@@ -2327,7 +2327,9 @@
                             <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogView('历史调整信息', '${ctx}/workReimbursementNew/workReimbursementNew/historyReimbursementInfo?id=${workReimbursement.id}','1100px', '35%','','关闭')" class="layui-btn layui-btn-sm" >历史调整信息</a>
                         </c:if>
                     </div>
-                    <h2>基础信息</h2>
+                    <h2>基础信息
+                        <span style="color: red;font-size: 14px"> （每个报销流程仅针对一张白色或蓝色报销单。提交报销单时需要将报销编号书写在报销单右上角处，流程生成后可在列表中查看报销编号）</span>
+                    </h2>
                 </div>
                     <%--<div class="layui-item layui-col-sm6">
                         <label class="layui-form-label"><span class="require-item">*</span>报销类型：</label>
@@ -2379,15 +2381,15 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
-                    <%--<div class="layui-item nav-btns">
+                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
+                    <div class="layui-item nav-btns">
                         <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
-                    </div>--%>
+                    </div>
                 <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
                         <thead>
                         <tr>
-                            <th style="width: 50px;padding: 0px" rowspan="2">报销单</th>
+                            <th style="width: 50px;padding: 0px" rowspan="2">报销项</th>
                             <th style="width:150px" rowspan="2"><font color="red">*</font>报销人</th>
                             <th style="width:150px" rowspan="2">报销部门</th>
                             <th style="width:180px" rowspan="2"><font color="red">*</font>报销类型</th>
@@ -2405,7 +2407,7 @@
                             <!-- 费用子表头 -->
                             <th style="width:100px">数电发票</th>
                             <th style="width:100px">非数电票</th>
-                            <th style="width:100px">补贴</th>
+                            <th style="width:100px">其他</th>
                             <th style="width:100px"><font color="red">*</font>汇总</th>
                             <!-- 收据张数子表头 -->
                             <th style="width:100px">数电发票</th>
@@ -2458,7 +2460,7 @@
                                             <input id="workAccountList${index.index}_invoiceMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].invoiceMoney" type="text" value="${workAccount.invoiceMoney}"  placeholder="非数电票金额" maxlength="10"  class="form-control number"/>
                                         </td>
                                         <td>
-                                            <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                                            <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                                         </td>
                                         <td>
                                             <input id="workAccountList${index.index}_money" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  readonly="readonly"  class="form-control number required" style="background-color: #f5f5f5;"/>
@@ -2559,7 +2561,7 @@
                     <input id="workAccountList{{idx}}_invoiceMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].invoiceMoney" type="text" value="{{row.invoiceMoney}}"  placeholder="非数电票金额" maxlength="10" class="form-control number"/>
                 </td>
                 <td>
-                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                 </td>
                 <td>
                     <input id="workAccountList{{idx}}_money" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  readonly="readonly" class="form-control number required" style="background-color: #f5f5f5;"/>

src/main/webapp/webpage/modules/workreimbursement/treeForm/replenish/workReimbursementReplenishAudit.jsp

@@ -275,7 +275,7 @@
 										"</td>" +
 
 										"<td>" +
-										"<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='补贴金额' maxlength='10'  class='form-control number'/>" +
+										"<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='其他金额' maxlength='10'  class='form-control number'/>" +
 										"</td>" +
 
 										"<td>" +
@@ -2318,7 +2318,9 @@
 							<a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogView('历史调整信息', '${ctx}/workReimbursementNew/workReimbursementNew/historyReimbursementInfo?id=${workReimbursement.id}','1100px', '35%','','关闭')" class="layui-btn layui-btn-sm" >历史调整信息</a>
 						</c:if>
 					</div>
-					<h2>基础信息</h2>
+					<h2>基础信息
+						<span style="color: red;font-size: 14px"> （每个报销流程仅针对一张白色或蓝色报销单。提交报销单时需要将报销编号书写在报销单右上角处，流程生成后可在列表中查看报销编号）</span>
+					</h2>
 				</div>
 					<%--<div class="layui-item layui-col-sm6">
                         <label class="layui-form-label"><span class="require-item">*</span>报销类型：</label>
@@ -2368,7 +2370,7 @@
 				</div>
 			</div>
 			<div class="form-group layui-row">
-				<div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
+				<div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
 				<div class="layui-item nav-btns">
 					<a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
 				</div>
@@ -2376,7 +2378,7 @@
 					<table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
 						<thead>
 						<tr>
-							<th style="width: 50px;padding: 0px" rowspan="2">报销单</th>
+							<th style="width: 50px;padding: 0px" rowspan="2">报销项</th>
 							<th style="width:150px" rowspan="2"><font color="red">*</font>报销人</th>
 							<th style="width:150px" rowspan="2">报销部门</th>
 							<th style="width:180px" rowspan="2"><font color="red">*</font>报销类型</th>
@@ -2394,7 +2396,7 @@
 							<!-- 费用子表头 -->
 							<th style="width:100px">数电发票</th>
 							<th style="width:100px">非数电票</th>
-							<th style="width:100px">补贴</th>
+							<th style="width:100px">其他</th>
 							<th style="width:100px"><font color="red">*</font>汇总</th>
 							<!-- 收据张数子表头 -->
 							<th style="width:100px">数电发票</th>
@@ -2447,7 +2449,7 @@
                                             <input id="workAccountList${index.index}_invoiceMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].invoiceMoney" type="text" value="${workAccount.invoiceMoney}"  placeholder="非数电票金额" maxlength="10"  class="form-control number"/>
                                         </td>
                                 <td>
-                                    <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                                    <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                                 </td>
                                         <td>
                                             <input id="workAccountList${index.index}_money" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  readonly="readonly"  class="form-control number required" style="background-color: #f5f5f5;"/>
@@ -2548,7 +2550,7 @@
                     <input id="workAccountList{{idx}}_invoiceMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].invoiceMoney" type="text" value="{{row.invoiceMoney}}"  placeholder="非数电票金额" maxlength="10" class="form-control number"/>
                 </td>
                 <td>
-                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                 </td>
                 <td>
                     <input id="workAccountList{{idx}}_money" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  readonly="readonly" class="form-control number required" style="background-color: #f5f5f5;"/>

src/main/webapp/webpage/modules/workreimbursement/treeForm/replenish/workReimbursementReplenishCwAudit.jsp

@@ -214,7 +214,7 @@
 										"</td>" +
 
 										"<td>" +
-										"<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' readonly name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='补贴金额' maxlength='10'  class='form-control number'/>" +
+										"<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' readonly name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='其他金额' maxlength='10'  class='form-control number'/>" +
 										"</td>" +
 
 										"<td>" +
@@ -781,7 +781,7 @@
 					<table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
 						<thead>
 						<tr>
-							<th style="width: 50px;padding: 0px" rowspan="2">报销单</th>
+							<th style="width: 50px;padding: 0px" rowspan="2">报销项</th>
 							<th style="width:150px" rowspan="2"><font color="red">*</font>报销人</th>
 							<th style="width:150px" rowspan="2">报销部门</th>
 							<th style="width:180px" rowspan="2"><font color="red">*</font>报销类型</th>
@@ -799,7 +799,7 @@
 							<!-- 费用子表头 -->
 							<th style="width:100px">数电发票</th>
 							<th style="width:100px">非数电票</th>
-							<th style="width:100px">补贴</th>
+							<th style="width:100px">其他</th>
 							<th style="width:100px"><font color="red">*</font>汇总</th>
 							<!-- 收据张数子表头 -->
 							<th style="width:100px">数电发票</th>

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

@@ -214,7 +214,7 @@
 										"</td>" +
 
 										"<td>" +
-										"<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' readonly name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='补贴金额' maxlength='10'  class='form-control number'/>" +
+										"<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' readonly name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='其他金额' maxlength='10'  class='form-control number'/>" +
 										"</td>" +
 
 										"<td>" +
@@ -846,7 +846,7 @@
 					<table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
 						<thead>
 						<tr>
-							<th style="width: 50px;padding: 0px" rowspan="2">报销单</th>
+							<th style="width: 50px;padding: 0px" rowspan="2">报销项</th>
 							<th style="width:150px" rowspan="2"><font color="red">*</font>报销人</th>
 							<th style="width:150px" rowspan="2">报销部门</th>
 							<th style="width:180px" rowspan="2"><font color="red">*</font>报销类型</th>
@@ -864,7 +864,7 @@
 							<!-- 费用子表头 -->
 							<th style="width:100px">数电发票</th>
 							<th style="width:100px">非数电票</th>
-							<th style="width:100px">补贴</th>
+							<th style="width:100px">其他</th>
 							<th style="width:100px"><font color="red">*</font>汇总</th>
 							<!-- 收据张数子表头 -->
 							<th style="width:100px">数电发票</th>

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

@@ -275,7 +275,7 @@
                                     "</td>" +
 
                                     "<td>" +
-                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='补贴金额' maxlength='10'  class='form-control number'/>" +
+                                    "<input id='workAccountList" + index + "_subsidyMoney' onchange='calculateSum(" + index + ")' name='workAccountList[" + index + "].subsidyMoney' type='text' value='" + (obj.subsidyMoney === null || obj.subsidyMoney === undefined ? "" : obj.subsidyMoney) + "'  placeholder='其他金额' maxlength='10'  class='form-control number'/>" +
                                     "</td>" +
 
                                     "<td>" +
@@ -2333,7 +2333,9 @@
                             <a href="javascript:void(0)" style='background-color: #FFB800' onclick="openDialogView('历史调整信息', '${ctx}/workReimbursementNew/workReimbursementNew/historyReimbursementInfo?id=${workReimbursement.id}','1100px', '35%','','关闭')" class="layui-btn layui-btn-sm" >历史调整信息</a>
                         </c:if>
                     </div>
-                    <h2>基础信息</h2>
+                    <h2>基础信息
+                        <span style="color: red;font-size: 14px"> （每个报销流程仅针对一张白色或蓝色报销单。提交报销单时需要将报销编号书写在报销单右上角处，流程生成后可在列表中查看报销编号）</span>
+                    </h2>
                 </div>
                     <%--<div class="layui-item layui-col-sm6">
                         <label class="layui-form-label"><span class="require-item">*</span>报销类型：</label>
@@ -2385,15 +2387,15 @@
                 </div>
             </div>
             <div class="form-group layui-row">
-                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (每个报销流程仅针对一张白色或蓝色报销单。可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
-<%--                <div class="layui-item nav-btns">--%>
-<%--                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>--%>
-<%--                </div>--%>
+                <div class="form-group-label"><h2>报销详情<span style="color: red;font-size: 14px"> (可在报销单后操作栏新增xml格式数电发票信息)</span></h2></div>
+                <div class="layui-item nav-btns">
+                    <a class="nav-btn nav-btn-add" onclick="addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl,'',true);workAccountListRowIdx = workAccountListRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增报销单</a>
+                </div>
                 <div class="layui-table-body layui-item layui-col-xs12 form-table-container"  style="padding:0px">
                     <table id="contentTable" class="table table-bordered table-condensed can-edit no-bottom-margin details tree_table">
                         <thead>
                         <tr>
-                            <th style="width: 50px;padding: 0px" rowspan="2">报销单</th>
+                            <th style="width: 50px;padding: 0px" rowspan="2">报销项</th>
                             <th style="width:150px" rowspan="2"><font color="red">*</font>报销人</th>
                             <th style="width:150px" rowspan="2">报销部门</th>
                             <th style="width:180px" rowspan="2"><font color="red">*</font>报销类型</th>
@@ -2411,7 +2413,7 @@
                             <!-- 费用子表头 -->
                             <th style="width:100px">数电发票</th>
                             <th style="width:100px">非数电票</th>
-                            <th style="width:100px">补贴</th>
+                            <th style="width:100px">其他</th>
                             <th style="width:100px"><font color="red">*</font>汇总</th>
                             <!-- 收据张数子表头 -->
                             <th style="width:100px">数电发票</th>
@@ -2464,7 +2466,7 @@
                                             <input id="workAccountList${index.index}_invoiceMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].invoiceMoney" type="text" value="${workAccount.invoiceMoney}"  placeholder="非数电票金额" maxlength="10"  class="form-control number"/>
                                         </td>
                                 <td>
-                                    <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                                    <input id="workAccountList${index.index}_subsidyMoney" onchange="calculateSum(${index.index})" name="workAccountList[${index.index}].subsidyMoney" type="text" value="${workAccount.subsidyMoney}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                                 </td>
                                         <td>
                                             <input id="workAccountList${index.index}_money" name="workAccountList[${index.index}].money" type="text" value="${workAccount.money}"  readonly="readonly"  class="form-control number required" style="background-color: #f5f5f5;"/>
@@ -2565,7 +2567,7 @@
                     <input id="workAccountList{{idx}}_invoiceMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].invoiceMoney" type="text" value="{{row.invoiceMoney}}"  placeholder="非数电票金额" maxlength="10" class="form-control number"/>
                 </td>
                 <td>
-                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="补贴金额" maxlength="10"  class="form-control number"/>
+                    <input id="workAccountList{{idx}}_subsidyMoney" onchange="calculateSum({{idx}})" name="workAccountList[{{idx}}].subsidyMoney" type="text" value="{{row.subsidyMoney}}"  placeholder="其他金额" maxlength="10"  class="form-control number"/>
                 </td>
                 <td>
                     <input id="workAccountList{{idx}}_money" name="workAccountList[{{idx}}].money" type="text" value="{{row.money}}"  readonly="readonly" class="form-control number required" style="background-color: #f5f5f5;"/>