Bladeren bron

发票调整,电子发票报销调整

user5 1 jaar geleden
bovenliggende
commit
c0c5c67a05
17 gewijzigde bestanden met toevoegingen van 46 en 100 verwijderingen
  1. 0 23
      src/main/resources/freemarker/projectSignature.ftl
  2. 2 1
      src/main/resources/jeeplus.properties
  3. 2 2
      src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml
  4. 1 1
      src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml
  5. 1 1
      src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml
  6. 13 45
      src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml
  7. 1 1
      src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementElectronicInvoiceAudit.jsp
  8. 3 3
      src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementElectronicInvoiceReimbursementModifyApply.jsp
  9. 2 2
      src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementNewAudit.jsp
  10. 3 3
      src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementNewFormAdd.jsp
  11. 4 4
      src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementNewModifyApply.jsp
  12. 2 2
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp
  13. 1 1
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementAudit.jsp
  14. 4 4
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp
  15. 2 2
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormDetail.jsp
  16. 2 2
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp
  17. 3 3
      src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

+ 0 - 23
src/main/resources/freemarker/projectSignature.ftl

@@ -1781,30 +1781,7 @@
 					<w:t>法定代表人:杨荣华</w:t>
 				</w:r>
 			</w:p>
-			<w:p wsp:rsidR="00000000"
-				 wsp:rsidRDefault="00D858D2">
-				<w:pPr>
-					<w:spacing w:after="78"/>
-					<w:ind w:first-line="560"/>
-					<w:rPr>
-						<w:rFonts w:ascii="宋体"
-								  w:h-ansi="宋体"
-								  w:hint="fareast"/>
-						<wx:font wx:val="宋体"/>
-						<w:sz w:val="28"/>
-					</w:rPr>
-				</w:pPr>
-				<w:r>
-					<w:rPr>
-						<w:rFonts w:ascii="宋体"
-								  w:h-ansi="宋体"
-								  w:hint="fareast"/>
-						<wx:font wx:val="宋体"/>
-						<w:sz w:val="28"/>
-					</w:rPr>
 
-				</w:r>
-			</w:p>
 			<w:p wsp:rsidR="00000000"
 				 wsp:rsidRDefault="00D858D2">
 				<w:pPr>

+ 2 - 1
src/main/resources/jeeplus.properties

@@ -6,10 +6,11 @@
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver
 db.name=ruihuaoa-activity-data
-#jdbc.url=jdbc:mysql://192.168.2.4:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
+#jdbc.url=jdbc:mysql://8.136.152.135:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
 jdbc.url=jdbc:mysql://127.0.0.1:3306/new_ccpm?useUnicode=true&characterEncoding=utf-8
 jdbc.username=root
 jdbc.password=root
+#jdbc.password=Xgcomdata10376@
 #jdbc.password=root
 
 #pool settings

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

@@ -792,7 +792,7 @@ END) as projectScale*/
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY SUBSTRING(a.project_id,-9) DESC
+				ORDER BY SUBSTRING(a.project_id,-10) DESC
 			</otherwise>
 		</choose>
 		) temporarydb
@@ -1257,7 +1257,7 @@ END) as projectScale*/
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY SUBSTRING(a.project_id,-9) DESC
+				ORDER BY SUBSTRING(a.project_id,-10) DESC
 			</otherwise>
 		</choose>
 		) temporarydb

+ 1 - 1
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageDao.xml

@@ -707,7 +707,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY SUBSTRING(a.project_id,-9) DESC
+				ORDER BY SUBSTRING(a.project_id,-10) DESC
 			</otherwise>
 		</choose>
 		) temporarydb

+ 1 - 1
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -716,7 +716,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY SUBSTRING(a.project_id,-9) DESC
+				ORDER BY SUBSTRING(a.project_id,-10) DESC
 			</otherwise>
 		</choose>
 		) temporarydb

+ 13 - 45
src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -5,7 +5,6 @@
 	<sql id="workProjectNotifyColumns">
 		a.id AS "id",
 		a.create_by AS "createBy.id",
-		a.create_by AS "createById",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
@@ -86,7 +85,7 @@
 	</select>
 
 	<select id="findList" resultType="WorkProjectNotify" >
-	select * from (
+
 		SELECT
 		<include refid="workProjectNotifyColumns"/>
 		,a.wap_begin_date AS "wapCreateDate"
@@ -152,6 +151,10 @@
 				AND a.wap_begin_date &lt;= #{endBeginDate}
 			</if>
 
+			<if test="(createUserId != null and createUserId != '') or (createUserName != null and createUserName != '')">
+				AND (a.create_by = #{createUserId} or su.name like concat('%',#{createUserName},'%'))
+			</if>
+
 			<choose>
 				<when test="status !=null and status != '' and status == '-1'">
 				</when>
@@ -187,14 +190,7 @@
 				,a.create_date DESC,a.id
 			</otherwise>-->
 		</choose>
-	) z
 
-	LEFT JOIN sys_user zu ON zu.id = z.initiator
-	<where>
-		<if test="(createUserId != null and createUserId != '') or (createUserName != null and createUserName != '')">
-			AND (z.createById = #{createUserId} or zu.name like concat('%',#{createUserName},'%'))
-		</if>
-	</where>
 
 	</select>
 
@@ -312,25 +308,10 @@
 	</select>
 
 	<select id="queryCount" resultType="Integer">
-		select count(*) from (
-		SELECT
-		<include refid="workProjectNotifyColumns"/>
-		,a.wap_begin_date AS "wapCreateDate"
-		,(select user.id from work_activity_process wap left join sys_user user on wap.create_by = user.id where wap.count != 0 and  wap.process_instance_id in (select waps.process_instance_id
-		FROM work_project_notify waps
-		WHERE waps.notify_id = a.notify_id and waps.process_instance_id is not null order by waps.notify_id desc
-		)  and wap.is_approval = '0'  order by wap.create_date asc, wap.count asc limit 1) as 'initiator'
-		/*,(select p.user_id from work_activity_process wap
-		left join work_activity_process_user p on wap.process_instance_id = p.process_id and p.count = wap.count
-		left join sys_user u on u.id = p.user_id
-		where (case when a.process_instance_id is null then wap.process_instance_id = (select waps.process_instance_id
-		FROM work_project_notify waps
-		WHERE waps.notify_id = a.notify_id and waps.process_instance_id is not null order by waps.notify_id desc
-		LIMIT 1) else wap.process_instance_id = a.process_instance_id end) and wap.is_approval = '0'  order by wap.count asc limit 1) as 'auditor'*/
+		SELECT count(1)
 		FROM work_project_notify a
-		left join sys_user su on a.create_by = su.id
 		LEFT JOIN sys_user u ON u.id = a.create_by
-		<include refid="workProjectNotifyJoins"/>
+		LEFT JOIN sys_user su ON su.id = a.create_by
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="title != null and title != ''">
@@ -378,6 +359,9 @@
 				AND a.wap_begin_date &lt;= #{endBeginDate}
 			</if>
 
+			<if test="(createUserId != null and createUserId != '') or (createUserName != null and createUserName != '')">
+				AND (a.create_by = #{createUserId} or su.name like concat('%',#{createUserName},'%'))
+			</if>
 			<choose>
 				<when test="status !=null and status != '' and status == '-1'">
 				</when>
@@ -397,30 +381,14 @@
 				</otherwise>
 			</choose>
 		</where>
-
-		ORDER BY a.update_date DESC, a.exigency desc
 		<choose>
-			<!--<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY a.create_date DESC,a.id
-			</otherwise>-->
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				,${page.orderBy}
-			</when>
-			<!--<otherwise>
-				,a.create_date DESC,a.id
-			</otherwise>-->
+				ORDER BY a.create_date DESC
+			</otherwise>
 		</choose>
-		) z
-
-		LEFT JOIN sys_user zu ON zu.id = z.initiator
-		<where>
-			<if test="(createUserId != null and createUserId != '') or (createUserName != null and createUserName != '')">
-				AND (z.createById = #{createUserId} or zu.name like concat('%',#{createUserName},'%'))
-			</if>
-		</where>
 	</select>
 
 	<select id="findListByAPP" resultType="WorkProjectNotify" >

+ 1 - 1
src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementElectronicInvoiceAudit.jsp

@@ -406,7 +406,7 @@
 		</div>
 
 		<div class="form-group layui-row count2">
-			<div class="form-group-label"><h2>电发票信息</h2></div>
+			<div class="form-group-label"><h2>电发票信息</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container">
 				<table id="contentTable3" class="table table-bordered table-condensed can-edit">
 					<thead>

+ 3 - 3
src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementElectronicInvoiceReimbursementModifyApply.jsp

@@ -145,7 +145,7 @@
             if(reimbursementType == '1'){
                 var leng = $("#file_attachment_InvoiceReimbursement tr").length;
                 if(leng.length == 0){
-                    parent.layer.msg("请上传电发票xml文件!", {icon: 5});
+                    parent.layer.msg("请上传电发票xml文件!", {icon: 5});
                     flags= false;
                 }
             }
@@ -799,7 +799,7 @@
                 <label class="layui-form-label"><span class="require-item">*</span>报销类型:</label>
                 <div class="layui-input-block layui-form">
                     <input type="radio" name="reimbursementType" lay-filter="reimbursementTypeRadio" title="普通报销" value="0">
-                    <input type="radio" name="reimbursementType" lay-filter="reimbursementTypeRadio" title="电发票报销" value="1">
+                    <input type="radio" name="reimbursementType" lay-filter="reimbursementTypeRadio" title="电发票报销" value="1">
                 </div>
             </div>
 
@@ -1098,7 +1098,7 @@
 
 
         <div class="form-group layui-row count2">
-            <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('#reimbursementElectronicInvoiceVATTaxes', reimbursementElectronicInvoiceVATTaxesRowIdx, reimbursementElectronicInvoiceVATTaxesTpl);reimbursementElectronicInvoiceVATTaxesRowIdx = reimbursementElectronicInvoiceVATTaxesRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
             </div>

+ 2 - 2
src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementNewAudit.jsp

@@ -403,7 +403,7 @@
 			</div>
 		</div>
 		<div class="form-group layui-row count2">
-			<div class="form-group-label"><h2>电发票信息</h2></div>
+			<div class="form-group-label"><h2>电发票信息</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container">
 				<table id="contentTable3" class="table table-bordered table-condensed can-edit">
 					<thead>
@@ -468,7 +468,7 @@
 		</div>
 
 		<div class="form-group layui-row count2">
-			<div class="form-group-label"><h2>电发票附件信息</h2></div>
+			<div class="form-group-label"><h2>电发票附件信息</h2></div>
 			<div id="addFile_attachment_InvoiceReimbursement" style="display: none" class="upload-progress">
 				<span id="fileName_attachment_InvoiceReimbursement" ></span>
 				<b><span id="baifenbi_attachment_InvoiceReimbursement" ></span></b>

+ 3 - 3
src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementNewFormAdd.jsp

@@ -145,7 +145,7 @@
                 if(reimbursementType == '1'){
                     var leng = $("#file_attachment_InvoiceReimbursement tr").length;
                     if(leng.length == 0){
-                        parent.layer.msg("请上传电发票xml文件!", {icon: 5});
+                        parent.layer.msg("请上传电发票xml文件!", {icon: 5});
                         flags= false;
                     }
                 }
@@ -716,7 +716,7 @@
                 <label class="layui-form-label"><span class="require-item">*</span>报销类型:</label>
                 <div class="layui-input-block layui-form">
                     <input type="radio" name="reimbursementType" lay-filter="reimbursementTypeRadio" title="普通报销" value="0">
-                    <input type="radio" name="reimbursementType" lay-filter="reimbursementTypeRadio" title="电发票报销" value="1">
+                    <input type="radio" name="reimbursementType" lay-filter="reimbursementTypeRadio" title="电发票报销" value="1">
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
@@ -1014,7 +1014,7 @@
         </div>
 
         <div class="form-group layui-row count2">
-            <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('#reimbursementElectronicInvoiceVATTaxes', reimbursementElectronicInvoiceVATTaxesRowIdx, reimbursementElectronicInvoiceVATTaxesTpl);reimbursementElectronicInvoiceVATTaxesRowIdx = reimbursementElectronicInvoiceVATTaxesRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
             </div>

+ 4 - 4
src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementNewModifyApply.jsp

@@ -150,7 +150,7 @@
             if(reimbursementType == '1'){
                 var leng = $("#file_attachment_InvoiceReimbursement tr").length;
                 if(leng.length == 0){
-                    parent.layer.msg("请上传电发票xml文件!", {icon: 5});
+                    parent.layer.msg("请上传电发票xml文件!", {icon: 5});
                     flags= false;
                 }
             }
@@ -836,7 +836,7 @@
                 <label class="layui-form-label"><span class="require-item">*</span>报销项:</label>
                 <div class="layui-input-block layui-form">
                     <input type="radio" name="reimbursementType" disabled lay-filter="reimbursementTypeRadio" title="普通报销" value="0">
-                    <input type="radio" name="reimbursementType" disabled lay-filter="reimbursementTypeRadio" title="电发票报销" value="1">
+                    <input type="radio" name="reimbursementType" disabled lay-filter="reimbursementTypeRadio" title="电发票报销" value="1">
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
@@ -1323,7 +1323,7 @@
         </div>
 
         <div class="form-group layui-row count2">
-            <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('#reimbursementElectronicInvoiceVATTaxes', reimbursementElectronicInvoiceVATTaxesRowIdx, reimbursementElectronicInvoiceVATTaxesTpl);reimbursementElectronicInvoiceVATTaxesRowIdx = reimbursementElectronicInvoiceVATTaxesRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
             </div>--%>
@@ -1466,7 +1466,7 @@
         </div>
 
         <div class="form-group layui-row count2">
-            <div class="form-group-label"><h2><span class="require-item">*</span>电发票附件信息<span style="color: red;font-size: 14px"> 上传报销的电发票xml文件</span></h2></div>
+            <div class="form-group-label"><h2><span class="require-item">*</span>电发票附件信息<span style="color: red;font-size: 14px"> 上传报销的电发票xml文件</span></h2></div>
             <div class="layui-item nav-btns">
                 <a id="attachment_btn_InvoiceReimbursement" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
             </div>

+ 2 - 2
src/main/webapp/webpage/modules/workreimbursement/workReimbursementAllList.jsp

@@ -143,7 +143,7 @@
                                 <form:select path="reimbursementType" class="form-control simple-select">
                                     <form:option value="" label=""/>
                                     <form:option value="0" label="普通报销"/>
-                                    <form:option value="1" label="电发票报销"/>
+                                    <form:option value="1" label="电发票报销"/>
                                 </form:select>
                             </div>
                         </div>
@@ -213,7 +213,7 @@
                     }}
                 ,{field:'reimbursementType',align:'center', title: '报销项', width:100,templet:function(d){
                         if(1 == d.reimbursementType && d.reimbursementType != undefined){
-                            return "<span title='电发票报销'>" +"电发票报销"+ "</span>";
+                            return "<span title='电发票报销'>" +"电发票报销"+ "</span>";
                         }else{
                             return "<span title='普通报销'>" +"普通报销"+ "</span>";
                         }

+ 1 - 1
src/main/webapp/webpage/modules/workreimbursement/workReimbursementAudit.jsp

@@ -400,7 +400,7 @@
 			</div>
 		</div>
 		<div class="form-group layui-row count2">
-			<div class="form-group-label"><h2>电发票信息</h2></div>
+			<div class="form-group-label"><h2>电发票信息</h2></div>
 			<div class="layui-item layui-col-xs12 form-table-container">
 				<table id="contentTable3" class="table table-bordered table-condensed can-edit">
 					<thead>

+ 4 - 4
src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -183,7 +183,7 @@
                 if(reimbursementType == '1'){
                     var leng = $("#file_attachment_InvoiceReimbursement tr").length;
                     if(leng.length == 0){
-                        parent.layer.msg("请上传电发票xml文件!", {icon: 5});
+                        parent.layer.msg("请上传电发票xml文件!", {icon: 5});
                         flags= false;
                     }
                 }
@@ -853,7 +853,7 @@
                 <label class="layui-form-label"><span class="require-item">*</span>报销项:</label>
                 <div class="layui-input-block layui-form">
                     <input type="radio" name="reimbursementType" lay-filter="reimbursementTypeRadio" title="普通报销" value="0">
-                    <input type="radio" name="reimbursementType" lay-filter="reimbursementTypeRadio" title="电发票报销" value="1">
+                    <input type="radio" name="reimbursementType" lay-filter="reimbursementTypeRadio" title="电发票报销" value="1">
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
@@ -1240,7 +1240,7 @@
         </div>
 
         <div class="form-group layui-row count2">
-            <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('#reimbursementElectronicInvoiceVATTaxes', reimbursementElectronicInvoiceVATTaxesRowIdx, reimbursementElectronicInvoiceVATTaxesTpl);reimbursementElectronicInvoiceVATTaxesRowIdx = reimbursementElectronicInvoiceVATTaxesRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
             </div>&ndash;%&gt;--%>
@@ -1383,7 +1383,7 @@
         </div>
 
         <div class="form-group layui-row count2">
-            <div class="form-group-label"><h2><span class="require-item">*</span>电发票附件信息<span style="color: red;font-size: 14px"> 上传报销的电发票xml文件</span></h2></div>
+            <div class="form-group-label"><h2><span class="require-item">*</span>电发票附件信息<span style="color: red;font-size: 14px"> 上传报销的电发票xml文件</span></h2></div>
             <div class="layui-item nav-btns">
                 <a id="attachment_btn_InvoiceReimbursement" class="nav-btn nav-btn-add" title="添加附件"><i class="fa fa-plus"></i>&nbsp;添加附件</a>
             </div>

+ 2 - 2
src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormDetail.jsp

@@ -459,7 +459,7 @@
     </div>
 
     <div class="form-group layui-row count2">
-        <div class="form-group-label"><h2>电发票信息</h2></div>
+        <div class="form-group-label"><h2>电发票信息</h2></div>
         <div class="layui-item layui-col-xs12 form-table-container">
             <table id="contentTable3" class="table table-bordered table-condensed can-edit">
                 <thead>
@@ -524,7 +524,7 @@
     </div>
 
     <div class="form-group layui-row count2">
-        <div class="form-group-label"><h2>电发票附件信息</h2></div>
+        <div class="form-group-label"><h2>电发票附件信息</h2></div>
         <div id="addFile_attachment_InvoiceReimbursement" style="display: none" class="upload-progress">
             <span id="fileName_attachment_InvoiceReimbursement" ></span>
             <b><span id="baifenbi_attachment_InvoiceReimbursement" ></span></b>

+ 2 - 2
src/main/webapp/webpage/modules/workreimbursement/workReimbursementList.jsp

@@ -197,7 +197,7 @@
                                 <form:select path="reimbursementType" class="form-control simple-select">
                                     <form:option value="" label=""/>
                                     <form:option value="0" label="普通报销"/>
-                                    <form:option value="1" label="电发票报销"/>
+                                    <form:option value="1" label="电发票报销"/>
                                 </form:select>
                             </div>
                         </div>
@@ -268,7 +268,7 @@
                     }}
                 ,{field:'reimbursementType',align:'center', title: '报销项', width:100,templet:function(d){
                         if(1 == d.reimbursementType && d.reimbursementType != undefined){
-                            return "<span title='电发票报销'>" +"电发票报销"+ "</span>";
+                            return "<span title='电发票报销'>" +"电发票报销"+ "</span>";
                         }else{
                             return "<span title='普通报销'>" +"普通报销"+ "</span>";
                         }

+ 3 - 3
src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -145,7 +145,7 @@
             if(reimbursementType == '1'){
                 var leng = $("#file_attachment_InvoiceReimbursement tr").length;
                 if(leng.length == 0){
-                    parent.layer.msg("请上传电发票xml文件!", {icon: 5});
+                    parent.layer.msg("请上传电发票xml文件!", {icon: 5});
                     flags= false;
                 }
             }
@@ -792,7 +792,7 @@
                 <label class="layui-form-label"><span class="require-item">*</span>报销类型:</label>
                 <div class="layui-input-block layui-form">
                     <input type="radio" name="reimbursementType" disabled lay-filter="reimbursementTypeRadio" title="普通报销" value="0">
-                    <input type="radio" name="reimbursementType" disabled lay-filter="reimbursementTypeRadio" title="电发票报销" value="1">
+                    <input type="radio" name="reimbursementType" disabled lay-filter="reimbursementTypeRadio" title="电发票报销" value="1">
                 </div>
             </div>
             <div class="layui-item layui-col-sm6">
@@ -1279,7 +1279,7 @@
         </div>
 
         <div class="form-group layui-row count2">
-            <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('#reimbursementElectronicInvoiceVATTaxes', reimbursementElectronicInvoiceVATTaxesRowIdx, reimbursementElectronicInvoiceVATTaxesTpl);reimbursementElectronicInvoiceVATTaxesRowIdx = reimbursementElectronicInvoiceVATTaxesRowIdx + 1;" title="新增"><i class="fa fa-plus"></i>&nbsp;新增</a>
             </div>