ibiz4j 发布系统代码

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

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

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

@@ -84,7 +84,14 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.orgname}}</span>
+                        <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>
                     </template>
                 </el-table-column>
             </template>
@@ -96,7 +103,14 @@
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.pdeptname}}</span>
+                        <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='pdeptname' editorType="PICKER" :value="row.pdeptname"></app-span>
+                        </template>
                     </template>
                 </el-table-column>
             </template>
@@ -182,14 +196,21 @@
                 </el-table-column>
             </template>
             <template v-if="getColumnState('leadername')">
-                <el-table-column show-overflow-tooltip :prop="'leadername'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.leadername')" :width="100"  :align="'left'" :sortable="'custom'">
+                <el-table-column show-overflow-tooltip :prop="'leadername'" :label="$t('entities.ibzdepartment.editgrid_grid.columns.leadername')" :width="250"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
                       <span class="column-header ">
                         {{$t('entities.ibzdepartment.editgrid_grid.columns.leadername')}}
                       </span>
                     </template>
                     <template v-slot="{row,column,$index}">
-                        <span>{{row.leadername}}</span>
+                        <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>
                     </template>
                 </el-table-column>
             </template>
@@ -873,13 +894,19 @@ 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(),
+          pdeptname: new FormItemModel(),
           deptlevel: new FormItemModel(),
           deptname: new FormItemModel(),
           srfkey: new FormItemModel(),
+          leadername: new FormItemModel(),
         }
     }
 
@@ -890,10 +917,26 @@ export default class EditGridBase extends Vue implements ControlInterface {
      * @memberof EditGrid
      */
     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' },
+        ],
+        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' },
+        ],
         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' },
@@ -906,6 +949,10 @@ 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' },
         ],
+        pdeptname: [
+             { 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' },
+        ],
         deptlevel: [
              { 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' },
@@ -918,6 +965,10 @@ 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,6 +2,7 @@ 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';
 
 
 /**
@@ -42,6 +43,14 @@ export default class EditGridService extends ControlService {
     }
 
 
+    /**
+     * 单位机构服务对象
+     *
+     * @type {IBZOrganizationService}
+     * @memberof EditGridService
+     */
+    public ibzorganizationService: IBZOrganizationService = new IBZOrganizationService();
+
     /**
      * 处理数据
      *