tony001 发布系统代码 [后台服务，演示应用]

app_Web/src/locale/lanres/entities/micro-component/micro-component_en_US.ts

@@ -72,30 +72,38 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			field1: "指定单位及下级单位多选", 
 			field3: "指定单位及下级单位单选", 
+			field1: "指定单位及下级单位多选", 
 			field5: "全部单位单选", 
 			field7: "全部单位多选", 
-			field9: "指定单位及下级单位所有部门多选", 
 			field11: "指定单位及下级单位所有部门单选", 
-			field13: "指定单位部门多选", 
+			field9: "指定单位及下级单位所有部门多选", 
 			field15: "指定单位部门单选", 
-			field17: "指定单位人员多选", 
+			field13: "指定单位部门多选", 
 			field19: "指定单位人员单选", 
-			field21: "指定单位及下级单位人员多选", 
+			field17: "指定单位人员多选", 
 			field23: "指定单位及下级单位人员单选", 
-			field14: "属性14", 
+			field21: "指定单位及下级单位人员多选", 
+			field27: "指定部门人员单选", 
+			field25: "指定部门人员多选", 
+			field31: "指定部门及下级部门人员单选", 
+			field29: "指定部门及下级部门人员多选", 
 			microcomponentid: "微组件标识", 
+			field28: "属性28", 
+			field18: "属性18", 
+			field32: "属性32", 
+			field14: "属性14", 
+			field26: "属性26", 
 			field4: "属性4", 
 			field16: "属性16", 
-			field24: "属性24", 
 			field2: "属性2", 
-			field22: "属性22", 
+			field24: "属性24", 
 			field8: "属性8", 
+			field22: "属性22", 
 			field12: "属性12", 
-			field20: "属性20", 
 			field6: "属性6", 
-			field18: "属性18", 
+			field20: "属性20", 
+			field30: "属性30", 
 		},
 		uiactions: {
 		},

app_Web/src/locale/lanres/entities/micro-component/micro-component_zh_CN.ts

@@ -71,30 +71,38 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			field1: "指定单位及下级单位多选", 
 			field3: "指定单位及下级单位单选", 
+			field1: "指定单位及下级单位多选", 
 			field5: "全部单位单选", 
 			field7: "全部单位多选", 
-			field9: "指定单位及下级单位所有部门多选", 
 			field11: "指定单位及下级单位所有部门单选", 
-			field13: "指定单位部门多选", 
+			field9: "指定单位及下级单位所有部门多选", 
 			field15: "指定单位部门单选", 
-			field17: "指定单位人员多选", 
+			field13: "指定单位部门多选", 
 			field19: "指定单位人员单选", 
-			field21: "指定单位及下级单位人员多选", 
+			field17: "指定单位人员多选", 
 			field23: "指定单位及下级单位人员单选", 
-			field14: "属性14", 
+			field21: "指定单位及下级单位人员多选", 
+			field27: "指定部门人员单选", 
+			field25: "指定部门人员多选", 
+			field31: "指定部门及下级部门人员单选", 
+			field29: "指定部门及下级部门人员多选", 
 			microcomponentid: "微组件标识", 
+			field28: "属性28", 
+			field18: "属性18", 
+			field32: "属性32", 
+			field14: "属性14", 
+			field26: "属性26", 
 			field4: "属性4", 
 			field16: "属性16", 
-			field24: "属性24", 
 			field2: "属性2", 
-			field22: "属性22", 
+			field24: "属性24", 
 			field8: "属性8", 
+			field22: "属性22", 
 			field12: "属性12", 
-			field20: "属性20", 
 			field6: "属性6", 
-			field18: "属性18", 
+			field20: "属性20", 
+			field30: "属性30", 
 		},
 		uiactions: {
 		},

app_Web/src/widgets/ibizbook/gridexpbar-grid-grid/gridexpbar-grid-grid-base.vue

@@ -930,17 +930,17 @@ export default class Gridexpbar_gridBase extends Vue implements ControlInterface
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue

@@ -1201,17 +1201,17 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue

@@ -1081,17 +1081,17 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue

@@ -1081,17 +1081,17 @@ export default class Main3Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue

@@ -1072,17 +1072,17 @@ export default class Main4Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue

@@ -1088,17 +1088,17 @@ export default class Main5Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main6-grid/main6-grid-base.vue

@@ -1287,17 +1287,17 @@ export default class Main6Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/main7-grid/main7-grid-base.vue

@@ -1158,17 +1158,17 @@ export default class Main7Base extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue

@@ -1206,17 +1206,17 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue

@@ -1287,17 +1287,17 @@ export default class RowEditBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue

@@ -1183,17 +1183,17 @@ export default class RowRulesBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue

@@ -1206,17 +1206,17 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
             serviceName:'ibizbook',
             appDeLogicName:'图书',
             importData:{
-            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
-            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
-            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
-            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
-            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000},
             "CREATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"建立人","isuniqueitem":false,"name":"createman","order":1000},
+            "CREATEDATE":{"headername":"建立时间","isuniqueitem":false,"name":"createdate","order":1000},
             "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
             "UPDATEMAN":{"codelist":{"type":"DYNAMIC","tag":"SysOperator","isnumber":false},"headername":"更新人","isuniqueitem":false,"name":"updateman","order":1000},
             "UPDATEDATE":{"headername":"更新时间","isuniqueitem":false,"name":"updatedate","order":1000},
             "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
-            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
+            "TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000},
+            "PRESS":{"headername":"图书出版社","isuniqueitem":false,"name":"press","order":1000},
+            "AUTHOR":{"headername":"图书作者","isuniqueitem":false,"name":"author","order":1000},
+            "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
+            "BOOKNUMBER":{"headername":"图书数量","isuniqueitem":false,"name":"booknumber","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/micro-component/main-form/main-form-base.vue

@@ -5,15 +5,15 @@
             <i-col v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus"  :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.microcomponent.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
-        <i-col v-show="detailsModel.field1.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='field1' :itemRules="this.rules().field1" class='' :caption="$t('entities.microcomponent.main_form.details.field1')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field1.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-org-select :data="data" :disabled="detailsModel.field1.disabled" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'field2','label':'field1'}" url="/sysorganizations/${orgid}/suborg/picker" filter="srforgid" :multiple="true" style="" @select-change="onFormItemValueChange" ></app-org-select>
+        <i-col v-show="detailsModel.field3.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='field3' :itemRules="this.rules().field3" class='' :caption="$t('entities.microcomponent.main_form.details.field3')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field3.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-org-select :data="data" :disabled="detailsModel.field3.disabled" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'field4','label':'field3'}" url="/sysorganizations/${orgid}/suborg/picker" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange" ></app-org-select>
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.field3.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='field3' :itemRules="this.rules().field3" class='' :caption="$t('entities.microcomponent.main_form.details.field3')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field3.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-org-select :data="data" :disabled="detailsModel.field3.disabled" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'field4','label':'field3'}" url="/sysorganizations/${orgid}/suborg/picker" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange" ></app-org-select>
+<i-col v-show="detailsModel.field1.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='field1' :itemRules="this.rules().field1" class='' :caption="$t('entities.microcomponent.main_form.details.field1')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field1.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-org-select :data="data" :disabled="detailsModel.field1.disabled" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'field2','label':'field1'}" url="/sysorganizations/${orgid}/suborg/picker" filter="srforgid" :multiple="true" style="" @select-change="onFormItemValueChange" ></app-org-select>
 </app-form-item>
 
 </i-col>
@@ -37,21 +37,15 @@
 <i-col v-show="detailsModel.grouppanel1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.grouppanel1.manageContainerStatus"  :isManageContainer="detailsModel.grouppanel1.isManageContainer" @managecontainerclick="manageContainerClick('grouppanel1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.microcomponent.main_form.details.grouppanel1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
-        <i-col v-show="detailsModel.field9.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='field9' :itemRules="this.rules().field9" class='' :caption="$t('entities.microcomponent.main_form.details.field9')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field9.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-department-select :data="data" :disabled="detailsModel.field9.disabled" :context="JSON.parse(JSON.stringify(context))" url="/sysorganizations/${orgid}/suborg/sysdepartments/picker" filter="srforgid"  :fillMap="{'id':'','label':'field9'}" :multiple="true" style="" @select-change="onFormItemValueChange" ></app-department-select>
-</app-form-item>
-
-</i-col>
-<i-col v-show="detailsModel.field11.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+        <i-col v-show="detailsModel.field11.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='field11' :itemRules="this.rules().field11" class='' :caption="$t('entities.microcomponent.main_form.details.field11')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field11.error" :isEmptyCaption="false" labelPos="LEFT">
     <app-department-select :data="data" :disabled="detailsModel.field11.disabled" :context="JSON.parse(JSON.stringify(context))" url="/sysorganizations/${orgid}/suborg/sysdepartments/picker" filter="srforgid"  :fillMap="{'id':'field12','label':'field11'}" :multiple="false" style="" @select-change="onFormItemValueChange" ></app-department-select>
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.field13.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='field13' :itemRules="this.rules().field13" class='' :caption="$t('entities.microcomponent.main_form.details.field13')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field13.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-department-select :data="data" :disabled="detailsModel.field13.disabled" :context="JSON.parse(JSON.stringify(context))" url="/sysorganizations/${orgid}/sysdepartments/picker" filter="srforgid"  :fillMap="{'id':'field14','label':'field13'}" :multiple="true" style="" @select-change="onFormItemValueChange" ></app-department-select>
+<i-col v-show="detailsModel.field9.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='field9' :itemRules="this.rules().field9" class='' :caption="$t('entities.microcomponent.main_form.details.field9')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field9.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-department-select :data="data" :disabled="detailsModel.field9.disabled" :context="JSON.parse(JSON.stringify(context))" url="/sysorganizations/${orgid}/suborg/sysdepartments/picker" filter="srforgid"  :fillMap="{'id':'','label':'field9'}" :multiple="true" style="" @select-change="onFormItemValueChange" ></app-department-select>
 </app-form-item>
 
 </i-col>
@@ -60,6 +54,12 @@
     <app-department-select :data="data" :disabled="detailsModel.field15.disabled" :context="JSON.parse(JSON.stringify(context))" url="/sysorganizations/${orgid}/sysdepartments/picker" filter="srforgid"  :fillMap="{'id':'field16','label':'field15'}" :multiple="false" style="" @select-change="onFormItemValueChange" ></app-department-select>
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.field13.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='field13' :itemRules="this.rules().field13" class='' :caption="$t('entities.microcomponent.main_form.details.field13')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field13.error" :isEmptyCaption="false" labelPos="LEFT">
+    <app-department-select :data="data" :disabled="detailsModel.field13.disabled" :context="JSON.parse(JSON.stringify(context))" url="/sysorganizations/${orgid}/sysdepartments/picker" filter="srforgid"  :fillMap="{'id':'field14','label':'field13'}" :multiple="true" style="" @select-change="onFormItemValueChange" ></app-department-select>
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -69,7 +69,29 @@
 <i-col v-show="detailsModel.grouppanel2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.grouppanel2.manageContainerStatus"  :isManageContainer="detailsModel.grouppanel2.isManageContainer" @managecontainerclick="manageContainerClick('grouppanel2')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.grouppanel2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.microcomponent.main_form.details.grouppanel2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <row>
-        <i-col v-show="detailsModel.field17.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+        <i-col v-show="detailsModel.field19.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='field19' :itemRules="this.rules().field19" class='' :caption="$t('entities.microcomponent.main_form.details.field19')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field19.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-group-select
+  name="field19"
+  :value='data.field19'
+  valueitem="field20"
+  url="/sysorganizations/${selected-orgid}/sysemployees/picker"
+  
+  :multiple="false"
+  filter="srforgid"
+  :fillmap="{'id':'field20','label':'field19'}"
+  :disabled="detailsModel.field19.disabled"
+  :data="data"
+  :context="context"
+  
+  @formitemvaluechange="onFormItemValueChange">
+</app-group-select>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.field17.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='field17' :itemRules="this.rules().field17" class='' :caption="$t('entities.microcomponent.main_form.details.field17')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field17.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <app-group-select
@@ -91,19 +113,19 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.field19.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='field19' :itemRules="this.rules().field19" class='' :caption="$t('entities.microcomponent.main_form.details.field19')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field19.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col v-show="detailsModel.field23.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='field23' :itemRules="this.rules().field23" class='' :caption="$t('entities.microcomponent.main_form.details.field23')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field23.error" :isEmptyCaption="false" labelPos="LEFT">
     
 <app-group-select
-  name="field19"
-  :value='data.field19'
-  valueitem="field20"
+  name="field23"
+  :value='data.field23'
+  valueitem="field24"
   url="/sysorganizations/${selected-orgid}/sysemployees/picker"
-  
+  treeurl="/sysorganizations/${orgid}/suborg/picker"
   :multiple="false"
   filter="srforgid"
-  :fillmap="{'id':'field20','label':'field19'}"
-  :disabled="detailsModel.field19.disabled"
+  :fillmap="{'id':'field24','label':'field23'}"
+  :disabled="detailsModel.field23.disabled"
   :data="data"
   :context="context"
   
@@ -135,24 +157,90 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.field23.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
-    <app-form-item name='field23' :itemRules="this.rules().field23" class='' :caption="$t('entities.microcomponent.main_form.details.field23')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field23.error" :isEmptyCaption="false" labelPos="LEFT">
+<i-col v-show="detailsModel.field27.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='field27' :itemRules="this.rules().field27" class='' :caption="$t('entities.microcomponent.main_form.details.field27')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field27.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-department-personnel
+  name="field27"
+  :value='data.field27'
+  valueitem="field28"
+  url="/ibzdepartments/{deptId}/emp"
   
-<app-group-select
-  name="field23"
-  :value='data.field23'
-  valueitem="field24"
-  url="/sysorganizations/${selected-orgid}/sysemployees/picker"
-  treeurl="/sysorganizations/${orgid}/suborg/picker"
   :multiple="false"
-  filter="srforgid"
-  :fillmap="{'id':'field24','label':'field23'}"
-  :disabled="detailsModel.field23.disabled"
+  filter="srfsdept"
+  :fillmap="{'id':'field28','label':'field27'}"
+  :disabled="detailsModel.field27.disabled"
   :data="data"
   :context="context"
   
   @formitemvaluechange="onFormItemValueChange">
-</app-group-select>
+</app-department-personnel>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.field25.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='field25' :itemRules="this.rules().field25" class='' :caption="$t('entities.microcomponent.main_form.details.field25')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field25.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-department-personnel
+  name="field25"
+  :value='data.field25'
+  valueitem="field26"
+  url="/ibzdepartments/{deptId}/emp"
+  
+  :multiple="true"
+  filter="srfsdept"
+  :fillmap="{'id':'field26','label':'field25'}"
+  :disabled="detailsModel.field25.disabled"
+  :data="data"
+  :context="context"
+  
+  @formitemvaluechange="onFormItemValueChange">
+</app-department-personnel>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.field31.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='field31' :itemRules="this.rules().field31" class='' :caption="$t('entities.microcomponent.main_form.details.field31')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field31.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-department-personnel
+  name="field31"
+  :value='data.field31'
+  valueitem="field32"
+  url="/ibzdepartments/{deptId}/subemp"
+  
+  :multiple="false"
+  filter="srfsdept"
+  :fillmap="{'id':'field32','label':'field31'}"
+  :disabled="detailsModel.field31.disabled"
+  :data="data"
+  :context="context"
+  
+  @formitemvaluechange="onFormItemValueChange">
+</app-department-personnel>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.field29.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+    <app-form-item name='field29' :itemRules="this.rules().field29" class='' :caption="$t('entities.microcomponent.main_form.details.field29')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.field29.error" :isEmptyCaption="false" labelPos="LEFT">
+    
+<app-department-personnel
+  name="field29"
+  :value='data.field29'
+  valueitem="field30"
+  url="/ibzdepartments/{deptId}/subemp"
+  
+  :multiple="true"
+  filter="srfsdept"
+  :fillmap="{'id':'field30','label':'field29'}"
+  :disabled="detailsModel.field29.disabled"
+  :data="data"
+  :context="context"
+  
+  @formitemvaluechange="onFormItemValueChange">
+</app-department-personnel>
 
 </app-form-item>
 
@@ -557,30 +645,38 @@ export default class MainBase extends Vue implements ControlInterface {
         srfuf: null,
         srfdeid: null,
         srfsourcekey: null,
-        field1: null,
         field3: null,
+        field1: null,
         field5: null,
         field7: null,
-        field9: null,
         field11: null,
-        field13: null,
+        field9: null,
         field15: null,
-        field17: null,
+        field13: null,
         field19: null,
-        field21: null,
+        field17: null,
         field23: null,
-        field14: null,
+        field21: null,
+        field27: null,
+        field25: null,
+        field31: null,
+        field29: null,
         microcomponentid: null,
+        field28: null,
+        field18: null,
+        field32: null,
+        field14: null,
+        field26: null,
         field4: null,
         field16: null,
-        field24: null,
         field2: null,
-        field22: null,
+        field24: null,
         field8: null,
+        field22: null,
         field12: null,
-        field20: null,
         field6: null,
-        field18: null,
+        field20: null,
+        field30: null,
         microcomponent:null,
     };
 
@@ -632,14 +728,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public rules() :any {
     return {
-        field1: [
-            { required: this.detailsModel.field1.required, type: 'string', message: '指定单位及下级单位多选 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.field1.required, type: 'string', message: '指定单位及下级单位多选 值不能为空', trigger: 'blur' },
-        ],
         field3: [
             { required: this.detailsModel.field3.required, type: 'string', message: '指定单位及下级单位单选 值不能为空', trigger: 'change' },
             { required: this.detailsModel.field3.required, type: 'string', message: '指定单位及下级单位单选 值不能为空', trigger: 'blur' },
         ],
+        field1: [
+            { required: this.detailsModel.field1.required, type: 'string', message: '指定单位及下级单位多选 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.field1.required, type: 'string', message: '指定单位及下级单位多选 值不能为空', trigger: 'blur' },
+        ],
         field5: [
             { required: this.detailsModel.field5.required, type: 'string', message: '全部单位单选 值不能为空', trigger: 'change' },
             { required: this.detailsModel.field5.required, type: 'string', message: '全部单位单选 值不能为空', trigger: 'blur' },
@@ -648,37 +744,53 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.field7.required, type: 'string', message: '全部单位多选 值不能为空', trigger: 'change' },
             { required: this.detailsModel.field7.required, type: 'string', message: '全部单位多选 值不能为空', trigger: 'blur' },
         ],
+        field11: [
+            { required: this.detailsModel.field11.required, type: 'string', message: '指定单位及下级单位所有部门单选 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.field11.required, type: 'string', message: '指定单位及下级单位所有部门单选 值不能为空', trigger: 'blur' },
+        ],
         field9: [
             { required: this.detailsModel.field9.required, type: 'string', message: '指定单位及下级单位所有部门多选 值不能为空', trigger: 'change' },
             { required: this.detailsModel.field9.required, type: 'string', message: '指定单位及下级单位所有部门多选 值不能为空', trigger: 'blur' },
         ],
-        field11: [
-            { required: this.detailsModel.field11.required, type: 'string', message: '指定单位及下级单位所有部门单选 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.field11.required, type: 'string', message: '指定单位及下级单位所有部门单选 值不能为空', trigger: 'blur' },
+        field15: [
+            { required: this.detailsModel.field15.required, type: 'string', message: '指定单位部门单选 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.field15.required, type: 'string', message: '指定单位部门单选 值不能为空', trigger: 'blur' },
         ],
         field13: [
             { required: this.detailsModel.field13.required, type: 'string', message: '指定单位部门多选 值不能为空', trigger: 'change' },
             { required: this.detailsModel.field13.required, type: 'string', message: '指定单位部门多选 值不能为空', trigger: 'blur' },
         ],
-        field15: [
-            { required: this.detailsModel.field15.required, type: 'string', message: '指定单位部门单选 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.field15.required, type: 'string', message: '指定单位部门单选 值不能为空', trigger: 'blur' },
+        field19: [
+            { required: this.detailsModel.field19.required, type: 'string', message: '指定单位人员单选 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.field19.required, type: 'string', message: '指定单位人员单选 值不能为空', trigger: 'blur' },
         ],
         field17: [
             { required: this.detailsModel.field17.required, type: 'string', message: '指定单位人员多选 值不能为空', trigger: 'change' },
             { required: this.detailsModel.field17.required, type: 'string', message: '指定单位人员多选 值不能为空', trigger: 'blur' },
         ],
-        field19: [
-            { required: this.detailsModel.field19.required, type: 'string', message: '指定单位人员单选 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.field19.required, type: 'string', message: '指定单位人员单选 值不能为空', trigger: 'blur' },
+        field23: [
+            { required: this.detailsModel.field23.required, type: 'string', message: '指定单位及下级单位人员单选 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.field23.required, type: 'string', message: '指定单位及下级单位人员单选 值不能为空', trigger: 'blur' },
         ],
         field21: [
             { required: this.detailsModel.field21.required, type: 'string', message: '指定单位及下级单位人员多选 值不能为空', trigger: 'change' },
             { required: this.detailsModel.field21.required, type: 'string', message: '指定单位及下级单位人员多选 值不能为空', trigger: 'blur' },
         ],
-        field23: [
-            { required: this.detailsModel.field23.required, type: 'string', message: '指定单位及下级单位人员单选 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.field23.required, type: 'string', message: '指定单位及下级单位人员单选 值不能为空', trigger: 'blur' },
+        field27: [
+            { required: this.detailsModel.field27.required, type: 'string', message: '指定部门人员单选 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.field27.required, type: 'string', message: '指定部门人员单选 值不能为空', trigger: 'blur' },
+        ],
+        field25: [
+            { required: this.detailsModel.field25.required, type: 'string', message: '指定部门人员多选 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.field25.required, type: 'string', message: '指定部门人员多选 值不能为空', trigger: 'blur' },
+        ],
+        field31: [
+            { required: this.detailsModel.field31.required, type: 'string', message: '指定部门及下级部门人员单选 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.field31.required, type: 'string', message: '指定部门及下级部门人员单选 值不能为空', trigger: 'blur' },
+        ],
+        field29: [
+            { required: this.detailsModel.field29.required, type: 'string', message: '指定部门及下级部门人员多选 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.field29.required, type: 'string', message: '指定部门及下级部门人员多选 值不能为空', trigger: 'blur' },
         ],
         }
     }
@@ -808,54 +920,70 @@ export default class MainBase extends Vue implements ControlInterface {
         srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
-, 
-        field1: new FormItemModel({ caption: '指定单位及下级单位多选', detailType: 'FORMITEM', name: 'field1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field3: new FormItemModel({ caption: '指定单位及下级单位单选', detailType: 'FORMITEM', name: 'field3', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        field1: new FormItemModel({ caption: '指定单位及下级单位多选', detailType: 'FORMITEM', name: 'field1', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field5: new FormItemModel({ caption: '全部单位单选', detailType: 'FORMITEM', name: 'field5', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field7: new FormItemModel({ caption: '全部单位多选', detailType: 'FORMITEM', name: 'field7', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        field11: new FormItemModel({ caption: '指定单位及下级单位所有部门单选', detailType: 'FORMITEM', name: 'field11', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field9: new FormItemModel({ caption: '指定单位及下级单位所有部门多选', detailType: 'FORMITEM', name: 'field9', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        field11: new FormItemModel({ caption: '指定单位及下级单位所有部门单选', detailType: 'FORMITEM', name: 'field11', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        field15: new FormItemModel({ caption: '指定单位部门单选', detailType: 'FORMITEM', name: 'field15', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field13: new FormItemModel({ caption: '指定单位部门多选', detailType: 'FORMITEM', name: 'field13', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        field15: new FormItemModel({ caption: '指定单位部门单选', detailType: 'FORMITEM', name: 'field15', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        field19: new FormItemModel({ caption: '指定单位人员单选', detailType: 'FORMITEM', name: 'field19', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field17: new FormItemModel({ caption: '指定单位人员多选', detailType: 'FORMITEM', name: 'field17', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        field19: new FormItemModel({ caption: '指定单位人员单选', detailType: 'FORMITEM', name: 'field19', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        field23: new FormItemModel({ caption: '指定单位及下级单位人员单选', detailType: 'FORMITEM', name: 'field23', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field21: new FormItemModel({ caption: '指定单位及下级单位人员多选', detailType: 'FORMITEM', name: 'field21', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        field23: new FormItemModel({ caption: '指定单位及下级单位人员单选', detailType: 'FORMITEM', name: 'field23', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        field27: new FormItemModel({ caption: '指定部门人员单选', detailType: 'FORMITEM', name: 'field27', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        field14: new FormItemModel({ caption: '属性14', detailType: 'FORMITEM', name: 'field14', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        field25: new FormItemModel({ caption: '指定部门人员多选', detailType: 'FORMITEM', name: 'field25', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        field31: new FormItemModel({ caption: '指定部门及下级部门人员单选', detailType: 'FORMITEM', name: 'field31', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        field29: new FormItemModel({ caption: '指定部门及下级部门人员多选', detailType: 'FORMITEM', name: 'field29', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         microcomponentid: new FormItemModel({ caption: '微组件标识', detailType: 'FORMITEM', name: 'microcomponentid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        field28: new FormItemModel({ caption: '属性28', detailType: 'FORMITEM', name: 'field28', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        field18: new FormItemModel({ caption: '属性18', detailType: 'FORMITEM', name: 'field18', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        field32: new FormItemModel({ caption: '属性32', detailType: 'FORMITEM', name: 'field32', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        field14: new FormItemModel({ caption: '属性14', detailType: 'FORMITEM', name: 'field14', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        field26: new FormItemModel({ caption: '属性26', detailType: 'FORMITEM', name: 'field26', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field4: new FormItemModel({ caption: '属性4', detailType: 'FORMITEM', name: 'field4', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field16: new FormItemModel({ caption: '属性16', detailType: 'FORMITEM', name: 'field16', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
-, 
-        field24: new FormItemModel({ caption: '属性24', detailType: 'FORMITEM', name: 'field24', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field2: new FormItemModel({ caption: '属性2', detailType: 'FORMITEM', name: 'field2', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        field22: new FormItemModel({ caption: '属性22', detailType: 'FORMITEM', name: 'field22', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        field24: new FormItemModel({ caption: '属性24', detailType: 'FORMITEM', name: 'field24', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field8: new FormItemModel({ caption: '属性8', detailType: 'FORMITEM', name: 'field8', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        field12: new FormItemModel({ caption: '属性12', detailType: 'FORMITEM', name: 'field12', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        field22: new FormItemModel({ caption: '属性22', detailType: 'FORMITEM', name: 'field22', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        field20: new FormItemModel({ caption: '属性20', detailType: 'FORMITEM', name: 'field20', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        field12: new FormItemModel({ caption: '属性12', detailType: 'FORMITEM', name: 'field12', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         field6: new FormItemModel({ caption: '属性6', detailType: 'FORMITEM', name: 'field6', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
-        field18: new FormItemModel({ caption: '属性18', detailType: 'FORMITEM', name: 'field18', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+        field20: new FormItemModel({ caption: '属性20', detailType: 'FORMITEM', name: 'field20', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        field30: new FormItemModel({ caption: '属性30', detailType: 'FORMITEM', name: 'field30', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
     };
 
@@ -956,27 +1084,27 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 field1 值
+     * 监控表单属性 field3 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field1')
-    onField1Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field1', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field3')
+    onField3Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field3', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 field3 值
+     * 监控表单属性 field1 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field3')
-    onField3Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field3', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field1')
+    onField1Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field1', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1003,6 +1131,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'field7', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 field11 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.field11')
+    onField11Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field11', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 field9 值
      *
@@ -1016,15 +1156,15 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 field11 值
+     * 监控表单属性 field15 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field11')
-    onField11Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field11', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field15')
+    onField15Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field15', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1040,15 +1180,15 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 field15 值
+     * 监控表单属性 field19 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field15')
-    onField15Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field15', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field19')
+    onField19Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field19', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1064,15 +1204,15 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 field19 值
+     * 监控表单属性 field23 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field19')
-    onField19Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field19', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field23')
+    onField23Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field23', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1088,27 +1228,51 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 field23 值
+     * 监控表单属性 field27 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field23')
-    onField23Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field23', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field27')
+    onField27Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field27', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 field14 值
+     * 监控表单属性 field25 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field14')
-    onField14Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field14', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field25')
+    onField25Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field25', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 field31 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.field31')
+    onField31Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field31', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 field29 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.field29')
+    onField29Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field29', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1124,39 +1288,87 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 field4 值
+     * 监控表单属性 field28 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field4')
-    onField4Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field4', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field28')
+    onField28Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field28', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 field16 值
+     * 监控表单属性 field18 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field16')
-    onField16Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field16', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field18')
+    onField18Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field18', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 field24 值
+     * 监控表单属性 field32 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field24')
-    onField24Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field24', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field32')
+    onField32Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field32', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 field14 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.field14')
+    onField14Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field14', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 field26 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.field26')
+    onField26Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field26', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 field4 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.field4')
+    onField4Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field4', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 field16 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.field16')
+    onField16Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field16', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1172,15 +1384,15 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 field22 值
+     * 监控表单属性 field24 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field22')
-    onField22Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field22', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field24')
+    onField24Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field24', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1196,27 +1408,27 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 field12 值
+     * 监控表单属性 field22 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field12')
-    onField12Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field12', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field22')
+    onField22Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field22', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 field20 值
+     * 监控表单属性 field12 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field20')
-    onField20Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field20', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field12')
+    onField12Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field12', newVal: newVal, oldVal: oldVal });
     }
 
     /**
@@ -1232,15 +1444,27 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 field18 值
+     * 监控表单属性 field20 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof MainBase
      */
-    @Watch('data.field18')
-    onField18Change(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'field18', newVal: newVal, oldVal: oldVal });
+    @Watch('data.field20')
+    onField20Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field20', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 field30 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.field30')
+    onField30Change(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'field30', newVal: newVal, oldVal: oldVal });
     }
 
 
@@ -1327,6 +1551,14 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
+
+
+
+
+
+
+
 
 
 

app_Web/src/widgets/micro-component/main-form/main-form-model.ts

@@ -56,13 +56,13 @@ export default class MainModel {
         name: 'srfsourcekey',
       },
       {
-        name: 'field1',
-        prop: 'field',
+        name: 'field3',
+        prop: 'field3',
         dataType: 'TEXT',
       },
       {
-        name: 'field3',
-        prop: 'field3',
+        name: 'field1',
+        prop: 'field',
         dataType: 'TEXT',
       },
       {
@@ -75,14 +75,19 @@ export default class MainModel {
         prop: 'field7',
         dataType: 'TEXT',
       },
+      {
+        name: 'field11',
+        prop: 'field11',
+        dataType: 'TEXT',
+      },
       {
         name: 'field9',
         prop: 'field9',
         dataType: 'TEXT',
       },
       {
-        name: 'field11',
-        prop: 'field11',
+        name: 'field15',
+        prop: 'field15',
         dataType: 'TEXT',
       },
       {
@@ -91,8 +96,8 @@ export default class MainModel {
         dataType: 'TEXT',
       },
       {
-        name: 'field15',
-        prop: 'field15',
+        name: 'field19',
+        prop: 'field19',
         dataType: 'TEXT',
       },
       {
@@ -101,8 +106,8 @@ export default class MainModel {
         dataType: 'TEXT',
       },
       {
-        name: 'field19',
-        prop: 'field19',
+        name: 'field23',
+        prop: 'field23',
         dataType: 'TEXT',
       },
       {
@@ -111,13 +116,23 @@ export default class MainModel {
         dataType: 'TEXT',
       },
       {
-        name: 'field23',
-        prop: 'field23',
+        name: 'field27',
+        prop: 'field27',
         dataType: 'TEXT',
       },
       {
-        name: 'field14',
-        prop: 'field14',
+        name: 'field25',
+        prop: 'field25',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'field31',
+        prop: 'field31',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'field29',
+        prop: 'field29',
         dataType: 'TEXT',
       },
       {
@@ -125,6 +140,31 @@ export default class MainModel {
         prop: 'microcomponentid',
         dataType: 'GUID',
       },
+      {
+        name: 'field28',
+        prop: 'field28',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'field18',
+        prop: 'field18',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'field32',
+        prop: 'field32',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'field14',
+        prop: 'field14',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'field26',
+        prop: 'field26',
+        dataType: 'TEXT',
+      },
       {
         name: 'field4',
         prop: 'field4',
@@ -135,19 +175,14 @@ export default class MainModel {
         prop: 'field16',
         dataType: 'TEXT',
       },
-      {
-        name: 'field24',
-        prop: 'field24',
-        dataType: 'TEXT',
-      },
       {
         name: 'field2',
         prop: 'field2',
         dataType: 'TEXT',
       },
       {
-        name: 'field22',
-        prop: 'field22',
+        name: 'field24',
+        prop: 'field24',
         dataType: 'TEXT',
       },
       {
@@ -156,13 +191,13 @@ export default class MainModel {
         dataType: 'TEXT',
       },
       {
-        name: 'field12',
-        prop: 'field12',
+        name: 'field22',
+        prop: 'field22',
         dataType: 'TEXT',
       },
       {
-        name: 'field20',
-        prop: 'field20',
+        name: 'field12',
+        prop: 'field12',
         dataType: 'TEXT',
       },
       {
@@ -171,8 +206,13 @@ export default class MainModel {
         dataType: 'TEXT',
       },
       {
-        name: 'field18',
-        prop: 'field18',
+        name: 'field20',
+        prop: 'field20',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'field30',
+        prop: 'field30',
         dataType: 'TEXT',
       },
       {

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      mvn clean package -Pweb
-      cd demo-app/demo-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-app/demo-app-web/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar
 
-EXPOSE 51001
+EXPOSE 8080
 
 ADD demo-app-web.jar /demo-app-web.jar

demo-app/demo-app-web/src/main/docker/demo-app-web.yaml

@@ -3,24 +3,9 @@ services:
   demo-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
     ports:
-      - "51001:51001"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51001
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZBOOKDataImport.java

@@ -9,15 +9,15 @@ public interface IBIZBOOKDataImport {
     @Mappings({
         @Mapping(target = "ibizbookid", source = "ibizbookid"),
         @Mapping(target = "createdate", source = "createdate"),
-        @Mapping(target = "price", source = "price"),
         @Mapping(target = "ibizbookname", source = "ibizbookname"),
-        @Mapping(target = "booknumber", source = "booknumber"),
         @Mapping(target = "updateman", source = "updateman"),
-        @Mapping(target = "createman", source = "createman"),
         @Mapping(target = "updatedate", source = "updatedate"),
         @Mapping(target = "type", source = "type"),
         @Mapping(target = "press", source = "press"),
         @Mapping(target = "author", source = "author"),
+        @Mapping(target = "price", source = "price"),
+        @Mapping(target = "booknumber", source = "booknumber"),
+        @Mapping(target = "createman", source = "createman"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZBOOK toDomain(IBIZBOOK entity);

demo-core/src/main/resources/liquibase/h2_table.xml

@@ -1280,7 +1280,7 @@
 
 
     <!--输出实体[MICROCOMPONENT]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-microcomponent-45-44">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-microcomponent-65-44">
         <createTable tableName="T_MICROCOMPONENT">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>