ibizdev提交

app_Web/src/locale/lanres/org/org_en_US.ts

@@ -48,8 +48,8 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			porgname: "父机构名称",
 			orgname: "机构名称",
+			porgname: "父机构名称",
 			updateman: "更新人",
 			updatedate: "更新时间",
 		},

app_Web/src/locale/lanres/org/org_zh_CN.ts

@@ -47,8 +47,8 @@ export default {
 	},
 	main_grid: {
 		columns: {
-			porgname: '父机构名称',
 			orgname: '机构名称',
+			porgname: '父机构名称',
 			updateman: '更新人',
 			updatedate: '更新时间',
 		},

app_Web/src/mock/entity/cids/cids.ts

@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:40:48","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"28","orgusername":null,"cidname":"Test","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"28","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"},
-    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:40:48","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"29","orgusername":null,"cidname":"Test(1)","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"29","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"},
-    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:40:48","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"30","orgusername":null,"cidname":"Test(2)","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"30","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"},
-    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:40:48","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"31","orgusername":null,"cidname":"Test(3)","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"31","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"},
-    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:40:48","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"32","orgusername":null,"cidname":"Test(4)","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"32","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"},
-    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:40:48","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"33","orgusername":null,"cidname":"Test(5)","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"33","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"}
+    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:53:31","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"28","orgusername":null,"cidname":"Test","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"28","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"},
+    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:53:31","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"29","orgusername":null,"cidname":"Test(1)","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"29","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"},
+    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:53:31","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"30","orgusername":null,"cidname":"Test(2)","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"30","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"},
+    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:53:31","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"31","orgusername":null,"cidname":"Test(3)","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"31","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"},
+    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:53:31","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"32","orgusername":null,"cidname":"Test(4)","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"32","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"},
+    {"zbzl":null,"jqxde":null,"clzl":null,"jqxdqfs":null,"createdate":"2020-03-08 23:53:31","qdlx":null,"jqxdqfl":null,"updateman":"示例操作者","fdjh":null,"cdrq":null,"abl":null,"srfkey":"33","orgusername":null,"cidname":"Test(5)","ywly":null,"orgid":null,"orgname":null,"hpzl":null,"jqxdb":null,"syx":null,"cidid":"33","cldl":null,"hdzk":null,"cllxms":null,"orguserid":null,"syxde":null,"syxdb":null,"dycpxh":null,"cpxhid":null,"clsjjz":null,"hdzzl":null,"jqx":null,"syxdqfl":null,"xcgzj":null,"gl":null,"syxz":null,"cphm":null,"cjh":null,"pl":null,"cpxhname":null,"syxdqfs":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"}
 ];
 
 

app_Web/src/mock/entity/cpxhs/cpxhs.ts

@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"16","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"16","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test","pl":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","pp":null,"createman":"示例操作者"},
-    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"17","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"17","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test(1)","pl":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","pp":null,"createman":"示例操作者"},
-    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"18","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"18","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test(2)","pl":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","pp":null,"createman":"示例操作者"},
-    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"19","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"19","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test(3)","pl":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","pp":null,"createman":"示例操作者"},
-    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"20","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"20","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test(4)","pl":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","pp":null,"createman":"示例操作者"},
-    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"21","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"21","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test(5)","pl":null,"hpds":null,"updatedate":"2020-03-08 23:40:48","pp":null,"createman":"示例操作者"}
+    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"16","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"16","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test","pl":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","pp":null,"createman":"示例操作者"},
+    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"17","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"17","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test(1)","pl":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","pp":null,"createman":"示例操作者"},
+    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"18","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"18","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test(2)","pl":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","pp":null,"createman":"示例操作者"},
+    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"19","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"19","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test(3)","pl":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","pp":null,"createman":"示例操作者"},
+    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"20","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"20","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test(4)","pl":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","pp":null,"createman":"示例操作者"},
+    {"ssnf":null,"zbzl":null,"bz":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","abl":null,"sccs":null,"srfkey":"21","bm":null,"hdzk":null,"cllxms":null,"cxdm":null,"dycpxh":null,"cpxhid":"21","clsjjz":null,"cx":null,"hdzzl":null,"xcgzj":null,"gl":null,"cpxhname":"Test(5)","pl":null,"hpds":null,"updatedate":"2020-03-08 23:53:31","pp":null,"createman":"示例操作者"}
 ];
 
 

app_Web/src/mock/entity/customers/customers.ts

@@ -4,11 +4,11 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"csny":null,"createdate":"2020-03-08 23:40:48","khlx":null,"updateman":"示例操作者","srfkey":"4","customerid":"4","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者","nl":null,"customername":"Tets"},
-    {"csny":null,"createdate":"2020-03-08 23:40:48","khlx":null,"updateman":"示例操作者","srfkey":"5","customerid":"5","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者","nl":null,"customername":"Tets(1)"},
-    {"csny":null,"createdate":"2020-03-08 23:40:48","khlx":null,"updateman":"示例操作者","srfkey":"6","customerid":"6","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者","nl":null,"customername":"Tets(2)"},
-    {"csny":null,"createdate":"2020-03-08 23:40:48","khlx":null,"updateman":"示例操作者","srfkey":"7","customerid":"7","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者","nl":null,"customername":"Tets(3)"},
-    {"csny":null,"createdate":"2020-03-08 23:40:48","khlx":null,"updateman":"示例操作者","srfkey":"8","customerid":"8","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者","nl":null,"customername":"Tets(4)"},
-    {"csny":null,"createdate":"2020-03-08 23:40:48","khlx":null,"updateman":"示例操作者","srfkey":"9","customerid":"9","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者","nl":null,"customername":"Tets(5)"}
+    {"csny":null,"createdate":"2020-03-08 23:53:31","khlx":null,"updateman":"示例操作者","srfkey":"4","customerid":"4","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者","nl":null,"customername":"Tets"},
+    {"csny":null,"createdate":"2020-03-08 23:53:31","khlx":null,"updateman":"示例操作者","srfkey":"5","customerid":"5","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者","nl":null,"customername":"Tets(1)"},
+    {"csny":null,"createdate":"2020-03-08 23:53:31","khlx":null,"updateman":"示例操作者","srfkey":"6","customerid":"6","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者","nl":null,"customername":"Tets(2)"},
+    {"csny":null,"createdate":"2020-03-08 23:53:31","khlx":null,"updateman":"示例操作者","srfkey":"7","customerid":"7","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者","nl":null,"customername":"Tets(3)"},
+    {"csny":null,"createdate":"2020-03-08 23:53:31","khlx":null,"updateman":"示例操作者","srfkey":"8","customerid":"8","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者","nl":null,"customername":"Tets(4)"},
+    {"csny":null,"createdate":"2020-03-08 23:53:31","khlx":null,"updateman":"示例操作者","srfkey":"9","customerid":"9","xb":null,"zjhm":null,"zjlx":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者","nl":null,"customername":"Tets(5)"}
 ];
 

app_Web/src/mock/entity/jqxxxs/jqxxxs.ts

@@ -4,11 +4,11 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test","tkmc":null,"srfkey":"10","tkdm":null,"jqxxxid":"10","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"},
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test(1)","tkmc":null,"srfkey":"11","tkdm":null,"jqxxxid":"11","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"},
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test(2)","tkmc":null,"srfkey":"12","tkdm":null,"jqxxxid":"12","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"},
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test(3)","tkmc":null,"srfkey":"13","tkdm":null,"jqxxxid":"13","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"},
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test(4)","tkmc":null,"srfkey":"14","tkdm":null,"jqxxxid":"14","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"},
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test(5)","tkmc":null,"srfkey":"15","tkdm":null,"jqxxxid":"15","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:40:48","createman":"示例操作者"}
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test","tkmc":null,"srfkey":"10","tkdm":null,"jqxxxid":"10","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"},
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test(1)","tkmc":null,"srfkey":"11","tkdm":null,"jqxxxid":"11","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"},
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test(2)","tkmc":null,"srfkey":"12","tkdm":null,"jqxxxid":"12","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"},
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test(3)","tkmc":null,"srfkey":"13","tkdm":null,"jqxxxid":"13","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"},
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test(4)","tkmc":null,"srfkey":"14","tkdm":null,"jqxxxid":"14","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"},
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"jqxxxname":"Test(5)","tkmc":null,"srfkey":"15","tkdm":null,"jqxxxid":"15","jzbf":null,"flxs":null,"sjbf":null,"cidid":null,"updatedate":"2020-03-08 23:53:31","createman":"示例操作者"}
 ];
 

app_Web/src/mock/entity/orgs/orgs.ts

@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"orgid":"40","orgname":"Test","porgid":null,"porgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","srfkey":"40"},
-    {"orgid":"41","orgname":"Test(1)","porgid":null,"porgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","srfkey":"41"},
-    {"orgid":"42","orgname":"Test(2)","porgid":null,"porgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","srfkey":"42"},
-    {"orgid":"43","orgname":"Test(3)","porgid":null,"porgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","srfkey":"43"},
-    {"orgid":"44","orgname":"Test(4)","porgid":null,"porgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","srfkey":"44"},
-    {"orgid":"45","orgname":"Test(5)","porgid":null,"porgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","srfkey":"45"}
+    {"orgid":"40","orgname":"Test","porgid":null,"porgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","srfkey":"40"},
+    {"orgid":"41","orgname":"Test(1)","porgid":null,"porgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","srfkey":"41"},
+    {"orgid":"42","orgname":"Test(2)","porgid":null,"porgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","srfkey":"42"},
+    {"orgid":"43","orgname":"Test(3)","porgid":null,"porgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","srfkey":"43"},
+    {"orgid":"44","orgname":"Test(4)","porgid":null,"porgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","srfkey":"44"},
+    {"orgid":"45","orgname":"Test(5)","porgid":null,"porgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","srfkey":"45"}
 ];
 
 

app_Web/src/mock/entity/orgusers/orgusers.ts

@@ -4,12 +4,12 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"orguserid":"22","orgid":null,"orgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","orgusername":"Test","srfkey":"22"},
-    {"orguserid":"23","orgid":null,"orgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","orgusername":"Test(1)","srfkey":"23"},
-    {"orguserid":"24","orgid":null,"orgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","orgusername":"Test(2)","srfkey":"24"},
-    {"orguserid":"25","orgid":null,"orgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","orgusername":"Test(3)","srfkey":"25"},
-    {"orguserid":"26","orgid":null,"orgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","orgusername":"Test(4)","srfkey":"26"},
-    {"orguserid":"27","orgid":null,"orgname":null,"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","orgusername":"Test(5)","srfkey":"27"}
+    {"orguserid":"22","orgid":null,"orgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","orgusername":"Test","srfkey":"22"},
+    {"orguserid":"23","orgid":null,"orgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","orgusername":"Test(1)","srfkey":"23"},
+    {"orguserid":"24","orgid":null,"orgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","orgusername":"Test(2)","srfkey":"24"},
+    {"orguserid":"25","orgid":null,"orgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","orgusername":"Test(3)","srfkey":"25"},
+    {"orguserid":"26","orgid":null,"orgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","orgusername":"Test(4)","srfkey":"26"},
+    {"orguserid":"27","orgid":null,"orgname":null,"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","orgusername":"Test(5)","srfkey":"27"}
 ];
 
 

app_Web/src/mock/entity/syxxxs/syxxxs.ts

@@ -4,11 +4,11 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"34","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test","sjbf":null,"cidid":null,"syxxxid":"34","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","ptfhxs":null},
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"35","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test(1)","sjbf":null,"cidid":null,"syxxxid":"35","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","ptfhxs":null},
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"36","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test(2)","sjbf":null,"cidid":null,"syxxxid":"36","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","ptfhxs":null},
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"37","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test(3)","sjbf":null,"cidid":null,"syxxxid":"37","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","ptfhxs":null},
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"38","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test(4)","sjbf":null,"cidid":null,"syxxxid":"38","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","ptfhxs":null},
-    {"createdate":"2020-03-08 23:40:48","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"39","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test(5)","sjbf":null,"cidid":null,"syxxxid":"39","updatedate":"2020-03-08 23:40:48","createman":"示例操作者","ptfhxs":null}
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"34","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test","sjbf":null,"cidid":null,"syxxxid":"34","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","ptfhxs":null},
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"35","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test(1)","sjbf":null,"cidid":null,"syxxxid":"35","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","ptfhxs":null},
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"36","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test(2)","sjbf":null,"cidid":null,"syxxxid":"36","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","ptfhxs":null},
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"37","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test(3)","sjbf":null,"cidid":null,"syxxxid":"37","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","ptfhxs":null},
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"38","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test(4)","sjbf":null,"cidid":null,"syxxxid":"38","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","ptfhxs":null},
+    {"createdate":"2020-03-08 23:53:31","updateman":"示例操作者","zrxe":null,"tkmc":null,"zzxs":null,"srfkey":"39","tkdm":null,"bjmp":null,"jzbf":null,"fl":null,"syxxxname":"Test(5)","sjbf":null,"cidid":null,"syxxxid":"39","updatedate":"2020-03-08 23:53:31","createman":"示例操作者","ptfhxs":null}
 ];
 

app_Web/src/mock/entity/tbydks/tbydks.ts

@@ -4,9 +4,9 @@ const mock = MockAdapter.getInstance();
 
 // 模拟数据
 const mockDatas: Array<any> = [
-    {"tymc":null,"tbydkid":"1","tbydkname":"Test","createdate":"2020-03-08 23:40:48","updateman":"示例操作者","lb":null,"updatedate":"2020-03-08 23:40:48","tynr":null,"createman":"示例操作者","srfkey":"1"},
-    {"tymc":null,"tbydkid":"2","tbydkname":"Test(1)","createdate":"2020-03-08 23:40:48","updateman":"示例操作者","lb":null,"updatedate":"2020-03-08 23:40:48","tynr":null,"createman":"示例操作者","srfkey":"2"},
-    {"tymc":null,"tbydkid":"3","tbydkname":"Test(2)","createdate":"2020-03-08 23:40:48","updateman":"示例操作者","lb":null,"updatedate":"2020-03-08 23:40:48","tynr":null,"createman":"示例操作者","srfkey":"3"}
+    {"tymc":null,"tbydkid":"1","tbydkname":"Test","createdate":"2020-03-08 23:53:31","updateman":"示例操作者","lb":null,"updatedate":"2020-03-08 23:53:31","tynr":null,"createman":"示例操作者","srfkey":"1"},
+    {"tymc":null,"tbydkid":"2","tbydkname":"Test(1)","createdate":"2020-03-08 23:53:31","updateman":"示例操作者","lb":null,"updatedate":"2020-03-08 23:53:31","tynr":null,"createman":"示例操作者","srfkey":"2"},
+    {"tymc":null,"tbydkid":"3","tbydkname":"Test(2)","createdate":"2020-03-08 23:53:31","updateman":"示例操作者","lb":null,"updatedate":"2020-03-08 23:53:31","tynr":null,"createman":"示例操作者","srfkey":"3"}
 ];
 
 

app_Web/src/widgets/org/main-grid/main-grid-base.vue

@@ -14,17 +14,17 @@
             <template v-if="!isSingleSelect">
                 <el-table-column type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
-            <template v-if="getColumnState('porgname')">
-                <el-table-column show-overflow-tooltip :prop="'porgname'" :label="$t('org.main_grid.columns.porgname')" :width="100" :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('orgname')">
+                <el-table-column show-overflow-tooltip :prop="'orgname'" :label="$t('org.main_grid.columns.orgname')" :width="250" :align="'left'" :sortable="'custom'">
                     <template v-slot="{row,column}">
-                        <span>{{row.porgname}}</span>
+                        <span>{{row.orgname}}</span>
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('orgname')">
-                <el-table-column show-overflow-tooltip :prop="'orgname'" :label="$t('org.main_grid.columns.orgname')" :width="150" :align="'left'" :sortable="'custom'">
+            <template v-if="getColumnState('porgname')">
+                <el-table-column show-overflow-tooltip :prop="'porgname'" :label="$t('org.main_grid.columns.porgname')" :width="250" :align="'left'" :sortable="'custom'">
                     <template v-slot="{row,column}">
-                        <span>{{row.orgname}}</span>
+                        <span>{{row.porgname}}</span>
                     </template>
                 </el-table-column>
             </template>
@@ -402,16 +402,16 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     protected allColumns: any[] = [
         {
-            name: 'porgname',
-            label: '父机构名称',
-            langtag: 'org.main_grid.columns.porgname',
+            name: 'orgname',
+            label: '机构名称',
+            langtag: 'org.main_grid.columns.orgname',
             show: true,
             util: 'PX'
         },
         {
-            name: 'orgname',
-            label: '机构名称',
-            langtag: 'org.main_grid.columns.orgname',
+            name: 'porgname',
+            label: '父机构名称',
+            langtag: 'org.main_grid.columns.porgname',
             show: true,
             util: 'PX'
         },