From 8f97c636db147fe3a47cc026b06b70eec945e335 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Wed, 24 Oct 2018 19:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9D=A5=E5=87=BD=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E4=B8=8B=E6=8B=89=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/tags/sys/delRow.tag                | 4 ++--
 src/main/webapp/WEB-INF/views/basics/requestSelectInfo.jsp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index ecb020601..4f773d9b7 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -212,7 +212,7 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 					var requestName =requestNameArr[1];
 					
 					if(requestName.indexOf("null")==-1&&typeof(indexTableName)!="undefined"&&indexTableName!=null&&indexTableName!=''&&indexTableName.indexOf("null")==-1){
-					$.jBox.open("iframe:${ctx}/basics/serviceDictInfo/requestSelectInfo", "取消审核通过", 400, 500, { buttons: { '确定': 1, '取消': 0 },
+					$.jBox.open("iframe:${ctx}/basics/serviceDictInfo/requestSelectInfo", "<spring:message code='cancel_approved'/>", 400, 500, { buttons: { '<spring:message code="ok"/>': 1, '<spring:message code="cancel"/>': 0 },
 						submit: function (v, h, f) {
 				    if (v == 0) {
 				        return true; // close the window
@@ -220,7 +220,7 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 				        h.find('.errorBlock').hide('fast', function () { $(this).remove(); });
 				        var cancelRequestId = h.find("iframe")[0].contentWindow.requestIsAudit.value;
 				        if (!cancelRequestId) {
-				            $('<div class="errorBlock" style="display: none;font-size:18px;color:red;text-align:center;margin-top:10px">请选择来函信息！</div>').prependTo(h).show('fast');
+				            $('<div class="errorBlock" style="display: none;font-size:18px;color:red;text-align:center;margin-top:10px"><spring:message code="required"/></div>').prependTo(h).show('fast');
 				            return false;
 				        }
 								if(url.indexOf("?")>0){
diff --git a/src/main/webapp/WEB-INF/views/basics/requestSelectInfo.jsp b/src/main/webapp/WEB-INF/views/basics/requestSelectInfo.jsp
index 65c9b47d8..3c3dad12a 100644
--- a/src/main/webapp/WEB-INF/views/basics/requestSelectInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/requestSelectInfo.jsp
@@ -11,7 +11,7 @@ function changesel(){
 	style="scrolling:auto;z-index:999;position:relative;height: 25px; font-size: 18px; text-align: center; margin-top: 30px; margin-left: 20px; line-height: 30px;">
 	<div class="col-md-8">
 		<div class="form-group">
-			<label class="control-label col-md-3"><font color="red">*</font> 来函 </label>
+			<label class="control-label col-md-3"><font color="red">*</font> <spring:message code="letter"/> </label>
 			<div class="col-md-6">
 
 				<select id="requestIsAudit" name="requestId" onchange="changesel()"