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

app_Web/public/assets/json/data-dictionary.json

@@ -824,6 +824,35 @@
             }
         ]
     }, 
+    {
+        "srfkey": "HARDWARETYPE",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "Storage",
+                "label": "存储",
+                "text": "存储",
+                "class":"",
+                "data":"",
+                "codename":"Storage",
+                "value": "Storage",
+                
+                "disabled": false
+            }
+            , {
+                "id": "CPU",
+                "label": "处理器",
+                "text": "处理器",
+                "class":"",
+                "data":"",
+                "codename":"Cpu",
+                "value": "CPU",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "S_OrderType",
         "emptytext": "未定义",

app_Web/src/locale/lanres/codelist/codelist_en_US.ts

@@ -114,6 +114,11 @@ export default {
         "fileupload": "文件上传类",
         "empty": ""
     },
+    HARDWARETYPE: {
+        "Storage": "存储",
+        "CPU": "处理器",
+        "empty": ""
+    },
     S_OrderType: {
         "10": "销售订单",
         "20": "采购订单",

app_Web/src/locale/lanres/codelist/codelist_zh_CN.ts

@@ -114,6 +114,11 @@ export default {
         "fileupload": "文件上传类",
         "empty": "",
     },
+    HARDWARETYPE: {
+        "Storage": "存储",
+        "CPU": "处理器",
+        "empty": "",
+    },
     S_OrderType: {
         "10": "销售订单",
         "20": "采购订单",

app_Web/src/mock/codelist/codelist.ts

@@ -832,6 +832,35 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "HARDWARETYPE",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "Storage",
+                label: "存储",
+                text: "存储",
+                "class":"",
+                "data":"",
+                "codename":"Storage",
+                value: "Storage",
+                
+                disabled: false,
+            },
+            {
+                id: "CPU",
+                label: "处理器",
+                text: "处理器",
+                "class":"",
+                "data":"",
+                "codename":"Cpu",
+                value: "CPU",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "S_OrderType",
         emptytext: "未定义",

app_Web/src/mock/entity/ibizhardwares/ibizhardwares.ts

@@ -316,7 +316,7 @@ mock.onGet(new RegExp(/^\/ibizhardwares\/fetchdefault(\?[\w-./?%&=,]*)*$/)).repl
 });
     
 // FetchIndexDER
-mock.onGet(new RegExp(/^\/ibizhardwares\/fetchindexder$/)).reply((config: any) => {
+mock.onGet(new RegExp(/^\/ibizhardwares\/fetchdefault$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibizhardware 方法: FetchIndexDER");
     console.table({url:config.url, method: config.method, data:config.data});
     let status = MockAdapter.mockStatus(config);
@@ -331,7 +331,7 @@ mock.onGet(new RegExp(/^\/ibizhardwares\/fetchindexder$/)).reply((config: any) =
 });
 
 // FetchIndexDER
-mock.onGet(new RegExp(/^\/ibizhardwares\/fetchindexder(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+mock.onGet(new RegExp(/^\/ibizhardwares\/fetchdefault(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
     console.groupCollapsed("实体:ibizhardware 方法: FetchIndexDER");
     console.table({url:config.url, method: config.method, data:config.data});
     if(config.url.includes('page')){

app_Web/src/service/ibizhardware/ibizhardware-service-base.ts

@@ -209,9 +209,16 @@ export default class IBIZHardwareServiceBase extends EntityService {
      * @memberof IBIZHardwareServiceBase
      */
     public async FetchIndexDER(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
-        let tempData:any = JSON.parse(JSON.stringify(data));
-        let res:any = Http.getInstance().get(`/ibizhardwares/fetchindexder`,tempData,isloading);
-        return res;
+        let codelistModel:any = {tag:'HARDWARETYPE',codelistType:'STATIC'};
+        let res:any = await this.getCodeList(codelistModel.tag,codelistModel.codelistType,context,data);
+        if(res && res.length > 0){
+            res.forEach((ele:any) => {
+                // 仿真返回数据集
+                ele.ibizhardwareid = ele.value;
+                ele.ibizhardwarename = ele.text
+            });
+        } 
+        return {status:200,data:res};
     }
 
     /**

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

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

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

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

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

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

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

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

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

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

app_Web/src/widgets/ibizbook/usr-gantt/usr-gantt-base.vue

@@ -238,42 +238,42 @@ export default class UsrBase extends Vue implements ControlInterface {
             labelField: 'text',
             columns: [
                 {
-                    label: '作者',
-                    value: 'author',
+                    label: '归还日期',
+                    value: 'returntime',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'author')
+                        return this.getColumnValue(task, 'returntime')
                     },
                     width: 200,
                 },
                 {
-                    label: '借出日期',
-                    value: 'lendouttime',
+                    label: '图书名称',
+                    value: 'ibizbookname',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'lendouttime')
+                        return this.getColumnValue(task, 'ibizbookname')
                     },
                     width: 200,
                 },
                 {
-                    label: '归还日期',
-                    value: 'returntime',
+                    label: '出版社',
+                    value: 'press',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'returntime')
+                        return this.getColumnValue(task, 'press')
                     },
                     width: 200,
                 },
                 {
-                    label: '图书名称',
-                    value: 'ibizbookname',
+                    label: '作者',
+                    value: 'author',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'ibizbookname')
+                        return this.getColumnValue(task, 'author')
                     },
                     width: 200,
                 },
                 {
-                    label: '出版社',
-                    value: 'press',
+                    label: '借出日期',
+                    value: 'lendouttime',
                     render: (task: any) => {
-                        return this.getColumnValue(task, 'press')
+                        return this.getColumnValue(task, 'lendouttime')
                     },
                     width: 200,
                 },

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

@@ -1114,10 +1114,10 @@ export default class MainBase extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
             "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
-            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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

@@ -1030,10 +1030,10 @@ export default class Main2Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
             "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
-            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizorder/uipart-0015-grid/uipart-0015-grid-base.vue

@@ -1066,10 +1066,10 @@ export default class UIPART_0015Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
             "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
-            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizorder/uipart-0017-grid/uipart-0017-grid-base.vue

@@ -1189,10 +1189,10 @@ export default class UIPART_0017Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
             "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
-            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

app_Web/src/widgets/ibizorder/uipart-0018-grid/uipart-0018-grid-base.vue

@@ -1121,10 +1121,10 @@ export default class UIPART_0018Base extends Vue implements ControlInterface {
             serviceName:'ibizorder',
             appDeLogicName:'订单',
             importData:{
+            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000},
             "IBIZORDERNAME":{"headername":"订单名称","isuniqueitem":false,"name":"ibizordername","order":1000},
             "ORDERTYPE":{"codelist":{"type":"DYNAMIC","tag":"ORDERTYPE","isnumber":false},"headername":"订单类型","isuniqueitem":false,"name":"ordertype","order":1000},
-            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000},
-            "ORDERUID":{"headername":"订单编号","isuniqueitem":true,"name":"orderuid","order":1000}
+            "ORDERTIME":{"headername":"订单时间","isuniqueitem":false,"name":"ordertime","order":1000}
             }
         }
         if(Object.keys(importDataModel).length == 0){

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 = "updateman", source = "updateman"),
-        @Mapping(target = "press", source = "press"),
-        @Mapping(target = "updatedate", source = "updatedate"),
-        @Mapping(target = "author", source = "author"),
         @Mapping(target = "price", source = "price"),
         @Mapping(target = "booknumber", source = "booknumber"),
         @Mapping(target = "createman", source = "createman"),
+        @Mapping(target = "updatedate", source = "updatedate"),
         @Mapping(target = "type", source = "type"),
+        @Mapping(target = "press", source = "press"),
         @Mapping(target = "createdate", source = "createdate"),
         @Mapping(target = "ibizbookname", source = "ibizbookname"),
+        @Mapping(target = "author", source = "author"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZBOOK toDomain(IBIZBOOK entity);

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

@@ -8,10 +8,10 @@ import java.util.List;
 public interface IBIZOrderImport {
     @Mappings({
         @Mapping(target = "ibizorderid", source = "ibizorderid"),
-        @Mapping(target = "ibizordername", source = "ibizordername"),
         @Mapping(target = "ordertype", source = "ordertype"),
         @Mapping(target = "ordertime", source = "ordertime"),
         @Mapping(target = "orderuid", source = "orderuid"),
+        @Mapping(target = "ibizordername", source = "ibizordername"),
     })
     @BeanMapping(ignoreByDefault = true)
     IBIZOrder toDomain(IBIZOrder entity);

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

@@ -254,7 +254,7 @@
 
 
     <!--输出实体[IBIZHARDWARE]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizhardware-6-11">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizhardware-8-11">
         <createTable tableName="T_IBIZHARDWARE">
                 <column name="UNIT" remarks="" type="VARCHAR(100)">
                 </column>
@@ -584,7 +584,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0003]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0003-13-19">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0003-15-19">
         <createTable tableName="T_IBIZSAMPLE0003">
                 <column name="IBIZSAMPLE0003NAME" remarks="" type="VARCHAR(200)">
                 </column>

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

@@ -31,7 +31,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZHARDWARE]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizhardware-6-7" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizhardware-8-7" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZHARDWARE">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[IBIZHARDWAREID], t1.[IBIZHARDWARENAME], t1.[IBIZHARDWARETYPE], t1.[PRODUCER], t1.[PRODUCTUID], t1.[UNIT], t1.[UNITPRICE], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZHARDWARE] t1  ]]>
          </createView>
@@ -79,7 +79,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZSAMPLE0003]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0003-13-15" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0003-15-15" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0003">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[IBIZSAMPLE0003ID], t1.[IBIZSAMPLE0003NAME], t1.[MEMO], t1.[PIBIZSAMPLE0003ID], t11.[IBIZSAMPLE0003NAME] AS [PIBIZSAMPLE0003NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0003] t1  LEFT JOIN T_IBIZSAMPLE0003 t11 ON t1.PIBIZSAMPLE0003ID = t11.IBIZSAMPLE0003ID  ]]>
          </createView>

demo-provider/demo-provider-demoapi/src/main/java/cn/ibizlab/demoapi/rest/IBIZHardwareResource.java

@@ -158,28 +158,6 @@ public class IBIZHardwareResource {
                 .body(new PageImpl(ibizhardwareMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','DemoSys-IBIZHardware-searchIndexDER-all') and hasPermission(#context,'DemoSys-IBIZHardware-Get')")
-	@ApiOperation(value = "获取IndexDER", tags = {"硬件" } ,notes = "获取IndexDER")
-    @RequestMapping(method= RequestMethod.GET , value="/ibizhardwares/fetchindexder")
-	public ResponseEntity<List<IBIZHardwareDTO>> fetchIndexDER(IBIZHardwareSearchContext context) {
-        Page<IBIZHardware> domains = ibizhardwareService.searchIndexDER(context) ;
-        List<IBIZHardwareDTO> list = ibizhardwareMapping.toDto(domains.getContent());
-        return ResponseEntity.status(HttpStatus.OK)
-                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
-                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
-                .header("x-total", String.valueOf(domains.getTotalElements()))
-                .body(list);
-	}
-
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','DemoSys-IBIZHardware-searchIndexDER-all') and hasPermission(#context,'DemoSys-IBIZHardware-Get')")
-	@ApiOperation(value = "查询IndexDER", tags = {"硬件" } ,notes = "查询IndexDER")
-    @RequestMapping(method= RequestMethod.POST , value="/ibizhardwares/searchindexder")
-	public ResponseEntity<Page<IBIZHardwareDTO>> searchIndexDER(@RequestBody IBIZHardwareSearchContext context) {
-        Page<IBIZHardware> domains = ibizhardwareService.searchIndexDER(context) ;
-	    return ResponseEntity.status(HttpStatus.OK)
-                .body(new PageImpl(ibizhardwareMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
-	}
-
 
 }