Skip to content

I
ibzou
提交 588fcfbe 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibizdev提交

上级 4f6585dd
隐藏空白字符变更
内嵌 并排
正在显示 包含 101 行增加 和 27 行删除
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts
浏览文件 @ 588fcfbe
......@@ -10,6 +10,8 @@ export default {
deptlevel: '部门级别',
showorder: '排序',
bcode: '业务编码',
leaderid: '分管领导标识',
leadername: '分管领导',
enable: '逻辑有效',
orgname: '单位',
parentdeptname: '上级部门',
......@@ -83,6 +85,8 @@ export default {
shortname: "部门简称",
bcode: "业务编码",
deptlevel: "部门级别",
leaderid: "分管领导标识",
leadername: "分管领导",
showorder: "排序",
createdate: "创建时间",
updatedate: "最后修改时间",
......
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts
浏览文件 @ 588fcfbe
......@@ -9,6 +9,8 @@ export default {
deptlevel: '部门级别',
showorder: '排序',
bcode: '业务编码',
leaderid: '分管领导标识',
leadername: '分管领导',
enable: '逻辑有效',
orgname: '单位',
parentdeptname: '上级部门',
......@@ -82,6 +84,8 @@ export default {
shortname: '部门简称',
bcode: '业务编码',
deptlevel: '部门级别',
leaderid: '分管领导标识',
leadername: '分管领导',
showorder: '排序',
createdate: '创建时间',
updatedate: '最后修改时间',
......
app_web/src/pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view-base.vue
浏览文件 @ 588fcfbe
<template>
<div class='view-container degridview ibzdepartment-grid-view'>
<div class='view-container degridview ibzdepartment-grid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzdepartmentgridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入部门名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_web/src/pages/ou/ibzemployee-grid-view/ibzemployee-grid-view-base.vue
浏览文件 @ 588fcfbe
<template>
<div class='view-container degridview ibzemployee-grid-view'>
<div class='view-container degridview ibzemployee-grid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzemployeegridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入姓名" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_web/src/pages/ou/ibzorganization-grid-view/ibzorganization-grid-view-base.vue
浏览文件 @ 588fcfbe
<template>
<div class='view-container degridview ibzorganization-grid-view'>
<div class='view-container degridview ibzorganization-grid-view'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="ibzorganizationgridview"></app-studioaction>
<card class='view-card ' :dis-hover="true" :bordered="false">
<p slot='title'>
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<div style='margin-bottom: 6px;'>
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="请输入名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......
app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue
浏览文件 @ 588fcfbe
......@@ -82,6 +82,12 @@
<input-box v-model="data.deptlevel" @enter="onEnter($event)" unit="" :disabled="detailsModel.deptlevel.disabled" type='number' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.leadername.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='leadername' :itemRules="this.rules.leadername" class='' :caption="$t('entities.ibzdepartment.main_form.details.leadername')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.leadername.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.leadername" @enter="onEnter($event)" unit="" :disabled="detailsModel.leadername.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.showorder.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='showorder' :itemRules="this.rules.showorder" class='' :caption="$t('entities.ibzdepartment.main_form.details.showorder')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.showorder.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -413,6 +419,8 @@ export default class MainBase extends Vue implements ControlInterface {
shortname: null,
bcode: null,
deptlevel: null,
leaderid: null,
leadername: null,
showorder: null,
createdate: null,
updatedate: null,
......@@ -566,6 +574,18 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'number', message: '部门级别 值不能为空', trigger: 'change' },
{ required: false, type: 'number', message: '部门级别 值不能为空', trigger: 'blur' },
],
leaderid: [
{ type: 'string', message: '分管领导标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '分管领导标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '分管领导标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '分管领导标识 值不能为空', trigger: 'blur' },
],
leadername: [
{ type: 'string', message: '分管领导 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '分管领导 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '分管领导 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '分管领导 值不能为空', trigger: 'blur' },
],
showorder: [
{ type: 'number', message: '排序 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '排序 值必须为数值类型', trigger: 'blur' },
......@@ -630,6 +650,10 @@ export default class MainBase extends Vue implements ControlInterface {
bcode: new FormItemModel({ caption: '业务编码', detailType: 'FORMITEM', name: 'bcode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
deptlevel: new FormItemModel({ caption: '部门级别', detailType: 'FORMITEM', name: 'deptlevel', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
leaderid: new FormItemModel({ caption: '分管领导标识', detailType: 'FORMITEM', name: 'leaderid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
leadername: new FormItemModel({ caption: '分管领导', detailType: 'FORMITEM', name: 'leadername', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
showorder: new FormItemModel({ caption: '排序', detailType: 'FORMITEM', name: 'showorder', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
......@@ -855,6 +879,30 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'deptlevel', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 leaderid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.leaderid')
onLeaderidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'leaderid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 leadername 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.leadername')
onLeadernameChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'leadername', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 showorder 值
*
......@@ -946,6 +994,8 @@ export default class MainBase extends Vue implements ControlInterface {
......
app_web/src/widgets/ibzdepartment/main-form/main-form-model.ts
浏览文件 @ 588fcfbe
......@@ -105,6 +105,16 @@ export default class MainModel {
prop: 'deptlevel',
dataType: 'INT',
},
{
name: 'leaderid',
prop: 'leaderid',
dataType: 'TEXT',
},
{
name: 'leadername',
prop: 'leadername',
dataType: 'TEXT',
},
{
name: 'showorder',
prop: 'showorder',
......
app_web/src/widgets/ibzdepartment/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 588fcfbe
......@@ -42,6 +42,12 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'bcode',
},
{
name: 'leaderid',
},
{
name: 'leadername',
},
{
name: 'enable',
},
......
config.xml
浏览文件 @ 588fcfbe
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibzou/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzou/
mvn clean package -Papi
cd ibzou-provider/ibzou-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml ibzlab-rt --with-registry-auth
mvn clean package -Pweb
cd ibzou-app/ibzou-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
浏览文件 @ 588fcfbe
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-app-web.jar
EXPOSE 8080
EXPOSE 30001
ADD ibzou-app-web.jar /ibzou-app-web.jar
ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
浏览文件 @ 588fcfbe
......@@ -3,9 +3,21 @@ services:
ibzou-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-app-web:latest
ports:
- "8080:8080"
- "30001:30001"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30001
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
deploy:
mode: replicated
replicas: 1
......
ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
浏览文件 @ 588fcfbe
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzou-provider-api.jar
EXPOSE 40001
EXPOSE 8081
ADD ibzou-provider-api.jar /ibzou-provider-api.jar
ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml
浏览文件 @ 588fcfbe
......@@ -3,21 +3,9 @@ services:
ibzou-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
ports:
- "40001:40001"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=40001
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
deploy:
mode: replicated
replicas: 1
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或