git-svn-id: https://192.168.57.71/svn/jsgkj@468 931142cf-59ea-a443-aa0e-51397b428577

gkaq/yjpt-flex/trunk/locale/zh_CN/select.properties

@@ -11,10 +11,12 @@ BWXS.ZLS=\u76f4\u7acb\u5f0f
 BWXS.ZLSMT	 =	\u91cd\u529b\u5f0f\u7801\u5934
 BWXS.GZSMT	 =	\u9ad8\u6869\u5f0f\u7801\u5934
 BWXS.BZSMT	 =	\u677f\u6869\u5f0f\u7801\u5934
-BWXS2.BZ=\u677f\u6869
-BWXS2.GZ=\u9ad8\u6869
+BWXS2.BZ=\u677f\u6869\u5f0f
+BWXS2.GZ=\u9ad8\u6869\u5f0f
 BWXS2.QT=\u5176\u4ed6
 BWXS2.ZLS=\u91cd\u529b\u5f0f
+BWXS2.PDJXP=\u76ae\u5e26\u673a\u659c\u5761
+BWXS2.LCMT=\u7f06\u8f66\u7801\u5934
 BWZYYT.DYT=\u591a\u7528\u9014
 BWZYYT.HLBW=\u4e13\u4e1a\u5316
 BWZYYT.KH=\u5ba2\u8d27
@@ -1174,6 +1176,11 @@ jd.four=\u5b63\u5ea6\u56db
 ##\u6cca\u4f4d\u7684\u6240\u5728\u6c34\u7cfb
 BWSZSX.CJ=\u957f\u6c5f\u6c34\u7cfb
 BWSZSX.HH=\u6dee\u6cb3\u6c34\u7cfb
+
+SXLX.CJGL=\u957f\u6c5f\u5e72\u6d41
+SXLX.HHSX=\u6dee\u6cb3\u6c34\u7cfb
+SXLX.CJZL=\u957f\u6c5f\u652f\u6d41
+SXLX.QTSX=\u5176\u4ed6\u6c34\u7cfb
 ## \u6cca\u4f4d\u7684\u670d\u52a1\u7c7b\u578b
 BWFWLX.SY=\u79c1\u7528
 BWFWLX.GY=\u516c\u7528

gkaq/yjpt-flex/trunk/src/com/jtgh/yjpt/view/gq/Gq.mxml

@@ -40,7 +40,7 @@
 						   hasBlank="true"/>
 		</s:HGroup>
 		<s:HGroup width="100%">
-			<cus:QLabel text="{resourceManager.getString('gq','gq.szlx')}"  textAlign="right" width="128"/>
+			<cus:QLabel text="{resourceManager.getString('gq','gq.szsx')}"  textAlign="right" width="128"/>
 			<cus:QComboBox id="szsx" width="300" comboxClass="CodeSelect" codeType="{Constants.GROUP_CODE_SXLX}"  hasBlank="true"/>
 			<s:Spacer width="100%"/>
 			<cus:QLabel text="{resourceManager.getString('gq','gq.gqmj')}" keyUp="numberCheck(event)" textAlign="right" width="128"/>

gkaq/yjpt-java/trunk/locale/zh_CN/select.properties

@@ -11,10 +11,12 @@ BWXS.ZLS=\u76f4\u7acb\u5f0f
 BWXS.ZLSMT	 =	\u91cd\u529b\u5f0f\u7801\u5934
 BWXS.GZSMT	 =	\u9ad8\u6869\u5f0f\u7801\u5934
 BWXS.BZSMT	 =	\u677f\u6869\u5f0f\u7801\u5934
-BWXS2.BZ=\u677f\u6869
-BWXS2.GZ=\u9ad8\u6869
+BWXS2.BZ=\u677f\u6869\u5f0f
+BWXS2.GZ=\u9ad8\u6869\u5f0f
 BWXS2.QT=\u5176\u4ed6
 BWXS2.ZLS=\u91cd\u529b\u5f0f
+BWXS2.PDJXP=\u76ae\u5e26\u673a\u659c\u5761
+BWXS2.LCMT=\u7f06\u8f66\u7801\u5934
 BWZYYT.DYT=\u591a\u7528\u9014
 BWZYYT.HLBW=\u4e13\u4e1a\u5316
 BWZYYT.KH=\u5ba2\u8d27
@@ -1177,6 +1179,11 @@ jd.four=\u5b63\u5ea6\u56db
 ##\u6cca\u4f4d\u7684\u6240\u5728\u6c34\u7cfb
 BWSZSX.CJ=\u957f\u6c5f\u6c34\u7cfb
 BWSZSX.HH=\u6dee\u6cb3\u6c34\u7cfb
+
+SXLX.CJGL=\u957f\u6c5f\u5e72\u6d41
+SXLX.HHSX=\u6dee\u6cb3\u6c34\u7cfb
+SXLX.CJZL=\u957f\u6c5f\u652f\u6d41
+SXLX.QTSX=\u5176\u4ed6\u6c34\u7cfb
 ## \u6cca\u4f4d\u7684\u670d\u52a1\u7c7b\u578b
 BWFWLX.SY=\u79c1\u7528
 BWFWLX.GY=\u516c\u7528

gkaq/yjpt-java/trunk/resources/spring/application.properties

@@ -1,7 +1,7 @@
 #***************************************  jdbc info  ********************************************#
 jdbc.driver                 = oracle.jdbc.driver.OracleDriver
 jdbc.url                      = jdbc:oracle:thin:@192.168.57.36:1521:orcl
-jdbc.username           = yjptpro
+jdbc.username           = yjptzj
 jdbc.password            =yjpt
 hibernate.dialect        = org.hibernate.dialect.Oracle10gDialect
 #********************************** qlyg jdbc info**********************************************#

gkaq/yjpt-java/trunk/resources/spring/applicationContext-datachange.xml

@@ -69,7 +69,7 @@
 				<!-- 001=1 -->
 				<entry key="1" value-ref="entityManagerFactory-qlyg" />
 				<!-- 010=2 -->
-				<entry key="2" value-ref="entityManagerFactory-xzzx" />
+				<!--entry key="2" value-ref="entityManagerFactory-xzzx" /-->
 				<!-- 100=4 -->
 			</map>
 		</property>