nancy_iBiz 部署微服务应用 [Spring Boot，员工]

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

@@ -293,6 +293,37 @@
             }
         ]
     }, 
+    {
+        "srfkey": "Odoo_truefalse",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "false",
+                "label": "否",
+                "text": "否",
+                "class":"",
+                "data":"",
+                "codename":"False",
+                "value": "false",
+                
+                "disabled": false,
+                "default": false
+            }
+            , {
+                "id": "true",
+                "label": "是",
+                "text": "是",
+                "class":"",
+                "data":"",
+                "codename":"True",
+                "value": "true",
+                
+                "disabled": false,
+                "default": false
+            }
+        ]
+    }, 
     {
         "srfkey": "HR_JOB__STATE",
         "emptytext": "未定义",

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

@@ -38,6 +38,11 @@ export default {
         "certification": "认证",
         "empty": ""
     },
+    Odoo_truefalse: {
+        "false": "否",
+        "true": "是",
+        "empty": ""
+    },
     HR_JOB__STATE: {
         "recruit": "正在招聘",
         "open": "停止招聘",

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

@@ -38,6 +38,11 @@ export default {
         "certification": "认证",
         "empty": "",
     },
+    Odoo_truefalse: {
+        "false": "否",
+        "true": "是",
+        "empty": "",
+    },
     HR_JOB__STATE: {
         "recruit": "正在招聘",
         "open": "停止招聘",

app_HR/src/locale/lanres/entities/hr-department/hr-department_en_US.ts

@@ -120,6 +120,18 @@ export default {
 	master_grid: {
 		nodata: "",
 		columns: {
+			id: "ID",
+			name: "部门名称",
+			display_name: "显示名称",
+			complete_name: "完整名称",
+			manager_id: "经理",
+			manager_id_text: "经理",
+			company_id: "公司",
+			company_id_text: "公司",
+			parent_id: "上级部门",
+			parent_id_text: "上级部门",
+			active: "有效",
+			note: "笔记",
 		},
 		uiactions: {
 		},

app_HR/src/locale/lanres/entities/hr-department/hr-department_zh_CN.ts

@@ -120,6 +120,18 @@ export default {
 	master_grid: {
 		nodata: "",
 		columns: {
+			id: "ID",
+			name: "部门名称",
+			display_name: "显示名称",
+			complete_name: "完整名称",
+			manager_id: "经理",
+			manager_id_text: "经理",
+			company_id: "公司",
+			company_id_text: "公司",
+			parent_id: "上级部门",
+			parent_id_text: "上级部门",
+			active: "有效",
+			note: "笔记",
 		},
 		uiactions: {
 		},

app_HR/src/mock/codelist/codelist.ts

@@ -259,6 +259,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        srfkey: "Odoo_truefalse",
+        emptytext: "未定义",
+        "codelisttype":"static",
+        items: [
+            {
+                id: "false",
+                label: "否",
+                text: "否",
+                "data":"",
+                "codename":"False",
+                value: "false",
+                
+                disabled: false,
+            },
+            {
+                id: "true",
+                label: "是",
+                text: "是",
+                "data":"",
+                "codename":"True",
+                value: "true",
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: "HR_JOB__STATE",
         emptytext: "未定义",

app_HR/src/widgets/hr-department/master-grid/master-grid-base.tsx

@@ -84,8 +84,15 @@ export class MasterGridBase extends GridControlBase {
      * @type {string}
      * @memberof MasterBase
      */  
-    public majorInfoColName:string = "";
+    public majorInfoColName:string = "name";
 
+    /**
+     * 列主键属性名称
+     *
+     * @type {string}
+     * @memberof MasterGridBase
+     */
+    public columnKeyName: string = "id";
 
     /**
      * 本地缓存标识
@@ -103,6 +110,114 @@ export class MasterGridBase extends GridControlBase {
      * @memberof MasterGridBase
      */
     public allColumns: any[] = [
+        {
+            name: 'id',
+            label: 'ID',
+            langtag: 'entities.hr_department.master_grid.columns.id',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'name',
+            label: '部门名称',
+            langtag: 'entities.hr_department.master_grid.columns.name',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'display_name',
+            label: '显示名称',
+            langtag: 'entities.hr_department.master_grid.columns.display_name',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'complete_name',
+            label: '完整名称',
+            langtag: 'entities.hr_department.master_grid.columns.complete_name',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'manager_id',
+            label: '经理',
+            langtag: 'entities.hr_department.master_grid.columns.manager_id',
+            show: false,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'manager_id_text',
+            label: '经理',
+            langtag: 'entities.hr_department.master_grid.columns.manager_id_text',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'company_id',
+            label: '公司',
+            langtag: 'entities.hr_department.master_grid.columns.company_id',
+            show: false,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'company_id_text',
+            label: '公司',
+            langtag: 'entities.hr_department.master_grid.columns.company_id_text',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'parent_id',
+            label: '上级部门',
+            langtag: 'entities.hr_department.master_grid.columns.parent_id',
+            show: false,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'parent_id_text',
+            label: '上级部门',
+            langtag: 'entities.hr_department.master_grid.columns.parent_id_text',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'active',
+            label: '有效',
+            langtag: 'entities.hr_department.master_grid.columns.active',
+            show: true,
+            unit: 'STAR',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
+        {
+            name: 'note',
+            label: '笔记',
+            langtag: 'entities.hr_department.master_grid.columns.note',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
     ]
 
     /**
@@ -146,6 +261,18 @@ export class MasterGridBase extends GridControlBase {
      * @memberof MasterBase
      */
     public hasRowEdit: any = {
+        'id':false,
+        'name':false,
+        'display_name':false,
+        'complete_name':false,
+        'manager_id':false,
+        'manager_id_text':false,
+        'company_id':false,
+        'company_id_text':false,
+        'parent_id':false,
+        'parent_id_text':false,
+        'active':false,
+        'note':false,
     };
 
     /**
@@ -160,6 +287,28 @@ export class MasterGridBase extends GridControlBase {
     }
 
 
+    /**
+     * 导出数据格式化
+     *
+     * @param {*} filterVal
+     * @param {*} jsonData
+     * @param {any[]} [codelistColumns=[]]
+     * @returns {Promise<any>}
+     * @memberof MasterGridBase
+     */
+    public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
+        return super.formatExcelData(filterVal, jsonData, [
+            {
+                name: 'active',
+                srfkey: 'Odoo_truefalse',
+                codelistType : 'STATIC',
+                renderMode: 'other',
+                textSeparator: '、',
+                valueSeparator: ',',
+            },
+        ]);
+    }
+
 
     /**
      * 更新默认值

app_HR/src/widgets/hr-department/master-grid/master-grid-model.ts

@@ -26,19 +26,69 @@ export default class MasterModel {
       ]
     }else{
 		  return [
+        {
+          name: 'id',
+          prop: 'id',
+          dataType: 'ACID',
+        },
+        {
+          name: 'name',
+          prop: 'name',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'display_name',
+          prop: 'display_name',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'complete_name',
+          prop: 'complete_name',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'manager_id',
+          prop: 'manager_id',
+          dataType: 'PICKUP',
+        },
+        {
+          name: 'manager_id_text',
+          prop: 'manager_id_text',
+          dataType: 'PICKUPTEXT',
+        },
         {
           name: 'company_id',
           prop: 'company_id',
           dataType: 'PICKUP',
         },
         {
-          name: 'write_uid',
-          prop: 'write_uid',
+          name: 'company_id_text',
+          prop: 'company_id_text',
+          dataType: 'PICKUPTEXT',
+        },
+        {
+          name: 'parent_id',
+          prop: 'parent_id',
           dataType: 'PICKUP',
         },
         {
-          name: 'manager_id',
-          prop: 'manager_id',
+          name: 'parent_id_text',
+          prop: 'parent_id_text',
+          dataType: 'PICKUPTEXT',
+        },
+        {
+          name: 'active',
+          prop: 'active',
+          dataType: 'TRUEFALSE',
+        },
+        {
+          name: 'note',
+          prop: 'note',
+          dataType: 'LONGTEXT',
+        },
+        {
+          name: 'write_uid',
+          prop: 'write_uid',
           dataType: 'PICKUP',
         },
         {
@@ -62,11 +112,6 @@ export default class MasterModel {
           dataType: 'ACID',
           isEditable:true
         },
-        {
-          name: 'parent_id',
-          prop: 'parent_id',
-          dataType: 'PICKUP',
-        },
         {
           name: 'hr_department',
           prop: 'id',

app_HR/src/widgets/hr-department/master-grid/master-grid.html

@@ -25,6 +25,152 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
+            <template v-if="getColumnState('id')">
+                <el-table-column show-overflow-tooltip :prop="'id'" :label="$t('entities.hr_department.master_grid.columns.id')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.id')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.id}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('name')">
+                <el-table-column show-overflow-tooltip :prop="'name'" :label="$t('entities.hr_department.master_grid.columns.name')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.name')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.name}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('display_name')">
+                <el-table-column show-overflow-tooltip :prop="'display_name'" :label="$t('entities.hr_department.master_grid.columns.display_name')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.display_name')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.display_name}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('complete_name')">
+                <el-table-column show-overflow-tooltip :prop="'complete_name'" :label="$t('entities.hr_department.master_grid.columns.complete_name')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.complete_name')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.complete_name}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('manager_id')">
+                <el-table-column show-overflow-tooltip :prop="'manager_id'" :label="$t('entities.hr_department.master_grid.columns.manager_id')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.manager_id')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.manager_id}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('manager_id_text')">
+                <el-table-column show-overflow-tooltip :prop="'manager_id_text'" :label="$t('entities.hr_department.master_grid.columns.manager_id_text')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.manager_id_text')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.manager_id_text}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('company_id')">
+                <el-table-column show-overflow-tooltip :prop="'company_id'" :label="$t('entities.hr_department.master_grid.columns.company_id')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.company_id')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.company_id}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('company_id_text')">
+                <el-table-column show-overflow-tooltip :prop="'company_id_text'" :label="$t('entities.hr_department.master_grid.columns.company_id_text')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.company_id_text')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.company_id_text}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('parent_id')">
+                <el-table-column show-overflow-tooltip :prop="'parent_id'" :label="$t('entities.hr_department.master_grid.columns.parent_id')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.parent_id')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.parent_id}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('parent_id_text')">
+                <el-table-column show-overflow-tooltip :prop="'parent_id_text'" :label="$t('entities.hr_department.master_grid.columns.parent_id_text')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.parent_id_text')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.parent_id_text}}</span>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('active')">
+                <el-table-column show-overflow-tooltip :prop="'active'" :label="$t('entities.hr_department.master_grid.columns.active')" :min-width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.active')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <template >
+            <codelist :value="row.active" tag='Odoo_truefalse' codelistType='STATIC' ></codelist>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
+            <template v-if="getColumnState('note')">
+                <el-table-column show-overflow-tooltip :prop="'note'" :label="$t('entities.hr_department.master_grid.columns.note')" :width="100"  :align="'left'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.hr_department.master_grid.columns.note')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.note}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>

businesscentral-app/businesscentral-app-hr/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 /businesscentral-app-hr.jar
 
-EXPOSE 8080
+EXPOSE 31130
 
 ADD businesscentral-app-hr.jar /businesscentral-app-hr.jar

businesscentral-app/businesscentral-app-hr/src/main/docker/businesscentral-app-hr.yaml

@@ -3,9 +3,25 @@ services:
   businesscentral-app-hr:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-hr:latest
     ports:
-      - "8080:8080"
+      - "31130:31130"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=31130
+      - 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=odoo
+      - SPRING_DATASOURCE_PASSWORD=odoo
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://172.16.240.158:15432/odoo
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=org.postgresql.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=odoo
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

businesscentral-app/businesscentral-app-invoice/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 /businesscentral-app-invoice.jar
 
-EXPOSE 8080
+EXPOSE 31130
 
 ADD businesscentral-app-invoice.jar /businesscentral-app-invoice.jar

businesscentral-app/businesscentral-app-invoice/src/main/docker/businesscentral-app-invoice.yaml

@@ -3,9 +3,25 @@ services:
   businesscentral-app-invoice:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-invoice:latest
     ports:
-      - "8080:8080"
+      - "31130:31130"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=31130
+      - 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=odoo
+      - SPRING_DATASOURCE_PASSWORD=odoo
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://172.16.240.158:15432/odoo
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=org.postgresql.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=odoo
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

businesscentral-app/businesscentral-app-purchase/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 /businesscentral-app-purchase.jar
 
-EXPOSE 8080
+EXPOSE 31130
 
 ADD businesscentral-app-purchase.jar /businesscentral-app-purchase.jar

businesscentral-app/businesscentral-app-purchase/src/main/docker/businesscentral-app-purchase.yaml

@@ -3,9 +3,25 @@ services:
   businesscentral-app-purchase:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-purchase:latest
     ports:
-      - "8080:8080"
+      - "31130:31130"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=31130
+      - 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=odoo
+      - SPRING_DATASOURCE_PASSWORD=odoo
+      - SPRING_DATASOURCE_URL=jdbc:postgresql://172.16.240.158:15432/odoo
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=org.postgresql.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=odoo
+      - CAS=https://passport.ibizlab.cn
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

config.xml

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