Browse Source

发票金额(默认带过来)/列表负责人改为责任人

[user3] 4 years ago
parent
commit
f691cd1318
19 changed files with 111 additions and 79 deletions
  1. 7 0
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageAllController.java
  2. 26 24
      src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml
  3. 1 1
      src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp
  4. 1 1
      src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp
  5. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/check/all/ruralProjectRecordsAllList.jsp
  6. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsList.jsp
  7. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp
  8. 2 2
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp
  9. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp
  10. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp
  11. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralCostProjectReportList.jsp
  12. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralProjectCostRecordReportList.jsp
  13. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/ruralProjectRecordReportList.jsp
  14. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/ruralProjectReportList.jsp
  15. 19 6
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp
  16. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp
  17. 34 24
      src/main/webapp/webpage/modules/workinvoice/workInvoiceAuditEnd.jsp
  18. 7 7
      src/main/webapp/webpage/modules/workinvoice/workInvoiceForm.jsp
  19. 4 4
      src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

+ 7 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageAllController.java

@@ -6,6 +6,8 @@ import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectMessageAllService;
 import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
+import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.sys.service.UserService;
 import com.jeeplus.modules.sys.utils.UserUtils;
 import jersey.repackaged.com.google.common.collect.Lists;
 import org.activiti.engine.HistoryService;
@@ -37,6 +39,8 @@ public class RuralProjectMessageAllController extends BaseController {
     private RuralProjectMessageAllService ruralProjectMessageAllService;
     @Autowired
     protected HistoryService historyService;
+    @Autowired
+    private UserService userService;
 
     @ModelAttribute
     public RuralProjectRecords get(@RequestParam(required=false) String id) {
@@ -63,6 +67,9 @@ public class RuralProjectMessageAllController extends BaseController {
         List<String> typeList = Lists.newArrayList();
         typeList.add("1");
         typeList.add("2");
+        //查询总审人员信息
+        List<User> auditUserList = userService.getAuditUserList();
+        model.addAttribute("userList", auditUserList);
         //添加查询类型list
         projectRecords.setTypeList(typeList);
         Page<RuralProjectRecords> page = ruralProjectMessageAllService.findPage(new Page<RuralProjectRecords>(request, response), projectRecords);

+ 26 - 24
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -171,21 +171,24 @@
 			<if test="workContractInfo!=null and workContractInfo.client !=null and workContractInfo.client.name !=null and workContractInfo.client.name !=''">
 				AND wct.name like concat(concat('%',#{workContractInfo.client.name}),'%')
 			</if>
-            <if test="leaderNameStr !=null and leaderNameStr !=''">
-                AND su.name like concat(concat('%',#{leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
-            </if>
-            <if test="projectStatus !=null">
-                AND a.status = #{projectStatus}
-            </if>
-            <if test="beginDate !=null">
-                AND a.create_date >= #{beginDate}
-            </if>
-            <if test="endDate !=null">
-                AND a.create_date &lt; #{endDate}
-            </if>
+			<if test="leaderNameStr !=null and leaderNameStr !=''">
+				AND su.name like concat(concat('%',#{leaderNameStr}),'%') AND w.is_master = '1' AND w.del_flag='0'
+			</if>
+			<if test="projectStatus !=null">
+				AND a.status = #{projectStatus}
+			</if>
+			<if test="beginDate !=null">
+				AND a.create_date >= #{beginDate}
+			</if>
+			<if test="endDate !=null">
+				AND a.create_date &lt; #{endDate}
+			</if>
 			<if test="createBy != null and createBy.id !=null and createBy.id !=''">
 				AND a.create_by = #{createBy.id}
 			</if>
+			<if test="bzshbUserId!=null and bzshbUserId!=''">
+				and prd.bzshb_user_id=#{bzshbUserId}
+			</if>
 			<choose>
 				<when test="filingProjectStatus == 0">
 					AND pfp.status is null
@@ -202,8 +205,10 @@
 			<if test="office!=null and office.id!=null and office.id!=''">
 				and  a.office_id = #{office.id}
 			</if>
-
-            <if test="reportedState !=null and reportedState !=''">
+			<if test="projectReportStatus != null and projectReportStatus != ''">
+				AND prd.status = #{projectReportStatus}
+			</if>
+			<if test="reportedState !=null and reportedState !=''">
 				<choose>
 					<when test="reportedState == 0">
 						AND a.reported_state is null
@@ -212,11 +217,6 @@
 						AND a.reported_state = #{reportedState}
 					</otherwise>
 				</choose>
-            </if>
-
-
-			<if test="projectReportStatus != null and projectReportStatus != ''">
-				AND prd.status = #{projectReportStatus}
 			</if>
 
 			<choose>
@@ -239,10 +239,10 @@
 				</foreach>
 			</if>
 
-            AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
-            <if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
-               AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id} )${sqlMap.dsf} )
-            </if>
+			AND  a.status != 7 AND a.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
+				AND ((w1.user_id = #{currentUser.id} AND w1.del_flag='0' AND a.company_id = #{currentUser.company.id})${sqlMap.dsf} )
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -333,7 +333,9 @@
 			<if test="createBy != null and createBy.id !=null and createBy.id !=''">
 				AND a.create_by = #{createBy.id}
 			</if>
-
+			<if test="bzshbUserId!=null and bzshbUserId!=''">
+				and prd.bzshb_user_id=#{bzshbUserId}
+			</if>
 			<choose>
 				<when test="filingProjectStatus == 0">
 					AND pfp.status is null

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -253,7 +253,7 @@
 							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
-				,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
+				,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
 						return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
 					}}
 				,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -253,7 +253,7 @@
 							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
-				,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
+				,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
 						return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
 					}}
 				,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/check/all/ruralProjectRecordsAllList.jsp

@@ -337,7 +337,7 @@
 				,{field:'client',align:'center', title: '委托单位',  width:150,templet:function(d){
 						return "<span title=\"" + d.client + "\">" + d.client + "</span>";
 					}}
-				,{field:'projMaster', align:'center',title: '项目负责人', width:65,templet:function(d){
+				,{field:'projMaster', align:'center',title: '项目责任人', width:100,templet:function(d){
 						return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
 					}}
 				,{field:'createDate',align:'center', title: '创建日期',  width:80}

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsList.jsp

@@ -429,7 +429,7 @@
 				,{field:'client',align:'center', title: '委托单位',  width:150,templet:function(d){
 						return "<span title=\"" + d.client + "\">" + d.client + "</span>";
 					}}
-				,{field:'projMaster', align:'center',title: '项目负责人', width:65,templet:function(d){
+				,{field:'projMaster', align:'center',title: '项目责任人', width:100,templet:function(d){
 						return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
 					}}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageLists.jsp

@@ -671,7 +671,7 @@
 								return "<font></font>";
 							}
 						}},*/
-                    {field: 'projectLeaders', align:'center', title: '负责人',width:80,templet: function(d){
+                    {field: 'projectLeaders', align:'center', title: '责任人',width:100,templet: function(d){
 							if(0 == d.pid){
 								return "<font style = 'font-size:14px;'>"+d.projectLeaders+"</font>";
 							}else{

+ 2 - 2
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsForm.jsp

@@ -729,7 +729,7 @@
 <div class="single-form">
     <div class="container">
         <sys:message content="${message}"/>
-        <form:form id="inputForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectRecords/save" method="post" class="layui-form">
+        <form:form id="inputForm" modelAttribute="ruralProjectRecords" action="${ctx}/ruralProject/ruralCostProjectRecords/save" method="post" class="form-horizontal layui-form ">
             <form:hidden path="id"/>
             <form:hidden path="workContractInfo.client.id" id="contractClientId" value="${workContractInfo.client.id}"/>
             <input type="hidden" id="flagFile" value="">
@@ -925,7 +925,7 @@
                 <div class="layui-item layui-col-sm6 lw7">
                     <label class="layui-form-label"><span class="require-item">*</span>送审规模:</label>
                     <div class="layui-input-block">
-                        <form:select path="submitMoney" class="form-control required simple-select">
+                        <form:select path="submitMoney" lay-verify="required" class="form-control required simple-select">
                             <form:option value=""/>
                             <form:options items="${fns:getMainDictListOnProjectAdvent('attachment_project_approval_money')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
                         </form:select>

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -527,7 +527,7 @@
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
 					}}
-                ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
+                ,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
                 ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -493,7 +493,7 @@
 						}
 
 					}}
-                ,{field:'projMaster', align:'center',title: '负责人', width:65,templet:function(d){
+                ,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
                         return "<span title=\"" + d.projMaster + "\">" + d.projMaster + "</span>";
                     }}
                 ,{field:'client',align:'center', title: '委托方',  width:150,templet:function(d){

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralCostProjectReportList.jsp

@@ -211,7 +211,7 @@
 				,{field:'verifyFee',align:'center',minWidth:120, title: '核增核减额(元)'}
 				,{field:'verifyRate',align:'center',minWidth:120, title: '核增核减率(%)'}
 				,{field:'allMoney',align:'center',minWidth:120, title: '汇总项目开票额'}
-				,{field:'principalUser',align:'center', title: '项目责人'}
+				,{field:'principalUser',align:'center',width:100, title: '项目责人'}
 				,{field:'officeName',align:'center', title: '所属部门'}
 				,{align:'center', title: '上报状态',  width:90,templet:function(d){
 						var st = getReportedState(d.reportedState);

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralProjectCostRecordReportList.jsp

@@ -166,7 +166,7 @@
 						}
                     }}
 				,{field:'reportNum',align:'center',minWidth:150, title: '报告号'}
-				,{field:'principalUser',align:'center', title: '项目责人'}
+				,{field:'principalUser',align:'center', title: '项目责人'}
 				,{field:'officeName',align:'center', title: '所属部门'}
 				,{align:'center', title: '电子归档',  width:90,templet:function(d){
 						var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/ruralProjectRecordReportList.jsp

@@ -166,7 +166,7 @@
 						}
                     }}
 				,{field:'reportNum',align:'center',minWidth:150, title: '报告号'}
-				,{field:'principalUser',align:'center', title: '项目责人'}
+				,{field:'principalUser',align:'center',width:100, title: '项目责人'}
 				,{field:'officeName',align:'center', title: '所属部门'}
 				,{align:'center', title: '电子归档',  width:90,templet:function(d){
 						var st = getRuralProjectArchiveState(""+d.projectReportRecordStatus);

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/ruralProjectReportList.jsp

@@ -211,7 +211,7 @@
 				,{field:'verifyFee',align:'center',minWidth:120, title: '核增核减额(元)'}
 				,{field:'verifyRate',align:'center',minWidth:120, title: '核增核减率(%)'}
 				,{field:'allMoney',align:'center',minWidth:120, title: '汇总项目开票额'}
-				,{field:'principalUser',align:'center', title: '项目责人'}
+				,{field:'principalUser',align:'center',width:100, title: '项目责人'}
 				,{field:'officeName',align:'center', title: '所属部门'}
 				,{align:'center', title: '上报状态',  width:90,templet:function(d){
 						var st = getReportedState(d.reportedState);

File diff suppressed because it is too large
+ 19 - 6
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp


+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageLists.jsp

@@ -670,7 +670,7 @@
 								return "<font></font>";
 							}
 						}},*/
-                    {field: 'projectLeaders', align:'center', title: '负责人',width:80,templet: function(d){
+                    {field: 'projectLeaders', align:'center', title: '责任人',width:100,templet: function(d){
 							if(0 == d.pid){
 								return "<font style = 'font-size:14px;'>"+d.projectLeaders+"</font>";
 							}else{

+ 34 - 24
src/main/webapp/webpage/modules/workinvoice/workInvoiceAuditEnd.jsp

@@ -49,6 +49,7 @@
 		  return false;
 		}
 		$(document).ready(function() {
+
 			$("#name").focus();
 			validateForm = $("#inputForm").validate({
 				submitHandler: function(form){
@@ -85,7 +86,7 @@
             }
 		});
 
-        function addRow(list, idx, tpl, row){
+        function addRow(list, idx, tpl, row,flag){
             var idx1 = $("#workAccountList tr").length;
             if(list == '#workAccountList' && idx1 < 100){
                 bornTemplete(list, idx, tpl, row, idx1);
@@ -96,17 +97,20 @@
                     $("#workAccountList"+idx+"_code").attr("minlength","12");
                     $("#workAccountList"+idx+"_code").attr("maxlength","12");
                 }
-                //$("#workAccountList"+idx+"_number").val(("0000000" + 100000000 * Math.random()).match(/(\d{8})(\.|$)/)[1]);
-                if(idx>0){
-                    var i = idx-1;
-                    var code = $("#workAccountList"+i+"_code").val();
-                    if(code == null || code == undefined || code == ""){
-						i = idx-2;
-						code = $("#workAccountList"+i+"_code").val();
-                    }
-                    $("#workAccountList"+idx+"_code").val(code);
-
+                if (idx==0 && flag){
+					$("#workAccountList"+idx+"_totalMoney").val(row);
 				}
+                //$("#workAccountList"+idx+"_number").val(("0000000" + 100000000 * Math.random()).match(/(\d{8})(\.|$)/)[1]);
+                // if(idx>0){
+                //     var i = idx-1;
+                //     var code = $("#workAccountList"+i+"_code").val();
+                //     if(code == null || code == undefined || code == ""){
+				// 		i = idx-2;
+				// 		code = $("#workAccountList"+i+"_code").val();
+                //     }
+                //     $("#workAccountList"+idx+"_code").val(code);
+				//
+				// }
             }
         }
         function bornTemplete(list, idx, tpl, row, idx1){
@@ -534,7 +538,7 @@
 			<div class="layui-item layui-col-sm6">
 				<label class="layui-form-label"><span class="require-item">*</span>开票金额(元):</label>
 				<div class="layui-input-block">
-					<input htmlEscape="false" readonly="true"   class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="#,#00.00"/>"/>
+					<input id="kaipiao" htmlEscape="false" readonly="true"   class="form-control layui-input" value="<fmt:formatNumber value="${workInvoice.money}" pattern="#,#00.00"/>"/>
 				</div>
 			</div>
 			<div class="layui-item layui-col-sm6">
@@ -612,13 +616,13 @@
 				<table id="contentTable" class="table table-bordered table-condensed can-edit">
 					<thead>
 					<tr>
-						<th><span class="require-item">*</span>发票代码</th>
+						<th>发票代码</th>
 						<th><span class="require-item">*</span>发票号</th>
 						<th><span class="require-item">*</span>开票金额</th>
-						<th width="80px"><span class="require-item">*</span>税率</th>
-						<th width="100px"><span class="require-item">*</span>金额</th>
-						<th width="100px"><span class="require-item">*</span>税额</th>
-						<th width="100px"><span class="require-item">*</span>累计登记金额</th>
+						<th width="80px">税率</th>
+						<th width="100px">金额</th>
+						<th width="100px">税额</th>
+						<th width="100px">累计登记金额</th>
 						<th width="80px">操作</th>
 						<%--<th><span class="require-item">*</span>发票状态</th>&lt;%&ndash;正常&ndash;%&gt;--%>
 						<%--<th><span class="require-item">*</span>被退标记</th>--%>
@@ -627,6 +631,7 @@
 					</tr>
 					</thead>
 					<tbody id="workAccountList">
+
 					</tbody>
 				</table>
 				<script type="text/template" id="workAccountListTpl">//<!--
@@ -636,7 +641,7 @@
 									<input id="workAccountList{{idx}}_delFlag" name="workAccountList[{{idx}}].delFlag" type="hidden" value="0"/>
 								</td>
 								<td>
-									<input id="workAccountList{{idx}}_code" name="workAccountList[{{idx}}].code" type="text" value="{{row.code}}"    class="form-control number required"/>
+									<input id="workAccountList{{idx}}_code" name="workAccountList[{{idx}}].code" type="text" value="{{row.code}}"    class="form-control number"/>
 								 </td>
 								 <td>
 									<input id="workAccountList{{idx}}_number" name="workAccountList[{{idx}}].number" onchange="checkSame(this)" type="text" value="{{row.number}}"  minlength="8" maxlength="8"  class="form-control number required"/>
@@ -647,24 +652,24 @@
 								</td>
 								<td>
 								<div class="input-group">
-									<input id="workAccountList{{idx}}_tax" onblur="setTaxMoney(this)" name="workAccountList[{{idx}}].tax" type="text" value="{{row.tax}}"    class="form-control number required"/><span class="input-group-addon input-height">%</span>
+									<input id="workAccountList{{idx}}_tax" onblur="setTaxMoney(this)" name="workAccountList[{{idx}}].tax" type="text" value="{{row.tax}}"    class="form-control number"/><span class="input-group-addon input-height">%</span>
 									</div>
 								</td>
 								<td>
-									<input id="workAccountList{{idx}}_taxMoney" name="workAccountList[{{idx}}].taxMoney" type="text" value="{{row.taxMoney}}"    class="form-control number required"/>
+									<input id="workAccountList{{idx}}_taxMoney" name="workAccountList[{{idx}}].taxMoney" type="text" value="{{row.taxMoney}}"    class="form-control number"/>
 								</td>
 								<td>
-									<input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control number required"/>
+									<input id="workAccountList{{idx}}_taxRate" name="workAccountList[{{idx}}].taxRate" type="text" value="{{row.taxRate}}"    class="form-control number"/>
 								</td>
 								<td>
-									<input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control required"/>
+									<input id="workAccountList{{idx}}_incomeMoney" name="workAccountList[{{idx}}].incomeMoney" type="text" value="0"  readonly="true"  class="form-control"/>
 								</td>
 
 									<input id="workAccountList{{idx}}_state" name="workAccountList[{{idx}}].state"  type="hidden" value="正常"   class="form-control"/>
 
-									<input id="workAccountList{{idx}}_backSign" name="workAccountList[{{idx}}].backSign"  type="hidden" value="正常"  readonly="true"  class="form-control required"/>
+									<input id="workAccountList{{idx}}_backSign" name="workAccountList[{{idx}}].backSign"  type="hidden" value="正常"  readonly="true"  class="form-control"/>
 
-									<input id="workAccountList{{idx}}_backNumber" name="workAccountList[{{idx}}].backNumber"  type="hidden" value=""  readonly="true"  class="form-control required"/>
+									<input id="workAccountList{{idx}}_backNumber" name="workAccountList[{{idx}}].backNumber"  type="hidden" value=""  readonly="true"  class="form-control "/>
 
 
 								<td class="text-center op-td">
@@ -705,6 +710,11 @@
 					var workAccountListRowIdx = 0, workAccountListTpl = $("#workAccountListTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g,"");
 					$(document).ready(function() {
 						var data = ${fns:toJson(workInvoice.workAccountList)};
+						var kaipiao=$("#kaipiao").val();
+						if (data.length==0){
+							addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl, kaipiao,"true");
+							workAccountListRowIdx = workAccountListRowIdx + 1;
+						}
 						for (var i=0; i<data.length; i++){
 							addRow('#workAccountList', workAccountListRowIdx, workAccountListTpl, data[i]);
 							workAccountListRowIdx = workAccountListRowIdx + 1;

+ 7 - 7
src/main/webapp/webpage/modules/workinvoice/workInvoiceForm.jsp

@@ -535,13 +535,13 @@
 					<table id="contentTable" class="table table-bordered table-condensed can-edit">
 						<thead>
 						<tr>
-							<th><span class="require-item">*</span>发票代码</th>
-							<th><span class="require-item">*</span>发票号</th>
-							<th><span class="require-item">*</span>发票金额</th>
-							<th><span class="require-item">*</span>税率</th>
-							<th><span class="require-item">*</span>金额</th>
-							<th><span class="require-item">*</span>税额</th>
-							<th><span class="require-item">*</span>累计登记金额</th>
+							<th>发票代码</th>
+							<th>发票号</th>
+							<th>发票金额</th>
+							<th>税率</th>
+							<th>金额</th>
+							<th>税额</th>
+							<th>累计登记金额</th>
 							<th width="150px">操作</th>
 						</tr>
 						</thead>

+ 4 - 4
src/main/webapp/webpage/modules/workinvoice/workInvoiceModify.jsp

@@ -540,7 +540,7 @@
 							<th><span class="require-item">*</span>金额</th>
 							<th><span class="require-item">*</span>税额</th>
 							<th><span class="require-item">*</span>累计登记金额</th>
-							<th width="150px">操作</th>
+<%--							<th width="150px">操作</th>--%>
 						</tr>
 						</thead>
 						<tbody id="workAccountList">
@@ -584,9 +584,9 @@
                                             <input id="workAccountList{{idx}}_backNumber" name="workAccountList[{{idx}}].backNumber"  type="hidden" value=""  readonly="true"  class="form-control required"/>
 
 
-                                        <td class="text-center" width="10">
-                                            {{#delBtn}}<span class="close" onclick="delRow(this, '#workAccountList{{idx}}')" title="删除">&times;</span>{{/delBtn}}
-                                        </td>
+<%--                                        <td class="text-center" width="10">--%>
+<%--											{{#delBtn}}<span class="op-btn op-btn-delete" onclick="delRow(this, '#workAccountList{{idx}}')" title="删除"><i class="glyphicon glyphicon-remove"></i>&nbsp;删除</span>{{/delBtn}}--%>
+<%--                                        </td>--%>
                                     </tr>//-->
 					</script>
 					<script type="text/javascript">