Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-17 e64197421cf28099935f71f193989a3394d47fe0

 WebService/src/main/resources/components/orgPackage/edit-org/editOrg.html

@@ -17,7 +17,7 @@
                            <div class="form-group row">
                                <label class="col-sm-2 col-form-label">组织级别</label>
                                <div class="col-sm-10">
                                    <select class="custom-select" v-model="editOrgInfo.orgLevel">
                                    <select class="custom-select" v-model="editOrgInfo.orgLevel" disabled>
                                        <option selected disabled value="">必填，请选择组织级别</option>
                                        <option value="2">分公司级</option>
                                        <option value="3">部门级</option>
@@ -26,11 +26,22 @@
                            <div class="form-group row">
                                <label class="col-sm-2 col-form-label">上级组织</label>
                                <div class="col-sm-10">
                                    <select class="custom-select" v-model="editOrgInfo.parentOrgId">
                                    <select class="custom-select" v-model="editOrgInfo.parentOrgId" disabled>
                                        <option selected disabled value="">必填，请选择上级组织</option>
                                        <option v-for="parentOrg in editOrgInfo.parentOrg" :value="parentOrg.orgId">{{parentOrg.orgName}}</option>
                                    </select></div>
                            </div>
                           <!-- <div class="form-group row">
                                <label class="col-sm-2 col-form-label">隶属小区</label>
                                <div class="col-sm-10">
                                    <select class="custom-select" v-model="editOrgInfo.belongCommunityId" v-bind:disabled="editOrgInfo.orgLevel == 3">
                                        <option selected disabled value="">必填，请选择隶属小区</option>
                                        <option  value="9999">入驻所有小区</option>
                                        <option v-for="belongCommunity in editOrgInfo.belongCommunitys" :value="belongCommunity.communityId">
                                            {{belongCommunity.name}}
                                        </option>
                                    </select></div>
                            </div>-->
                            <div class="form-group row">
                                <label class="col-sm-2 col-form-label">描述</label>
                                <div class="col-sm-10">