ibiz4j 发布系统代码

app_web/src/locale/lanres/ibzdept-member/ibzdept-member_en_US.ts

@@ -41,6 +41,7 @@ export default {
 		columns: {
 			deptname: "部门",
 			personname: "成员",
+			deptid: "部门标识",
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/ibzdept-member/ibzdept-member_zh_CN.ts

@@ -40,6 +40,7 @@ export default {
 		columns: {
 			deptname: '部门',
 			personname: '成员',
+			deptid: '部门标识',
 		},
 		uiactions: {
 		},

app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue

@@ -24,7 +24,16 @@
             <template v-if="getColumnState('deptname')">
                 <el-table-column show-overflow-tooltip :prop="'deptname'" :label="$t('entities.ibzdeptmember.main_grid.columns.deptname')" :width="250"  :align="'left'" :sortable="'custom'">
                     <template v-slot="{row,column}">
-                        <span>{{row.deptname}}</span>
+                        <template v-if="actualIsOpenEdit">
+                            <i-form style="height:100%;" :model="row">
+                                <app-form-item :name="column.property" :itemRules="rules[column.property]">
+                                     <dropdown-list v-model="row[column.property]" :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"  placeholder='请选择...' style="" @change="($event)=>{gridEditItemChange(row, column.property, $event)}"></dropdown-list>
+                                </app-form-item>
+                            </i-form>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
+                                <app-span name='deptname' editorType="DROPDOWNLIST" :value="row.deptname"></app-span>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -35,6 +44,30 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('deptid')">
+                <el-table-column show-overflow-tooltip :prop="'deptid'" :label="$t('entities.ibzdeptmember.main_grid.columns.deptid')" :width="100"  :align="'left'" :sortable="'custom'">
+                    <template v-slot="{row,column}">
+                        <template v-if="actualIsOpenEdit">
+                            <i-form style="height:100%;" :model="row">
+                                <app-form-item :name="column.property" :itemRules="rules[column.property]">
+                                    <input-box 
+              :disabled="row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1" 
+              v-model="row[column.property]" 
+              style=""
+              type="text"
+              
+              
+              @change="($event)=>{gridEditItemChange(row, column.property, $event)}">
+            </input-box>
+                                </app-form-item>
+                            </i-form>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
+                                <app-span name='deptid' editorType="HIDDEN" :value="row.deptid"></app-span>
+                        </template>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -524,6 +557,13 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             util: 'PX'
         },
+        {
+            name: 'deptid',
+            label: '部门标识',
+            langtag: 'entities.ibzdeptmember.main_grid.columns.deptid',
+            show: false,
+            util: 'PX'
+        },
     ]
 
     /**
@@ -533,6 +573,14 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
     public rules: any = {
+        deptid: [
+             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '部门标识 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '部门标识 值不能为空', trigger: 'blur' },
+        ],
+        deptname: [
+             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '部门 值不能为空', trigger: 'change' },
+            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '部门 值不能为空', trigger: 'blur' },
+        ],
         srfkey: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标识 值不能为空', trigger: 'change' },
             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标识 值不能为空', trigger: 'blur' },

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

@@ -106,7 +106,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[IBZDEPTMEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdeptmember-27-3">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdeptmember-28-3">
         <createTable tableName="IBZDEPTMEMBER">
                 <column name="MEMBERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZDEPTMEMBER_MEMBERID"/>
@@ -164,10 +164,10 @@
        <addForeignKeyConstraint baseColumnNames="ORGID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZORG_ORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[IBZDEPTMEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-27-8">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-28-8">
        <addForeignKeyConstraint baseColumnNames="DEPTID" baseTableName="IBZDEPTMEMBER" constraintName="DER1N_IBZDEPTMEMBER_IBZDEPT_DE" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="DEPTID" referencedTableName="IBZDEPT" validate="true"/>
     </changeSet>
-    <changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-27-9">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdeptmember-28-9">
        <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]外键关系 -->