1

src/pages/financial/financalDocument/CapitalAllocationDetail.vue

@@ -640,7 +640,7 @@
           AuditSteps:[]
         },
         endDate: '',
-        huijiShow:false,
+        huijiShow:true,
       }
     },
     created(){

src/pages/financial/financalDocument/RecPayQuery.vue

@@ -495,9 +495,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="所属公司：">
+            <el-form-item label="所属校区：">
               <el-select filterable v-model='msg.RB_Branch_Id'
-                @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()"
+                @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment(msg.RB_Branch_Id)"
                 class="">
                 <el-option :value="-1" label="不限"></el-option>
                 <el-option v-for='item in CompanyList' :label='item.SName' :value='item.SId' :key='item.SId'>
@@ -508,10 +508,10 @@
           <el-col :span="4">
             <el-form-item label="费用部门：">
               <el-select filterable v-model='msg.RB_Depart_Id'
-                @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
+                @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(msg.RB_Depart_Id),msg.UpdateBy=''" class="">
                 <el-option :value="0" label="不限"></el-option>
-                <el-option v-for='item in DepartmentList' :label='item.DepartmentName' :value='item.DepartmentID'
-                  :key='item.DepartmentID'>
+                <el-option v-for='item in DepartmentList' :label='item.DeptName' :value='item.DeptId'
+                  :key='item.DeptId'>
                 </el-option>
               </el-select>
             </el-form-item>
@@ -520,8 +520,8 @@
             <el-form-item label="制单人员：">
               <el-select filterable v-model='msg.UpdateBy' class="">
                 <el-option :value="0" label="不限"></el-option>
-                <el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
-                  :key='item.EmployeeId'>
+                <el-option v-for='item in EmployeeList' :label='item.EmployeeName' :value='item.Id'
+                  :key='item.Id'>
                 </el-option>
               </el-select>
             </el-form-item>
@@ -911,6 +911,12 @@
   import myBill from "../components/BillModule.vue";
   import myrbvBill from "../components/ReceivablesModule.vue";
   import myhrBill from "../components/MergeBillModule.vue";
+  import {
+    queryEmployee
+  } from '../../../api/users/user'
+  import {
+    getDeptPage,
+  } from '../../../api/system/dept'
   import Vue from 'vue'
   import {
     getSchoolPage
@@ -959,7 +965,7 @@
           Sort: '2',
           EmployeeId: '',
         },
-        getCompanyMsg: { // 公司
+        getCompanyMsg: { // 校区
           RB_Group_Id: '0',
           Status: '0',
         },
@@ -1093,8 +1099,8 @@
       this.FinancialFlowTemplate_post_GetList();
       this.getCompanyList();
       this.Financial_post_GetConditionList();
-      this.getEmployee();
-      this.getDepartment();
+      this.getEmployee(0);
+      this.getDepartment(0);
       this.Financial_post_GetBranchAccountList();
       this.financeinfo_post_GetClientTypeList();
       this.FinancialFlowTemplate_post_GetStatusList();
@@ -1402,21 +1408,39 @@
           }
         }, err => {})
       },
-      getDepartment() { //部门
-        this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
-          if (res.data.resultCode == 1) {
-            this.DepartmentList = res.data.data;
-          }
-        }, err => {})
+      getDepartment:function(id) { //部门
+        let msg={
+          pageIndex: 1,
+          pageSize: 999,
+          rowsPerPage: 12,
+          DeptName: "", //部门名称
+          DeptId: 0, //部门编号
+          Status: "-1",
+          School_Id: 0,
+          DeptTier: 0,
+          ParentId: 0,
+        }
+        msg.School_Id = id;
+        getDeptPage(msg).then(res => {
+          this.DepartmentList=res.Data.PageData;
+        }).catch(() => {
+        })
       },
-      getEmployee() { //员工
-        this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
-          if (res.data.resultCode == 1) {
-            this.EmployeeList = res.data.data;
+      getEmployee(id) { //员工
+
+        var qMsg = {
+          Dept_Id: 0
         }
-        }, err => {})
+        qMsg.Dept_Id=id;
+        queryEmployee(qMsg).then(res => {
+          if(res.Code==1){
+            this.EmployeeList = res.Data;
+          }
+        }).catch(() => {
+
+        })
       },
-      getCompanyList() { //获取公司列表
+      getCompanyList() { //获取校区列表
         getSchoolPage(this.schoolMsg).then(res => {
           this.CompanyList = res.Data.PageData;
         }).catch(() => {