commit

src/main/resources/views/platform/sys/unit/index.html

@@ -13,11 +13,11 @@ layout("/layouts/platform.html"){
                         ref="treeRef"
                         :expand-on-click-node="false"
                         :props="{
-                        children: 'children',
-                        label: 'name'
-                     }"
+	                        children: 'children',
+	                        label: 'name'
+	                     }"
                         node-key="id"
-                        :default-expanded-keys="['1']"
+                        default-expand-all
                         @node-click="treeNodeClick"
                         :filter-node-method="filterNode"
                         highlight-current

src/main/resources/views/platform/zhgh/staffmanage/sourcechange/manage/index.html

@@ -27,14 +27,14 @@ layout("/layouts/platform.html"){
                         <dict-select v-model="pageForm.userState" placeholder="在职状态" @change="doSearch"
                                      code="USER_STATE"></dict-select>
                     </search-item>
+	                <search-item label="教职工类别">
+		                <dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
+		                             code="USER_PERSON_TYPE"></dict-select>
+	                </search-item>
                     <search-item label="编制类别">
                         <dict-select v-model="pageForm.preparedBy" placeholder="编制类别" @change="doSearch"
                                      code="USER_PREPARED_BY_TYPE"></dict-select>
                     </search-item>
-                    <search-item label="教职工类别">
-                        <dict-select v-model="pageForm.personType" placeholder="教职工类别" @change="doSearch"
-                                     code="USER_PERSON_TYPE"></dict-select>
-                    </search-item>
                     <search-item label="变更类型">
                         <dict-select v-model="pageForm.changeType" placeholder="变更类型" @change="doSearch"
                                      code="MEMBER_CHANGE_TYPE"></dict-select>
@@ -155,8 +155,8 @@ layout("/layouts/platform.html"){
                     { prop: "username", label: "姓名", sortable: true },
                     { prop: "sex", label: "性别", sortable: true, width: "100px" },
                     { prop: "userState", label: "在职状态", sortable: true },
+	                { prop: "personType", label: "教职工类别", sortable: true },
                     { prop: "preparedBy", label: "编制类别", sortable: true },
-                    { prop: "personType", label: "教职工类别", sortable: true },
                     { prop: "unionName", label: "所属工会", sortable: true },
                     { prop: "unitName", label: "所属单位", sortable: true },
                     { prop: "changeTypes", label: "变更类型", sortable: true },