修改

src/pages/financial/accountingWork.vue

@@ -535,7 +535,6 @@
         queryEmployee({}).then(res => {
           if(res.Code==1){
             this.searchList = res.Data;
-            console.log(res,'数据');
           }
         }).catch(() => {
 

src/pages/financial/financalDocument/CapitalAllocation.vue

@@ -70,7 +70,7 @@
         </el-col>
         <el-col :span="4">
           <el-form-item :label="$t('system.table_company')">
-            <el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
+            <el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartment(msg.RB_Branch_Id),msg.RB_Depart_Id = -2">
               <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for='item in CompanyList'
                          :label='item.SName'
@@ -82,12 +82,12 @@
         </el-col>
         <el-col :span="4">
           <el-form-item :label="$t('admin.admin_Department')">
-            <el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
+            <el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" @change="getEmployee(msg.RB_Depart_Id), msg.UpdateBy='-1'">
               <el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for='item in DepartmentList'
-                         :label='item.DepartmentName'
-                         :value='item.DepartmentID'
-                         :key='item.DepartmentID'>
+                         :label='item.DeptName'
+                         :value='item.DeptId'
+                         :key='item.DeptId'>
               </el-option>
             </el-select>
           </el-form-item>
@@ -97,9 +97,9 @@
             <el-select  filterable  v-model='msg.UpdateBy'>
               <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
               <el-option v-for='item in EmployeeList'
-                         :label='item.EmName'
-                         :value='item.EmployeeId'
-                         :key='item.EmployeeId'>
+                         :label='item.EmployeeName'
+                         :value='item.Id'
+                         :key='item.Id'>
               </el-option>
             </el-select>
           </el-form-item>
@@ -221,6 +221,13 @@
   import {
     getSchoolPage
   } from '../../../api/school/index'
+  import {
+    queryEmployee
+  } from '../../../api/users/user'
+  import {
+    getDeptPage,
+  } from '../../../api/system/dept'
+
   export default {
     data(){
       return {
@@ -242,20 +249,6 @@
           RB_Group_Id:'0',
           Status:'0',
         },
-        getDepartmentMsg:{// 部门
-          RB_Group_Id:'',
-          RB_Branch_Id:'',
-          Status:0,
-          ParentId:-1,
-          Tier:0,
-        },
-        employeeMsg:{ // 员工
-          GroupId:'',
-          BranchId:-1,
-          DepartmentId:0,
-          PostId:0,
-          IsLeave:0,
-        },
         dataList: [],
         CompanyList: [],
         DepartmentList: [],
@@ -282,12 +275,9 @@
     created(){
       this.getList()
       let userInfo = this.getLocalStorage();    // 读取缓存数据
-      this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.Group_Id;    // 集团ID
+      this.getCompanyMsg.RB_Group_Id = userInfo.Group_Id;    // 集团ID
       this.EmId=userInfo.Id;
       let ActionMenuCode=userInfo.ActionMenuCode;
-      // if(ActionMenuCode.indexOf('F_CreateBranchMoneyAllot')!=-1){
-      //   this.btnShow=true;
-      // }
     },
     methods:{
       getList: function () {  // 获取列表数据
@@ -333,12 +323,30 @@
 
         })
       },
-      getDepartment: function () {  //获取部门列表
-        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 => {
+          console.log(res,'数据');
+          this.DepartmentList=res.Data.PageData;
+        }).catch(() => {
+        })
+
+        // this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
+        //   if(res.data.resultCode == 1) {
+        //     this.DepartmentList = res.data.data;
+        //   }
+        // }, err => {})
       },
       timeAdd: function (t) {  // 日期格式
         if (t===1) {
@@ -366,12 +374,24 @@
           }
         }, err => {})
       },
-      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
+        }
+        queryEmployee(qMsg).then(res => {
+          if(res.Code==1){
+            console.log(res,'数据1111');
+             this.EmployeeList = res.Data;
           }
-        }, err => {})
+        }).catch(() => {
+
+        })
+
+        // this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
+        //   if(res.data.resultCode == 1) {
+        //     this.EmployeeList = res.data.data;
+        //   }
+        // }, err => {})
       },
       goAddurl(url){
         // this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}})
@@ -411,9 +431,9 @@
     },
     mounted(){
       this.getCompanyList()
-      this.getDepartment()
+      this.getDepartment(0)
       this.GetStatusList()
-      this.getEmployee()
+      this.getEmployee(0)
     }
   }
 </script>

src/pages/financial/financalDocument/FinancialDocuments.vue

@@ -2285,7 +2285,6 @@
         this.currentPage = 1;
       },
       goUrl(path, id, Conditon, pageIndex) {
-        console.log( path, 'path');
         // return;
         this.$router.push({
           path:'/financial/financalDocument/' + path,

src/pages/financial/financalDocument/invoicesManager.vue

@@ -103,11 +103,6 @@
     <div class="query-box">
       <el-form class="iis_info_box clearfix" label-width="110px">
         <el-row>
-          <el-col :span="4" :gutter="35">
-            <el-form-item label="团号">
-              <el-input placeholder v-model="msg.TCNUM"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="4" :gutter="35">
             <el-form-item label="订单号">
               <el-input placeholder v-model="msg.OrderId"></el-input>
@@ -134,7 +129,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4" :gutter="35">
+          <el-col :span="4" :gutter="35" style="display:none;">
             <el-form-item label="发票类型">
               <el-select v-model="msg.InvoiceApplyType" filterable >
                 <el-option :value="1" label="跟团游"></el-option>
@@ -274,7 +269,7 @@
           eDate: '',
           pageIndex: 1,
           pageSize: 10,
-          InvoiceApplyType: 1,
+          InvoiceApplyType: 3,
           RB_Branch_Id:-1
         },
         productionDate: [],