Merge remote-tracking branch 'origin/feat/QxOcrFieldMg-20240412' into feat/QxOcrFieldMg-20240412

htmlweb/web/backstage/oa/ocr/information/list.html

@@ -115,7 +115,12 @@
                 }
 							},
 							{ width:150,valign: "middle",field:'fieldDesc',title:'字段描述',sortable:true},
-							{ width:80,valign: "middle",field:'isrequired',title:'是否必选',sortable:true},
+							{ width:80,valign: "middle",field:'isrequired',title:'是否必选',sortable:true,
+                formatter:function(value,oData,index) {
+
+                  return (oData.data.isrequired == '1'?'启用':'停用');
+                }
+							},
 							{ width:80,valign: "middle",field:'sort',title:'排序字段',sortable:true},
 							{
 								width:200,
@@ -162,7 +167,8 @@
 	}
 	function t_delete(str){
 		parent.layer.closeAll('loading');
-			$.getJSON('${ctx}/ocr/field/delete?logintoken=' + parent.document.getElementById("logintoken").value, {id:str}, function(data){
+			// $.getJSON('${ctx}/ocr/field/delete?logintoken=' + parent.document.getElementById("logintoken").value, {id:str}, function(data){
+    parent.axgetXiaoyao('${ctx}/ocr/field/delete' , {id:str},false, function(data){
 				parent.layer.closeAll('loading');
 				if(data.code == "OK"){
 					swal(data.message, "您已经永久删除了这条信息。", "success");

htmlweb/web/backstage/system/information/list.html

@@ -169,7 +169,7 @@
 	function t_delete(str){
 		parent.layer.closeAll('loading');
 			// $.getJSON('${ctx}/backstage/ocr/field/delete?logintoken=' + parent.document.getElementById("logintoken").value, {id:str}, function(data){
-    	parent.axgetXiaoyao('${ctx}/backstage/ocr/field/delete' , {id:str},false, function(data){
+      parent.axgetXiaoyao('${ctx}/backstage/ocr/field/delete' , {id:str},false, function(data){
 				parent.layer.closeAll('loading');
 				if(data.code == "OK"){
 					swal(data.message, "您已经永久删除了这条信息。", "success");