Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/financial/AccountType.vue

@@ -353,8 +353,8 @@
               <!--<el-select filterable   v-model='addMsg.DepartmentID' @change="getPostList()">-->
               <el-select filterable multiple v-model='RangeIdsList' @change="changeRange">
                 <el-option :label="$t('active.cl_tongyong')" :value='-1'></el-option>
-                <el-option v-for='item in departmentList' :label='item.DepartmentName' :value='item.DepartmentID'
-                  :key='item.DepartmentID' :disabled="item.disabled">
+                <el-option v-for='item in departmentList' :label='item.DeptName' :value='item.DeptId'
+                  :key='item.DeptId' :disabled="item.disabled">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -384,6 +384,10 @@
   </div>
 </template>
 <script>
+  import {
+    getDeptPage,
+  } from '../../api/system/dept'
+
   export default {
     data() {
       return {
@@ -491,15 +495,25 @@
         }
       },
       getDepartment() { //获取部门
-        this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
-          if (res.data.resultCode == 1) {
-            let d = res.data.data;
-            d.forEach(x => {
+         var msg = {
+          pageIndex: 1,
+          pageSize: 999,
+          rowsPerPage: 12,
+          DeptName: "", //部门名称
+          DeptId: 0, //部门编号
+          Status: "-1",
+          School_Id: "0",
+          DeptTier: "0",
+          ParentId: "0",
+        }
+        getDeptPage(msg).then(res => {
+          this.departmentList = res.Data.PageData;
+          this.departmentList.forEach(x=>{
             x.disabled = true;
           })
-            this.departmentList = d;
-          }
-        }, err => {})
+        }).catch(() => {
+
+        })
       },
       getProfitLossList(id) { // 获取禁用时间
         this.apipost('FinanceInfo_post_GetProfitLossList', {