lab_qyk 发布系统代码

app_web/src/components/app-department-select/app-department-select.vue

@@ -17,7 +17,7 @@ export default class AppDepartmentSelect extends Vue {
      * @type {*}
      * @memberof AppDepartmentSelect
      */
-    @Prop({default:'/ibzorganizations/{orgid}/ibzdepartments/picker'}) public url?: any;
+    @Prop() public url?: any;
 
     /**
      * 过滤项
@@ -108,7 +108,7 @@ export default class AppDepartmentSelect extends Vue {
     public searchNodesData(){
       // 处理过滤参数，生成url
       let param = this.handleFilter();
-      let _url = this.url.replace(/{orgid}/,param)
+      let _url = this.url.replace('${orgid}',param)
       if(this.oldurl === _url){
           return;
       }

app_web/src/components/app-org-select/app-org-select.vue

@@ -44,6 +44,13 @@ export default class AppOrgSelect extends Vue {
    */
   @Prop({default:false}) public multiple?:boolean;
 
+  /**
+   * 查询单位路径
+   * 
+   * @memberof AppOrgSelect
+   */
+  @Prop() public url!:string;
+
   /**
    * 监听表单数据变化
    * 
@@ -57,20 +64,13 @@ export default class AppOrgSelect extends Vue {
         let tempFilterValue:any = this.initBasicData();
         // filter值变化才去请求数据
         if(tempFilterValue && (this.copyFilterValue !== tempFilterValue)){
-          this.loadTreeData(this.orgDataUrl.replace('${orgid}',tempFilterValue));
+          this.loadTreeData(this.url.replace('${orgid}',tempFilterValue));
           this.copyFilterValue = tempFilterValue;
         }
       }
     }
   }
 
-  /**
-   * 查询单位路径
-   * 
-   * @memberof AppOrgSelect
-   */
-  public orgDataUrl:string ="/ibzorganizations/${orgid}/suborg/picker";
-
   /**
    * 选择值
    * 
@@ -99,7 +99,7 @@ export default class AppOrgSelect extends Vue {
    */
   public created(){
     if(!this.filter){
-      this.loadTreeData(this.orgDataUrl.replace('${orgid}','alls'));
+      this.loadTreeData(this.url);
     }
   }
 

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

@@ -17,13 +17,13 @@
 </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.main_form.details.pdeptname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pdeptname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" url="/ibzorganizations/${orgid}/ibzdepartments/picker" filter="srforgid"  :fillMap="{'id':'pdeptid','label':'pdeptname'}" :multiple="true" style="" @select-change="onFormItemValueChange"></app-department-select>
+    <app-department-select :data="data" :context="JSON.parse(JSON.stringify(context))" url="/ibzorganizations/${orgid}/ibzdepartments/picker" filter="srforgid"  :fillMap="{'id':'pdeptid','label':'pdeptname'}" :multiple="false" style="" @select-change="onFormItemValueChange"></app-department-select>
 </app-form-item>
 
 </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.main_form.details.orgname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgname.error" :isEmptyCaption="false" labelPos="LEFT">
-    <app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'orgid','label':'orgname'}" url="/ibzorganizations/alls/suborg/picker" filter="srforgid" :multiple="true" style="" @select-change="onFormItemValueChange"></app-org-select>
+    <app-org-select :data="data" :context="JSON.parse(JSON.stringify(context))" :fillMap="{'id':'orgid','label':'orgname'}" url="/ibzorganizations/${orgid}/suborg/picker" filter="srforgid" :multiple="false" style="" @select-change="onFormItemValueChange"></app-org-select>
 </app-form-item>
 
 </i-col>

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

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