信息项增加【信息项英文名称】字段

cn.com.taiji.myapp/src/main/resources/templates/mailTemplate/infoclassTemplate_xxx.ftl

@@ -65,6 +65,7 @@
     <Cell><Data ss:Type="String">信息项编码&#10;</Data></Cell>
     
     <Cell><Data ss:Type="String">信息项名称</Data></Cell>
+    <Cell><Data ss:Type="String">英文名称</Data></Cell>
     <Cell><Data ss:Type="String">数据元编号</Data></Cell>
     <Cell><Data ss:Type="String">信息项类型&#10;</Data></Cell>
     <Cell><Data ss:Type="String">信息项长度&#10;</Data></Cell>
@@ -99,6 +100,7 @@
     <Cell ss:StyleID="s131"><Data ss:Type="String">${(datadetail.xxxbm!'')?html}</Data></Cell>
     
     <Cell ss:StyleID="s131"><Data ss:Type="String">${(datadetail.xxxmc!'')?html}</Data></Cell>
+    <Cell ss:StyleID="s131"><Data ss:Type="String">${(datadetail.xxxdbmc!'')?html}</Data></Cell>
     <Cell ss:StyleID="s131"><Data ss:Type="String">${(datadetail.datametaidz!'')?html}</Data></Cell>
     <Cell ss:StyleID="s131"><Data ss:Type="String">${(datadetail.datatype_dis!'')?html}</Data></Cell>
     <Cell ss:StyleID="s131"><Data ss:Type="String">${(datadetail.datasize!'')?html}</Data></Cell>

cn.com.taiji.myapp/src/main/resources/templates/mailTemplate/tinfoclass.ftl

@@ -2207,8 +2207,39 @@
 																						</w:tc>
 																						<w:tc>
 																							<w:tcPr>
+																								<w:tcW w:w="752" w:type="dxa"/>
+																								<w:gridSpan w:val="2"/>
+																								<w:tcBorders>
+																									<w:top w:val="double" w:sz="4" wx:bdrwidth="30" w:space="0" w:color="auto"/>
+																									<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+																									<w:bottom w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+																									<w:right w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+																								</w:tcBorders>
+																								<w:shd w:val="clear" w:color="auto" w:fill="C0C0C0"/>
+																								<w:vAlign w:val="center"/>
+																							</w:tcPr>
+																							<w:p wsp:rsidR="006A5D06" wsp:rsidRPr="00C3038B" wsp:rsidRDefault="006A5D06" wsp:rsidP="006A5D06">
+																								<w:pPr>
+																									<w:rPr>
+																										<w:sz w:val="18"/>
+																										<w:sz-cs w:val="18"/>
+																									</w:rPr>
+																								</w:pPr>
+																								<w:r wsp:rsidRPr="00C3038B">
+																									<w:rPr>
+																										<w:rFonts w:hint="fareast"/>
+																										<wx:font wx:val="宋体"/>
+																										<w:sz w:val="18"/>
+																										<w:sz-cs w:val="18"/>
+																									</w:rPr>
+																									<w:t>英文名称</w:t>
+																								</w:r>
+																							</w:p>
+																						</w:tc>
+																						<w:tc>
+																							<w:tcPr>
 																								<w:tcW w:w="751" w:type="dxa"/>
-																								<w:gridSpan w:val="4"/>
+																								<w:gridSpan w:val="2"/>
 																								<w:tcBorders>
 																									<w:top w:val="double" w:sz="4" wx:bdrwidth="30" w:space="0" w:color="auto"/>
 																									<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
@@ -2411,8 +2442,35 @@
 																							</w:tc>
 																							<w:tc>
 																								<w:tcPr>
+																									<w:tcW w:w="752" w:type="dxa"/>
+																									<w:gridSpan w:val="2"/>
+																									<w:tcBorders>
+																										<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+																										<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+																										<w:bottom w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+																										<w:right w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
+																									</w:tcBorders>
+																									<w:vAlign w:val="center"/>
+																								</w:tcPr>
+																								<w:p wsp:rsidR="006A5D06" wsp:rsidRDefault="00170F79" wsp:rsidP="006A5D06">
+																									<w:pPr>
+																										<w:rPr>
+																											<w:sz-cs w:val="21"/>
+																										</w:rPr>
+																									</w:pPr>
+																									<w:r>
+																										<w:rPr>
+																											<w:rFonts w:hint="fareast"/>
+																											<w:sz-cs w:val="21"/>
+																										</w:rPr>
+																										<w:t>${xxxlist["XXXDBMC"]!''}</w:t>
+																									</w:r>
+																								</w:p>
+																							</w:tc>
+																							<w:tc>
+																								<w:tcPr>
 																									<w:tcW w:w="751" w:type="dxa"/>
-																									<w:gridSpan w:val="4"/>
+																									<w:gridSpan w:val="2"/>
 																									<w:tcBorders>
 																										<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
 																										<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>

cn.com.taiji.system/src/main/java/cn/com/taiji/zhongxiao/domain/TinfoclassDatameta.java

@@ -46,6 +46,9 @@ public class TinfoclassDatameta implements Serializable{
     @Column(name="xxxmc")
     @Excel(name="信息项名称*",width = 25,isImportField = "true_st")
     private String xxxmc;
+    @Column(name="xxxdbmc")
+    @Excel(name="信息项英文名称*",width = 25,isImportField = "true_st")
+    private String xxxdbmc;
     private String xxxbm;
     @Excel(name="数据元编码",width = 25,isImportField = "true_st")
     @Column(name="glsjy")
@@ -247,6 +250,12 @@ public class TinfoclassDatameta implements Serializable{
     public void setXxxmc(String xxxmc) {
         this.xxxmc = xxxmc;
     }
+    public String getXxxdbmc() {
+        return xxxdbmc;
+    }
+    public void setXxxdbmc(String xxxdbmc) {
+        this.xxxdbmc = xxxdbmc;
+    }
     public String getGlsjy() {
         return glsjy;
     }

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_add.js

@@ -27,13 +27,16 @@ $(".mainform")
 					callback : function(form) {
 						var isCf=false;
 						var ary= new Array();
+						var ary2= new Array();
 						$("input[name='xxxmc']").each(function(){
 							ary.push($(this).val());
 						});
-						if(ary.length==0){
+						$("input[name='xxxdbmc']").each(function(){
+							ary2.push($(this).val());
+						});
+						if(ary.length==0 || ary2.length==0){
 							   isCf=true;
 							   alert("您尚未填写完整相关信息项信息,请填写后提交。");
-						    
 						}
 						var nary=ary.sort();
 						for(var i = 0; i < nary.length - 1; i++)
@@ -45,6 +48,16 @@ $(".mainform")
 							   break;
 						    }
 						}
+						var nary2=ary2.sort();
+						for(var i = 0; i < nary2.length - 1; i++)
+						{
+							if (nary2[i] == nary2[i+1])
+							{
+								isCf=true;
+								alert("存在重复信息项英文名称：" + nary2[i]+",请修改后提交。");
+								break;
+							}
+						}
 						
                         if(!isCf){
                         	var data1={"id":$("#id").val(),"infoname":$("#infoname").val(),"providebmcode":$("#providebmcode").val()};
@@ -390,6 +403,7 @@ function editxxxInfoHx(id){
 	 obj.isprimary=$("#"+id+" select[name='isprimary']").val();
 	 obj.xxxmc=$("#"+id+" input[name='xxxmc']").val();
 	 obj.xxxbm=$("#"+id+" input[name='xxxbm']").val();
+	 obj.xxxdbmc=$("#"+id+" input[name='xxxdbmc']").val();
 	 obj.glsjy=$("#"+id+" input[name='glsjy']").val();
 	 obj.sjymc=$("#"+id+" input[name='sjymc']").val();
 	 obj.sjylbname=$("#"+id+" input[name='sjylbname']").val();
@@ -436,7 +450,8 @@ function addDataMetaInfoZt(obj,xxxid){
     +"          <option value=\"是\"  title=\"是\"  "+selectvalue1+">是</option>"
     +"         </select></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxmc\"  value=\""+obj.xxxmc+"\"/></td>"
-    +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxbm\" readonly=\"true\" value=\""+obj.xxxbm+"\"/></td>"
+	+"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxdbmc\"  value=\""+obj.xxxdbmc+"\"/></td>"
+	+"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxbm\" readonly=\"true\" value=\""+obj.xxxbm+"\"/></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"glsjy\" readonly=\"true\" value=\""+obj.glsjy+"\"/></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"sjymc\" readonly=\"true\" value=\""+obj.sjymc+"\"/></td>"
 
@@ -477,7 +492,8 @@ function addDataMetaInfo(obj,xxxid){
     +"          <option value=\"是\"  title=\"是\"  "+selectvalue1+">是</option>"
     +"         </select></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxmc\"  value=\""+obj.xxxmc.value+"\"/></td>"
-    +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxbm\" readonly=\"true\" value=\""+obj.xxxbm.value+"\"/></td>"
+	+"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxdbmc\"  value=\""+obj.xxxdbmc.value+"\"/></td>"
+	+"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxbm\" readonly=\"true\" value=\""+obj.xxxbm.value+"\"/></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"glsjy\" readonly=\"true\" value=\""+obj.glsjy.value+"\"/></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"sjymc\" readonly=\"true\" value=\""+obj.sjymc.value+"\"/></td>"
 

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_edit.js

@@ -20,13 +20,21 @@ $(".mainform")
                         
 						var isCf=false;
 						var ary= new Array();
+						var ary2= new Array();
 						$("input[name='xxxmc']").each(function(){
 							ary.push($(this).val());
 						});
+						$("input[name='xxxdbmc']").each(function(){
+							ary2.push($(this).val());
+						});
 						if(ary.length==0){
 							   isCf=true;
 							   alert("您尚未填写完整相关信息项信息,请填写后提交。");
 						}
+						if(ary2.length==0){
+							isCf=true;
+							alert("您尚未填写完整相关信息项信息,请填写后提交。");
+						}
 						var nary=ary.sort();
 						for(var i = 0; i < nary.length - 1; i++)
 						{
@@ -37,6 +45,16 @@ $(".mainform")
 							   break;
 						    }
 						}
+						var nary2=ary2.sort();
+						for(var i = 0; i < nary2.length - 1; i++)
+						{
+							if (nary2[i] == nary2[i+1])
+							{
+								isCf=true;
+								alert("存在重复信息项名称：" + nary2[i]+",请修改后提交。");
+								break;
+							}
+						}
 						
                         if(!isCf){
                         	var data1={"id":$("#id").val(),"infoname":$("#infoname").val(),"providebmcode":$("#providebmcode").val()};
@@ -452,7 +470,8 @@ function addDataMetaInfo(obj,xxxid){
     +"          <option value=\"是\" title=\"是\"  "+selectvalue1+">是</option>"
     +"         </select></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxmc\"  value=\""+obj.xxxmc.value+"\"/></td>"
-    +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxbm\" readonly=\"true\" value=\""+obj.xxxbm.value+"\"/></td>"
+	+"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxdbmc\"  value=\""+obj.xxxdbmc.value+"\"/></td>"
+	+"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxbm\" readonly=\"true\" value=\""+obj.xxxbm.value+"\"/></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"glsjy\" readonly=\"true\" value=\""+obj.glsjy.value+"\"/></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"sjymc\" readonly=\"true\" value=\""+obj.sjymc.value+"\"/></td>"
 
@@ -504,7 +523,8 @@ function addDataMetaInfoZt(obj,xxxid){
     +"          <option value=\"是\"  title=\"是\"  "+selectvalue1+">是</option>"
     +"         </select></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxmc\"  value=\""+obj.xxxmc+"\"/></td>"
-    +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxbm\" readonly=\"true\" value=\""+obj.xxxbm+"\"/></td>"
+	+"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxdbmc\"  value=\""+obj.xxxdbmc+"\"/></td>"
+	+"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"xxxbm\" readonly=\"true\" value=\""+obj.xxxbm+"\"/></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"glsjy\" readonly=\"true\" value=\""+obj.glsjy+"\"/></td>"
     +"<td width=\"200\" class=\"fn-text-center\"><input class=\"input-normal input-wdl\" type=\"text\" name=\"sjymc\" readonly=\"true\" value=\""+obj.sjymc+"\"/></td>"
 

cn.com.taiji.system/src/main/resources/static/theme/tinfoclass/tinfoclass_xxladd.js

@@ -27,17 +27,47 @@ $(".mainform")
 							parent.addDataMetaInfo(form.context,xxxid);
 							var index = parent.layer.getFrameIndex(window.name);  
 					        parent.layer.close(index);
-							
 						}
 						return false;
 					}
 				});
+
+function setGlsjyFalse() {
+	$("#choose").hide();
+	$("#sjymc").removeAttr("disabled");
+	$("#sjylb").removeAttr("disabled");
+	$("#subsjylb").removeAttr("disabled");
+	$("#datasize").removeAttr("disabled");
+	$("#ranges").removeAttr("disabled");
+	$("#sjymc").val("");
+	$("#sjylb").val("");
+	$("#subsjylb").val("");
+	$("#datasize").val("");
+	$("#ranges").val("");
+	$("#sjylbname").val("");
+	$("#sjylbid").val("");
+	$("#subsjylbname").val("");
+	$("#subsjylbid").val("");
+	$("#sjyid").val("");
+	$("#sjymc1").hide();
+	$("#sjymc2").hide();
+}
+
+function setGlsjyTrue() {
+	$("#choose").show();
+	$("#sjymc").attr("readonly","true");
+	$("#sjylb").attr("disabled","disabled");
+	$("#subsjylb").attr("disabled","disabled");
+	$("#sjymc1").show();
+	$("#sjymc2").show();
+}
 $(document).ready(function(){ 
 	if(xxxid!=""){
 		var obj = new Object();
 		obj=parent.editxxxInfoHx(xxxid);
 		$("#isprimary").val(obj.isprimary);
 		$("#xxxmc").val(obj.xxxmc);
+		$("#xxxdbmc").val(obj.xxxdbmc);
 		$("#xxxbm").val(obj.xxxbm);
 		$("#glsjy").val(obj.glsjy);
 		$("#sjymc").val(obj.sjymc);
@@ -137,14 +167,9 @@ $(document).ready(function(){
  			}); 
 	}
 	else{
-		$("#glsjy").val("是");
-		$("#choose").show();
-		$("#sjymc").attr("readonly","true");
-		$("#sjylb").attr("disabled","disabled");
-		$("#subsjylb").attr("disabled","disabled");
-		
-		$("#sjymc1").show();
-		$("#sjymc2").show();
+		$("#isprimary").val("否");
+		$("#glsjy").val("否");
+		setGlsjyFalse();
 		var obj = new Object();
 		obj.sharemode=parent.$("#sharemode").val();
 		obj.sharemodetype=parent.$("#sharemodetype").val();
@@ -243,35 +268,11 @@ $(document).ready(function(){
 	});
 	$("#glsjy").change(function(){
 		if($(this).val()=='否'){
-			$("#choose").hide();
-			$("#sjymc").removeAttr("disabled");
-			$("#sjylb").removeAttr("disabled");
-			$("#subsjylb").removeAttr("disabled");
-			$("#datasize").removeAttr("disabled");
-			$("#ranges").removeAttr("disabled");
-			$("#sjymc").val("");
-			$("#sjylb").val("");
-			$("#subsjylb").val("");
-			$("#datasize").val("");
-			$("#ranges").val("");
-			$("#sjylbname").val("");
-			$("#sjylbid").val("");
-			$("#subsjylbname").val("");
-			$("#subsjylbid").val("");
-			$("#sjyid").val("");
-			$("#sjymc1").hide();
-			$("#sjymc2").hide();
+			setGlsjyFalse()
 		}
 		else{
-			$("#choose").show();
-			$("#sjymc").attr("readonly","true");
-			$("#sjylb").attr("disabled","disabled");
-			$("#subsjylb").attr("disabled","disabled");
-			
-			$("#sjymc1").show();
-			$("#sjymc2").show();
+			setGlsjyTrue()
 		}
-		
 	});
 	$('#sharetype').change(function(){ 
 		if($(this).val()=="有条件共享"){

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_add.html

@@ -236,6 +236,7 @@
             <th width="200" class="fn-text-left">删除</th>
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+              <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">信息项编码</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_auditPage.html

@@ -224,6 +224,7 @@
             <tr>
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+                <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>
               <th width="200" class="fn-text-left">数据元类别</th>
@@ -247,6 +248,8 @@
              </td>
     <td width="200" class="fn-text-left" th:text="${tdata.xxxmc}">
     </td>
+             <td width="200" class="fn-text-left" th:text="${tdata.xxxdbmc}">
+             </td>
     <td width="200" class="fn-text-left" th:text="${tdata.glsjy}">
     </td>
     <td width="200" class="fn-text-left" th:text="${tdata.metaname}">
@@ -534,6 +537,7 @@
             <th width="200" class="fn-text-center">操作</th>
               <th width="100" class="fn-text-center">主键</th>
               <th width="200" class="fn-text-center">信息项名称</th>
+                <th width="200" class="fn-text-center">英文名称</th>
               <th width="200" class="fn-text-center">信息项编码</th>
               <th width="200" class="fn-text-center">关联数据元</th>
               <th width="200" class="fn-text-center">数据元名称</th>
@@ -565,6 +569,7 @@
               <option value="是" title="是" th:selected="${tdata.isprimary=='是'}">是</option>
              </select></td>
     <td width="200" class="fn-text-center"><input class="input-normal input-wdl" type="text" name="xxxmc" readonly="true" th:value="${tdata.xxxmc}"/></td>
+             <td width="200" class="fn-text-center"><input class="input-normal input-wdl" type="text" name="xxxdbmc" readonly="true" th:value="${tdata.xxxdbmc}"/></td>
     <td width="200" class="fn-text-center"><input class="input-normal input-wdl" type="text" name="xxxbm" readonly="true" th:value="${tdata.xxxbm}"/></td>
     
     <td width="200" class="fn-text-center"><input class="input-normal input-wdl" type="text" name="glsjy" readonly="true" th:value="${tdata.glsjy}"/></td>
@@ -686,6 +691,7 @@
     	 var obj = new Object();
     	 obj.isprimary=$("#"+id+" select[name='isprimary']").val();
     	 obj.xxxmc=$("#"+id+" input[name='xxxmc']").val();
+         obj.xxxdbmc=$("#"+id+" input[name='xxxdbmc']").val();
     	 obj.xxxbm=$("#"+id+" input[name='xxxbm']").val();
     	 obj.glsjy=$("#"+id+" input[name='glsjy']").val();
     	 obj.sjymc=$("#"+id+" input[name='sjymc']").val();

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_bg.html

@@ -272,6 +272,7 @@
               <th width="200" class="fn-text-left">操作</th>
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+                <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">信息项编码</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>
@@ -301,7 +302,8 @@
               <option value="是" title="是" th:selected="${tdata.isprimary=='是'}">是</option>
              </select></td>
     <td width="200" class="fn-text-left"><input class="input-normal input-wdl" type="text" name="xxxmc" readonly="true" th:value="${tdata.xxxmc}"/></td>
-    <td width="200" class="fn-text-left"><input class="input-normal input-wdl" type="text" name="xxxbm" readonly="true" th:value="${tdata.xxxbm}"/></td>
+             <td width="200" class="fn-text-left"><input class="input-normal input-wdl" type="text" name="xxxdbmc" readonly="true" th:value="${tdata.xxxdbmc}"/></td>
+             <td width="200" class="fn-text-left"><input class="input-normal input-wdl" type="text" name="xxxbm" readonly="true" th:value="${tdata.xxxbm}"/></td>
     <td width="200" class="fn-text-left"><input class="input-normal input-wdl" type="text" name="glsjy" readonly="true" th:value="${tdata.glsjy}"/></td>
     <td width="200" class="fn-text-left"><input class="input-normal input-wdl" type="text" name="sjymc" readonly="true" th:value="${tdata.metaname}"/></td>
     <td width="200" class="fn-text-left"><input class="input-normal input-wdl" type="text" name="sjylbname" readonly="true" th:value="${tdata.metacodeDis}"/></td>
@@ -406,6 +408,7 @@ else{
     	 var obj = new Object();
     	 obj.isprimary=$("#"+id+" select[name='isprimary']").val();
     	 obj.xxxmc=$("#"+id+" input[name='xxxmc']").val();
+         obj.xxxdbmc=$("#"+id+" input[name='xxxdbmc']").val();
     	 obj.xxxbm=$("#"+id+" input[name='xxxbm']").val();
     	 obj.glsjy=$("#"+id+" input[name='glsjy']").val();
     	 obj.sjymc=$("#"+id+" input[name='sjymc']").val();

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_compareInfo.html

@@ -70,6 +70,7 @@
             <tr>
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+                <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>
               <th width="200" class="fn-text-left">数据元类别</th>
@@ -93,6 +94,8 @@
              </td>
     <td width="200" class="fn-text-left" th:text="${tdata.xxxmc}">
     </td>
+             <td width="200" class="fn-text-left" th:text="${tdata.xxxdbmc}">
+             </td>
     <td width="200" class="fn-text-left" th:text="${tdata.glsjy}">
     </td>
     <td width="200" class="fn-text-left" th:text="${tdata.metaname}">
@@ -150,6 +153,7 @@
             <tr>
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+                <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>
               <th width="200" class="fn-text-left">数据元类别</th>
@@ -173,6 +177,8 @@
              </td>
     <td width="200" class="fn-text-left" th:text="${tdata.xxxmc}">
     </td>
+             <td width="200" class="fn-text-left" th:text="${tdata.xxxdbmc}">
+             </td>
     <td width="200" class="fn-text-left" th:text="${tdata.glsjy}">
     </td>
     <td width="200" class="fn-text-left" th:text="${tdata.metaname}">
@@ -235,6 +241,7 @@
             <tr>
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+                <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>
               <th width="200" class="fn-text-left">数据元类别</th>
@@ -258,6 +265,8 @@
              </td>
     <td width="200" class="fn-text-left" th:text="${tdata.xxxmc}">
     </td>
+             <td width="200" class="fn-text-left" th:text="${tdata.xxxdbmc}">
+             </td>
     <td width="200" class="fn-text-left" th:text="${tdata.glsjy}">
     </td>
     <td width="200" class="fn-text-left" th:text="${tdata.metaname}">
@@ -315,6 +324,7 @@
             <tr>
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+                <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>
               <th width="200" class="fn-text-left">数据元类别</th>
@@ -338,6 +348,8 @@
              </td>
     <td width="200" class="fn-text-left" th:text="${tdata.xxxmc}">
     </td>
+             <td width="200" class="fn-text-left" th:text="${tdata.xxxdbmc}">
+             </td>
     <td width="200" class="fn-text-left" th:text="${tdata.glsjy}">
     </td>
     <td width="200" class="fn-text-left" th:text="${tdata.metaname}">

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_edit.html

@@ -260,6 +260,7 @@
             <th width="200" class="fn-text-left">操作</th>
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+              <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">信息项编码</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>
@@ -291,6 +292,7 @@
               <option value="是" title="是" th:selected="${tdata.isprimary=='是'}">是</option>
              </select></td>
     <td width="200" class="fn-text-center"><input class="input-normal input-wdl" type="text" name="xxxmc" readonly="true" th:value="${tdata.xxxmc}"/></td>
+    <td width="200" class="fn-text-center"><input class="input-normal input-wdl" type="text" name="xxxdbmc" readonly="true" th:value="${tdata.xxxdbmc}"/></td>
     <td width="200" class="fn-text-center"><input class="input-normal input-wdl" type="text" name="xxxbm" readonly="true" th:value="${tdata.xxxbm}"/></td>
     
     <td width="200" class="fn-text-center"><input class="input-normal input-wdl" type="text" name="glsjy" readonly="true" th:value="${tdata.glsjy}"/></td>
@@ -383,6 +385,7 @@
     	 var obj = new Object();
     	 obj.isprimary=$("#"+id+" select[name='isprimary']").val();
     	 obj.xxxmc=$("#"+id+" input[name='xxxmc']").val();
+         obj.xxxdbmc=$("#"+id+" input[name='xxxdbmc']").val();
     	 obj.xxxbm=$("#"+id+" input[name='xxxbm']").val();
     	 obj.glsjy=$("#"+id+" input[name='glsjy']").val();
     	 obj.sjymc=$("#"+id+" input[name='sjymc']").val();

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_tyinfo.html

@@ -269,6 +269,7 @@
             <tr>
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+                <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>
               <th width="200" class="fn-text-left">数据元类别</th>
@@ -287,6 +288,8 @@
              </td>
     <td width="200" class="fn-text-left" th:text="${tdata.xxxmc}">
     </td>
+             <td width="200" class="fn-text-left" th:text="${tdata.xxxdbmc}">
+             </td>
     <td width="200" class="fn-text-left" th:text="${tdata.glsjy}">
     </td>
     <td width="200" class="fn-text-left" th:text="${tdata.metaname}">

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_view.html

@@ -243,6 +243,7 @@
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项编码</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+              <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>
               <th width="200" class="fn-text-left">数据元类别</th>
@@ -268,6 +269,8 @@
     </td>
     <td width="200" class="fn-text-left" th:text="${tdata.xxxmc}">
     </td>
+             <td width="200" class="fn-text-left" th:text="${tdata.xxxdbmc}">
+             </td>
     <td width="200" class="fn-text-left" th:text="${tdata.glsjy}">
     </td>
     <td width="200" class="fn-text-left" th:text="${tdata.metaname}">

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/tinfoclass_xxladd.html

@@ -93,8 +93,11 @@
                        <th><font class="fontred"></font>对应代码集</th>
                        <td ><input type="text" readonly="true" name="codesetName" placeholder="点击选择对应代码集" id="codesetName" class="input-normal input-wdl  " /></td>
                        <input type="hidden" name="codesetid" id="codesetid"  />
-                   
                    </tr>
+                  <tr>
+                      <th><font class="fontred">*</font>信息项英文名称</th>
+                      <td><input type="text" name="xxxdbmc" id="xxxdbmc" class="input-normal input-wdl" datatype="*1-20" nullmsg="必填" sucmsg="&nbsp;" errormsg="不超过20个字符"/></td>
+                  </tr>
                    </tbody>
                    <tbody style="display:none">
                     <tr>
@@ -164,6 +167,7 @@
 <script th:inline="javascript">
  /*<![CDATA[*/
 	 var xxxid=/*[[${xxxid}]]*/;
+     console.log("xxxid ==== " + xxxid)
  /*]]>*/
  </script>	
 <script type="text/javascript" th:src="@{/theme/tinfoclass/tinfoclass_xxladd.js}"></script>

cn.com.taiji.system/src/main/resources/templates/thymeleaf/tinfoclass/zxfk.html

@@ -237,6 +237,7 @@
             <tr>
               <th width="100" class="fn-text-left">主键</th>
               <th width="200" class="fn-text-left">信息项名称</th>
+                <th width="200" class="fn-text-left">英文名称</th>
               <th width="200" class="fn-text-left">关联数据元</th>
               <th width="200" class="fn-text-left">数据元名称</th>
               <th width="200" class="fn-text-left">数据元类别</th>
@@ -255,6 +256,8 @@
              </td>
     <td width="200" class="fn-text-left" th:text="${tdata.xxxmc}">
     </td>
+             <td width="200" class="fn-text-left" th:text="${tdata.xxxdbmc}">
+             </td>
     <td width="200" class="fn-text-left" th:text="${tdata.glsjy}">
     </td>
     <td width="200" class="fn-text-left" th:text="${tdata.metaname}">
@@ -353,6 +356,7 @@
 						          	 <th class="bd_c2">主键</th>
 						          	 <th class="bd_c2">编码</th>
 						             <th class="bd_c2">名称</th>
+                                     <th class="bd_c2">英文名称</th>
 						             <th class="bd_c2">类别</th>
 						             <th class="bd_c3">类型</th>
 						             <th class="bd_c3">长度</th>
@@ -367,6 +371,7 @@
 								  <td class="fn-text-left" th:text="${tdata.isprimary}"></td>
 								  <td class="fn-text-left" th:text="${tdata.xxxbm}"></td>
 							      <td class="fn-text-left" th:text="${tdata.xxxmc}"></td>
+                                     <td class="fn-text-left" th:text="${tdata.xxxdbmc}"></td>
 							      <td class="fn-text-left" th:text="${tdata.metacodeDis}"></td>
 							      <td class="fn-text-left" th:text="${tdata.datatypeDis}"></td>
 							      <td class="fn-text-left" th:text="${tdata.datasize}" ></td>

database/cgw.sql

@@ -9769,6 +9769,7 @@ CREATE TABLE `t_infoclass_datameta`  (
   `TINFOCLASSID` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL,
   `INDEXNUM` decimal(10, 0) NULL DEFAULT NULL,
   `XXXMC` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL,
+  `XXXDBMC` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL,
   `GLSJY` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL,
   `SHARETYPE` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL,
   `SHARECONDITIONS` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT NULL,