ibiz4j 发布系统代码

app_web/src/store/modules/view-action/state.ts

@@ -78,7 +78,6 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '21259e2d03645750f1d3d71839f1223b',
-                '9e25d15d43ff644fa008c9cf7d063ac3',
                 'b59db4df07430a34645566a64d59244c',
             ],
         },

app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue

@@ -84,14 +84,7 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template v-if="actualIsOpenEdit">
-                            <app-form-item :error="gridItemsModel[$index][column.property].error">
-                                 <span>单位选择</span>
-                            </app-form-item>
-                        </template>
-                        <template v-if="!actualIsOpenEdit">
-                                <app-span name='orgname' editorType="PICKER" :value="row.orgname"></app-span>
-                        </template>
+                        <span>{{row.orgname}}</span>
                     </template>
                 </el-table-column>
             </template>
@@ -203,14 +196,7 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <template v-if="actualIsOpenEdit">
-                            <app-form-item :error="gridItemsModel[$index][column.property].error">
-                                
-                            </app-form-item>
-                        </template>
-                        <template v-if="!actualIsOpenEdit">
-                                <app-span name='leadername' editorType="PICKER" :value="row.leadername"></app-span>
-                        </template>
+                        <span>{{row.leadername}}</span>
                     </template>
                 </el-table-column>
             </template>
@@ -285,7 +271,22 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.orgid}}</span>
+                        <template v-if="actualIsOpenEdit">
+                            <app-form-item :error="gridItemsModel[$index][column.property].error">
+                                <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, $index)}">
+            </input-box>
+                            </app-form-item>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
+                                <app-span name='orgid' editorType="HIDDEN" :value="row.orgid"></app-span>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -297,7 +298,22 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.pdeptid}}</span>
+                        <template v-if="actualIsOpenEdit">
+                            <app-form-item :error="gridItemsModel[$index][column.property].error">
+                                <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, $index)}">
+            </input-box>
+                            </app-form-item>
+                        </template>
+                        <template v-if="!actualIsOpenEdit">
+                                <app-span name='pdeptid' editorType="HIDDEN" :value="row.pdeptid"></app-span>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -895,10 +911,8 @@ export default class EditGridBase extends Vue implements ControlInterface {
     public getGridRowModel(){
         return {
           pdeptid: new FormItemModel(),
-          leaderid: new FormItemModel(),
           orgid: new FormItemModel(),
           bcode: new FormItemModel(),
-          orgname: new FormItemModel(),
           deptcode: new FormItemModel(),
           showorder: new FormItemModel(),
           shortname: new FormItemModel(),
@@ -906,7 +920,6 @@ export default class EditGridBase extends Vue implements ControlInterface {
           deptlevel: new FormItemModel(),
           deptname: new FormItemModel(),
           srfkey: new FormItemModel(),
-          leadername: new FormItemModel(),
         }
     }
 
@@ -918,25 +931,17 @@ export default class EditGridBase extends Vue implements ControlInterface {
      */
     public rules: any = {
         pdeptid: [
-             { 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' },
-        ],
-        leaderid: [
-             { 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' },
+             { 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' },
         ],
         orgid: [
-             { 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' },
+             { 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' },
         ],
         bcode: [
              { 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' },
         ],
-        orgname: [
-             { 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' },
-        ],
         deptcode: [
              { required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '部门代码 值不能为空', trigger: 'change' },
             { required: true, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '部门代码 值不能为空', trigger: 'blur' },
@@ -965,10 +970,6 @@ export default class EditGridBase extends Vue implements ControlInterface {
              { 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' },
         ],
-        leadername: [
-             { 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' },
-        ],
     }
 
     /**

app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-service.ts

@@ -2,7 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import IBZDepartmentService from '@/service/ibzdepartment/ibzdepartment-service';
 import EditGridModel from './edit-grid-grid-model';
-import IBZOrganizationService from '@/service/ibzorganization/ibzorganization-service';
 
 
 /**
@@ -43,14 +42,6 @@ export default class EditGridService extends ControlService {
     }
 
 
-    /**
-     * 单位机构服务对象
-     *
-     * @type {IBZOrganizationService}
-     * @memberof EditGridService
-     */
-    public ibzorganizationService: IBZOrganizationService = new IBZOrganizationService();
-
     /**
      * 处理数据
      *

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

@@ -126,7 +126,7 @@
 
 
     <!--输出实体[IBZDEPT]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-684-4">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzdept-688-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-684-10">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-688-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-684-11">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzdept-688-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>