ibiz4j 发布系统代码

app_web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts

@@ -66,12 +66,12 @@ export default {
 			srfsourcekey: "", 
 			deptcode: "部门代码", 
 			deptname: "部门名称", 
+			orgid: "单位", 
 			orgname: "单位", 
+			pdeptid: "上级部门", 
 			pdeptname: "上级部门", 
 			enable: "逻辑有效", 
-			pdeptid: "上级部门", 
 			deptid: "部门标识", 
-			orgid: "单位", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts

@@ -65,12 +65,12 @@ export default {
 			srfsourcekey: '', 
 			deptcode: '部门代码', 
 			deptname: '部门名称', 
+			orgid: '单位', 
 			orgname: '单位', 
+			pdeptid: '上级部门', 
 			pdeptname: '上级部门', 
 			enable: '逻辑有效', 
-			pdeptid: '上级部门', 
 			deptid: '部门标识', 
-			orgid: '单位', 
 		},
 		uiactions: {
 		},

app_web/src/widgets/ibzdepartment/new-form-form/new-form-form-base.vue

@@ -20,51 +20,13 @@
 </i-col>
 <i-col v-show="detailsModel.orgname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='orgname' :itemRules="this.rules.orgname" class='' :caption="$t('entities.ibzdepartment.newform_form.details.orgname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :itemParam='{ }' 
-  :disabled="detailsModel.orgname.disabled"
-  name='orgname'
-  deMajorField='orgname'
-  deKeyField='ibzorganization'
-  :service="service"
-  :acParams="{ serviceName: 'IBZOrganizationService', interfaceName: 'FetchDefault'}"
-  valueitem='orgid' 
-  :value="data.orgname" 
-  editortype="" 
-  :pickupView="{ viewname: 'ibzorganization-pickup-view', title: $t('entities.ibzorganization.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange">
-</app-picker>
-
+    <app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'orgid','label':'orgname'}" :multiple="false" style="" @select-change="onFormItemValueChange"></app-org-select>
 </app-form-item>
 
 </i-col>
 <i-col v-show="detailsModel.pdeptname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='pdeptname' :itemRules="this.rules.pdeptname" class='' :caption="$t('entities.ibzdepartment.newform_form.details.pdeptname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pdeptname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :itemParam='{ }' 
-  :disabled="detailsModel.pdeptname.disabled"
-  name='pdeptname'
-  deMajorField='deptname'
-  deKeyField='ibzdepartment'
-  :service="service"
-  :acParams="{ serviceName: 'IBZDepartmentService', interfaceName: 'FetchDefault'}"
-  valueitem='pdeptid' 
-  :value="data.pdeptname" 
-  editortype="" 
-  :pickupView="{ viewname: 'ibzdepartment-pickup-view', title: $t('entities.ibzdepartment.views.pickupview.title'), deResParameters: [{ pathName: 'ibzorganizations', parameterName: 'ibzorganization' }, ], parameters: [{ pathName: 'ibzdepartments', parameterName: 'ibzdepartment' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange">
-</app-picker>
-
+    <app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'pdeptid','label':'pdeptname'}" :multiple="false" style="" @select-change="onFormItemValueChange"></app-department-select>
 </app-form-item>
 
 </i-col>
@@ -381,12 +343,12 @@ export default class NewFormBase extends Vue implements ControlInterface {
         srfsourcekey: null,
         deptcode: null,
         deptname: null,
+        orgid: null,
         orgname: null,
+        pdeptid: null,
         pdeptname: null,
         enable: null,
-        pdeptid: null,
         deptid: null,
-        orgid: null,
         ibzdepartment:null,
     };
 
@@ -489,12 +451,24 @@ export default class NewFormBase extends Vue implements ControlInterface {
             { required: true, type: 'string', message: '部门名称 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '部门名称 值不能为空', trigger: 'blur' },
         ],
+        orgid: [
+            { type: 'string', message: '单位 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '单位 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '单位 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '单位 值不能为空', trigger: 'blur' },
+        ],
         orgname: [
             { type: 'string', message: '单位 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '单位 值必须为字符串类型', trigger: 'blur' },
             { required: true, type: 'string', message: '单位 值不能为空', trigger: 'change' },
             { required: true, type: 'string', message: '单位 值不能为空', trigger: 'blur' },
         ],
+        pdeptid: [
+            { type: 'string', message: '上级部门 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '上级部门 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '上级部门 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '上级部门 值不能为空', trigger: 'blur' },
+        ],
         pdeptname: [
             { type: 'string', message: '上级部门 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '上级部门 值必须为字符串类型', trigger: 'blur' },
@@ -507,24 +481,12 @@ export default class NewFormBase extends Vue implements ControlInterface {
             { required: false, type: 'number', message: '逻辑有效 值不能为空', trigger: 'change' },
             { required: false, type: 'number', message: '逻辑有效 值不能为空', trigger: 'blur' },
         ],
-        pdeptid: [
-            { type: 'string', message: '上级部门 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '上级部门 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '上级部门 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '上级部门 值不能为空', trigger: 'blur' },
-        ],
         deptid: [
             { type: 'string', message: '部门标识 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '部门标识 值必须为字符串类型', trigger: 'blur' },
             { required: false, type: 'string', message: '部门标识 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '部门标识 值不能为空', trigger: 'blur' },
         ],
-        orgid: [
-            { type: 'string', message: '单位 值必须为字符串类型', trigger: 'change' },
-            { type: 'string', message: '单位 值必须为字符串类型', trigger: 'blur' },
-            { required: false, type: 'string', message: '单位 值不能为空', trigger: 'change' },
-            { required: false, type: 'string', message: '单位 值不能为空', trigger: 'blur' },
-        ],
     }
 
     /**
@@ -557,18 +519,18 @@ export default class NewFormBase extends Vue implements ControlInterface {
         deptcode: new FormItemModel({ caption: '部门代码', detailType: 'FORMITEM', name: 'deptcode', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 1 })
 , 
         deptname: new FormItemModel({ caption: '部门名称', detailType: 'FORMITEM', name: 'deptname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        orgid: new FormItemModel({ caption: '单位', detailType: 'FORMITEM', name: 'orgid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         orgname: new FormItemModel({ caption: '单位', detailType: 'FORMITEM', name: 'orgname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        pdeptid: new FormItemModel({ caption: '上级部门', detailType: 'FORMITEM', name: 'pdeptid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         pdeptname: new FormItemModel({ caption: '上级部门', detailType: 'FORMITEM', name: 'pdeptname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         enable: new FormItemModel({ caption: '逻辑有效', detailType: 'FORMITEM', name: 'enable', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
-, 
-        pdeptid: new FormItemModel({ caption: '上级部门', detailType: 'FORMITEM', name: 'pdeptid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         deptid: new FormItemModel({ caption: '部门标识', detailType: 'FORMITEM', name: 'deptid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
-, 
-        orgid: new FormItemModel({ caption: '单位', detailType: 'FORMITEM', name: 'orgid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
     };
 
@@ -693,75 +655,75 @@ export default class NewFormBase extends Vue implements ControlInterface {
     }
 
     /**
-     * 监控表单属性 orgname 值
+     * 监控表单属性 orgid 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof NewForm
      */
-    @Watch('data.orgname')
-    onOrgnameChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'orgname', newVal: newVal, oldVal: oldVal });
+    @Watch('data.orgid')
+    onOrgidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'orgid', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 pdeptname 值
+     * 监控表单属性 orgname 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof NewForm
      */
-    @Watch('data.pdeptname')
-    onPdeptnameChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'pdeptname', newVal: newVal, oldVal: oldVal });
+    @Watch('data.orgname')
+    onOrgnameChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'orgname', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 enable 值
+     * 监控表单属性 pdeptid 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof NewForm
      */
-    @Watch('data.enable')
-    onEnableChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'enable', newVal: newVal, oldVal: oldVal });
+    @Watch('data.pdeptid')
+    onPdeptidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'pdeptid', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 pdeptid 值
+     * 监控表单属性 pdeptname 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof NewForm
      */
-    @Watch('data.pdeptid')
-    onPdeptidChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'pdeptid', newVal: newVal, oldVal: oldVal });
+    @Watch('data.pdeptname')
+    onPdeptnameChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'pdeptname', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 deptid 值
+     * 监控表单属性 enable 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof NewForm
      */
-    @Watch('data.deptid')
-    onDeptidChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'deptid', newVal: newVal, oldVal: oldVal });
+    @Watch('data.enable')
+    onEnableChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'enable', newVal: newVal, oldVal: oldVal });
     }
 
     /**
-     * 监控表单属性 orgid 值
+     * 监控表单属性 deptid 值
      *
      * @param {*} newVal
      * @param {*} oldVal
      * @memberof NewForm
      */
-    @Watch('data.orgid')
-    onOrgidChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'orgid', newVal: newVal, oldVal: oldVal });
+    @Watch('data.deptid')
+    onDeptidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'deptid', newVal: newVal, oldVal: oldVal });
     }
 
 
@@ -773,6 +735,13 @@ export default class NewFormBase extends Vue implements ControlInterface {
      * @memberof NewForm
      */
     public resetFormData({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
+        if (Object.is(name, 'orgid')) {
+            this.onFormItemValueChange({ name: 'pdeptid', value: null });
+        }
+        if (Object.is(name, 'orgid')) {
+            this.onFormItemValueChange({ name: 'pdeptname', value: null });
+            this.onFormItemValueChange({ name: 'pdeptid', value: null });
+        }
     }
 
     /**

app_web/src/widgets/ibzdepartment/new-form-form/new-form-form-model.ts

@@ -65,11 +65,21 @@ export default class NewFormModel {
         prop: 'deptname',
         dataType: 'TEXT',
       },
+      {
+        name: 'orgid',
+        prop: 'orgid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'orgname',
         prop: 'orgname',
         dataType: 'PICKUPTEXT',
       },
+      {
+        name: 'pdeptid',
+        prop: 'parentdeptid',
+        dataType: 'PICKUP',
+      },
       {
         name: 'pdeptname',
         prop: 'parentdeptname',
@@ -80,21 +90,11 @@ export default class NewFormModel {
         prop: 'enable',
         dataType: 'YESNO',
       },
-      {
-        name: 'pdeptid',
-        prop: 'parentdeptid',
-        dataType: 'PICKUP',
-      },
       {
         name: 'deptid',
         prop: 'deptid',
         dataType: 'TEXT',
       },
-      {
-        name: 'orgid',
-        prop: 'orgid',
-        dataType: 'PICKUP',
-      },
       {
         name: 'ibzdepartment',
         prop: 'deptid',

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

@@ -126,7 +126,7 @@
 
 
     <!--输出实体[IBZDEPT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-624-4">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-625-4">
         <createTable tableName="IBZDEPT">
                 <column name="DEPTID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDEPT_DEPTID"/>
@@ -179,10 +179,10 @@
        <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZEMP_USE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZEMP" validate="true"/>
     </changeSet>
         <!--输出实体[IBZDEPT]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-624-10">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-625-10">
        <addForeignKeyConstraint baseColumnNames="PDEPTID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZDEPT_PDEPTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-624-11">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-625-11">
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZDEPT" constraintName="DER1N_IBZDEPT_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>