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

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_yp91bsm9op.css');
+@import url('//at.alicdn.com/t/font_2077629_48r8joof2tp.css');
 
 html,
 body,

src/pages/financial/Manfunds.vue

@@ -256,9 +256,9 @@
             <div style="font-size:12px;">{{item.UpdateDate}}</div>
           </td>
           <td>
-            <span style="cursor: pointer;color:blue;text-decoration:underline" @click="AddR(item)" v-if="item.Type==2">认领</span>
+            <span style="cursor: pointer;color:blue;text-decoration:underline;margin-right: 5px" @click="AddR(item)" v-if="item.Type==2">认领</span>
             <!-- <span> | </span> -->
-            <span style="cursor: pointer;color:red;text-decoration:underline" @click="Delete(item)" v-if="item.IsDelete==1">删除</span>
+            <span style="cursor: pointer;color:red;text-decoration:underline;" @click="Delete(item)" v-if="item.IsDelete==1">删除</span>
           </td>
         </tr>
       </table>
@@ -344,7 +344,14 @@
     created(){
       let userInfo = this.getLocalStorage();
       this.importFileUrl2=this.domainManager().UploadFileUrl +
-        "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=5&EmployeeId="+userInfo.EmployeeId;
+        "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=5&EmployeeId="+userInfo.Id
+        +'&GroupName='+ encodeURIComponent(userInfo.GroupName)
+        +'&BranchName='+encodeURIComponent(userInfo.SchoolName)
+        +'&CreateByName='+encodeURIComponent(userInfo.AccountName)
+        +'&BranchId='+userInfo.School_Id
+        +'&GroupId='+userInfo.Group_Id
+        +'&SystemType=Edu'
+      ;
       this.downList =this.domainManager().LocalTemplateFileDownLoadUrl +"/Upload/Template/未认款导入模板.xls";
       this.GetAccount();
       this.GetAccount2();

src/pages/financial/Maninfo.vue

@@ -434,7 +434,7 @@
     created() {
       let userInfo = this.getLocalStorage();
       this.importFileUrl2 = this.domainManager().UploadFileUrl +
-        "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=5&EmployeeId=" + userInfo.data.Id;
+        "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=5&EmployeeId=" + userInfo.Id;
     },
     filters: {
       PNumber(val) {

src/pages/financial/accDetail/CashReport.vue

 <style scoped>
   @import "../css/cssReset.css";
 
-  .page_fnDm{background-color: white}
-  .query-box{overflow: inherit}
-  .query-box{border: none}
-  .query-box ul {overflow: initial;}
-  .query-box li:last-child{float: left}
-  .query-box>ul>li:last-child{float: right;}
-  .query-box .hight_query ul .el-input{width: inherit  }
-  .page_CashReport .query-box li:last-child{
+  .page_fnDm {
+    background-color: white
+  }
+
+  .query-box {
+    overflow: inherit
+  }
+
+  .query-box {
+    border: none
+  }
+
+  .query-box ul {
+    overflow: initial;
+  }
+
+  .query-box li:last-child {
+    float: left
+  }
+
+  .query-box>ul>li:last-child {
+    float: right;
+  }
+
+  .query-box .hight_query ul .el-input {
+    width: inherit
+  }
+
+  .page_CashReport .query-box li:last-child {
     top: 35px;
   }
-  .page_CashReport ._fnDm_content{
+
+  .page_CashReport ._fnDm_content {
     width: 100%;
   }
-  .page_CashReport .singeRowTable tr th{
+
+  .page_CashReport .singeRowTable tr th {
     border: 1px solid #d2d2d2;
   }
+
 </style>
-<template >
+<template>
   <div class="page_fnDm page_CashReport" @keyup.enter="getList()">
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="110px">
         <el-row style="padding:15px 20px 0 0;">
-          <!-- <el-col :span="4">
-            <el-form-item label="交易方式：">
-              <el-select  filterable  v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''"  >
-                <el-option :value="-1" label="不限"></el-option>
-                <el-option v-for='item in BranchAccountList'
-                           :label='item.Name'
-                           :value='item.ID'
-                           :key='item.ID'>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-form-item label="银行账户：">
-              <el-select  filterable  v-model='msg.BankID'>
-                <el-option :value="-1" label="不限"></el-option>
-                <el-option v-for='item in accountList'
-                           :label='item.Name'
-                           :value='item.ID'
-                           :key='item.ID'>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="6">
             <el-form-item label="交易日期：">
-              <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange" value-format="yyyy-MM-dd">
+              <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
+                value-format="yyyy-MM-dd">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -67,7 +68,7 @@
     <div class="_fnDm_content" v-loading='loading'>
       <table class="singeRowTable" cellspacing="0" cellpadding="0" style="border: 1px solid rgb(230, 230, 230);">
         <tr>
-          <th colspan="14">四川和平国际旅行社有限公司资金日报表</th>
+          <th colspan="16">{{branchName}}资金日报表</th>
         </tr>
         <tr>
           <th>校区</th>
@@ -105,8 +106,10 @@
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoOutCome}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td>
-            <td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptWBMoney}}</td>
-            <td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td>
+            <td>{{subItem.ReceiptWBMoney}}</td>
+            <td>{{subItem.ReceiptMoney}}</td>
+            <!-- <td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptWBMoney}}</td>
+            <td @click="goUrlNew(subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td> -->
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoIncom}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td>
             <!-- <a style="cursor:pointer;" @click="goUrl('CashAccDetail',subItem.BankID,subItem.TradeWay)"> -->
@@ -166,43 +169,49 @@
 <script>
   // 自定义列组件
   export default {
-    data(){
-      return{
-        showID:false,
-        active:1,
-        userId:0,
-        msg:{
-          BankID:-1,
-          TradeWay:-1,
-          sTradeDate:new Date().Format('yyyy-MM-dd'),
-          eTradeDate:new Date().Format('yyyy-MM-dd'),
-          EmployeeId:0,
+    data() {
+      return {
+        showID: false,
+        active: 1,
+        userId: 0,
+        msg: {
+          BankID: -1,
+          TradeWay: -1,
+          sTradeDate: new Date().Format('yyyy-MM-dd'),
+          eTradeDate: new Date().Format('yyyy-MM-dd'),
+          EmployeeId: 0,
           //1-银行，2-现金
           IsBank: 2,
         },
-        accountList:[],
-        BranchAccountList:[],
-        transactionDate:[new Date().Format('yyyy-MM-dd'),new Date().Format('yyyy-MM-dd')],
-        AccList:[],
-        loading:false,
-        currentPage:1,
-        total:0,
-        dataList:[],
+        accountList: [],
+        BranchAccountList: [],
+        transactionDate: [new Date().Format('yyyy-MM-dd'), new Date().Format('yyyy-MM-dd')],
+        AccList: [],
+        loading: false,
+        currentPage: 1,
+        total: 0,
+        dataList: [],
         dataObj: {},
+        branchName: ''
+
       }
-    },created(){
+    },
+    created() {
 
-    },components: {
-    },mounted(){
-      let userInfo=this.getLocalStorage();
+    },
+    components: {},
+    mounted() {
+      let userInfo = this.getLocalStorage();
       this.getList();
-      this.msg.EmployeeId= userInfo.EmployeeId;
+      this.branchName = userInfo.GroupName
+
+      this.msg.EmployeeId = userInfo.EmployeeId;
     },
-    methods:{
-      goUrlNew(obj){
+    methods: {
+      goUrlNew(obj) {
         this.$router.push({
-          name: "DocumentStatistics",
-          query:{
+          path: "DocumentStatistics",
+          query: {
             "AccountId": obj.BankID,
             "StartTime": this.msg.sTradeDate,
             "EndTime": this.msg.eTradeDate,
@@ -213,42 +222,42 @@
       },
       goUrl(obj) {
         this.$router.push({
-          name: "CashAccDetail",
-          query:{
-            "Is_Cashier":1,
+          path: "CashAccDetail",
+          query: {
+            "Is_Cashier": 1,
             "TypeId": obj.TypeId,
             "BankID": obj.BankID,
             "sTradeDate": this.msg.sTradeDate,
             "eTradeDate": this.msg.eTradeDate,
-            "DayReport":1,
+            "DayReport": 1,
             "blank": 'y',
             "tab": '现金账户明细'
           }
         })
       },
       getList: function () {
-        this.loading=true;
-        this.dataObj={};
-        this.apipost('Financial_post_GetReportList',this.msg,res=>{
-          if(res.data.resultCode==1){
+        this.loading = true;
+        this.dataObj = {};
+        this.apipost('Financial_post_GetReportList', this.msg, res => {
+          if (res.data.resultCode == 1) {
             this.dataObj = res.data.data;
-          }else{
+          } else {
             this.$message.error(res.data.message);
           }
           this.loading = false;
-        },err=>{})
+        }, err => {})
       },
-      AccountType_post_GetList(){  //获取账户类型下拉
-        this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{
-          if(res.data.resultCode==1){
+      AccountType_post_GetList() { //获取账户类型下拉
+        this.apipost('AccountType_post_GetList', this.queryAccMsg, res => {
+          if (res.data.resultCode == 1) {
             this.AccList = res.data.data;
-          }else{
+          } else {
             this.$message.error(res.data.message);
           }
-        },err=>{})
+        }, err => {})
       },
-      timeAdd(t){  // 日期格式
-        if(!this.transactionDate){
+      timeAdd(t) { // 日期格式
+        if (!this.transactionDate) {
           this.msg.sTradeDate = '';
           this.msg.eTradeDate = '';
           return
@@ -256,15 +265,15 @@
         this.msg.sTradeDate = this.transactionDate[0];
         this.msg.eTradeDate = this.transactionDate[1];
       },
-      queryInfoInit(){  // 初始化msg
+      queryInfoInit() { // 初始化msg
 
       },
-      resetPageIndex(){  // 重置页码
-        this.msg.pageIndex=1;
+      resetPageIndex() { // 重置页码
+        this.msg.pageIndex = 1;
         this.currentPage = 1;
       },
-      method5: function() {
-        this.GetLocalFile("Financial_post_CashOutToGetReportList", this.msg,"现金日报表.xls");
+      method5: function () {
+        this.GetLocalFile("Financial_post_CashOutToGetReportList", this.msg, "现金日报表.xls");
       },
       // goUrl(path,id,type,typeid){
       // this.$router.push({
@@ -274,4 +283,5 @@
       // },
     }
   }
+
 </script>

src/pages/financial/accDetail/TransferReport.vue

@@ -90,8 +90,10 @@
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.AgoMoney}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.Income}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutCome}}</td>
-            <td @click="goUrlNew('Manfunds',subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td>
-            <td @click="goUrlNew('OutstandingAccounts',subItem)" style="cursor: pointer">{{subItem.NONPaymentMoney}}</td>
+            <td>{{subItem.ReceiptMoney}}</td>
+            <td>{{subItem.NONPaymentMoney}}</td>
+            <!-- <td @click="goUrlNew('Manfunds',subItem)" style="cursor: pointer">{{subItem.ReceiptMoney}}</td>
+            <td @click="goUrlNew('OutstandingAccounts',subItem)" style="cursor: pointer">{{subItem.NONPaymentMoney}}</td> -->
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.NowIncome}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.IncomeCount}}</td>
             <td @click="goUrl(subItem)" style="cursor: pointer">{{subItem.OutComeCount}}</td>
@@ -186,7 +188,7 @@
       goUrlNew(path,obj){
         let name = path;
         this.$router.push({
-          name: name,
+          path: name,
           query:{
             "BankType": obj.TradeWay,
             "BankID": obj.BankID,
@@ -210,7 +212,7 @@
           name = 'PoolAccDetail'
         }
         this.$router.push({
-          name: name,
+          path: name,
           query:{
             "Is_Cashier":1,
             "TypeId": obj.TypeId,

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/addFinancialProcess.vue

@@ -349,16 +349,16 @@
           <el-form-item v-show="addMsg.IsShow==2" label="可显示部门">
             <el-select filterable multiple v-model='addMsg.ShowDepartmentList' class="w200"
               style="max-height:100px;overflow:hidden" size="small">
-              <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>
           <el-form-item v-show="addMsg.IsShow==2" label="可显示人">
             <el-select filterable multiple v-model='addMsg.ShowEmployeeList' class="w200"
               style="max-height:100px;overflow:hidden" size="small">
-              <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>
@@ -531,7 +531,9 @@
   import {
     getPostPage,
   } from '../../api/system/post'
-
+  import {
+    getDeptPage,
+  } from '../../api/system/dept'
   import Treeselect from '@riophae/vue-treeselect'
   import '@riophae/vue-treeselect/dist/vue-treeselect.css'
   import {
@@ -592,27 +594,7 @@
           {
             id: 6,
             name: this.$t('fnc.kjchuangkou')
-          },
-          {
-            id: 7,
-            name: this.$t('fnc.xiankong')
-          },
-          {
-            id: 8,
-            name: this.$t('fnc.jzchuna')
-          },
-          {
-            id: 9,
-            name: this.$t('fnc.skchuna')
-          },
-          {
-            id: 10,
-            name: "分公司OP"
-          },
-          {
-            id: 11,
-            name: "总部线控"
-          },
+          }
         ],
         accListMsg: [],
         SpecialNodeSelectType: '',
@@ -791,21 +773,21 @@
       },
       //根据多公司获取部门
       getDepartment() {
-        let msg = {
-          RB_Group_Id: '0',
-          RB_Branch_Id: '-1',
-          Status: '0',
-        };
-        this.apipost(
-          "department_get_GetListByBranchIds",
-          msg,
-          res => {
-            if (res.data.resultCode == 1) {
-              this.DepartmentList = res.data.data;
+        let msg={
+          pageIndex: 1,
+          pageSize: 999,
+          rowsPerPage: 12,
+          DeptName: "", //部门名称
+          DeptId: 0, //部门编号
+          Status: "-1",
+          School_Id: 0,
+          DeptTier: 0,
+          ParentId: 0,
         }
-          },
-          err => {}
-        );
+        getDeptPage(msg).then(res => {
+          this.DepartmentList=res.Data.PageData;
+        }).catch(() => {
+        })
       },
       RadioShow(val) {
         if (val == 1) {
@@ -815,15 +797,23 @@
         }
       },
       getEmployeeList() {
-        this.apipost(
-          'admin_get_EmployeeGetList', {},
-          res => {
-            if (res.data.resultCode == 1) {
-              this.EmployeeList = res.data.data
+        queryEmployee({}).then(res => {
+          if(res.Code==1){
+             this.EmployeeList = res.Data;
           }
-          },
-          err => {}
-        )
+        }).catch(() => {
+
+        })
+
+        // this.apipost(
+        //   'admin_get_EmployeeGetList', {},
+        //   res => {
+        //     if (res.data.resultCode == 1) {
+        //       this.EmployeeList = res.data.data
+        //     }
+        //   },
+        //   err => {}
+        // )
       },
       AuditSort() {
         let sum = 0;
@@ -1470,7 +1460,6 @@
         }).catch(() => {
 
         })
-        // console.log(this.showMember,'this.showMember');
         var arr=[];
         this.showMember.forEach(x=>{
           arr.push(x.Id);

src/pages/financial/currencyManagement.vue

@@ -406,7 +406,7 @@
     methods: {
       GoUrlHis(path,item){
         this.$router.push({
-          name: path,
+          path: path,
           query: {
             blank: "y",
             CurrencyId: item.ID

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -92,6 +92,7 @@
   .page_bdm ._margin_b15{margin-bottom: 15px;}
   .page_bdm ._pay_box table tr td{text-align: center}
   .page_bdm .w890px{width: 890px;padding: 0;margin: 0;}
+  ._pb_son2::after{content: '';width: 4px;height: 100%;background-color: #2BBB7E;display: inline-block;position: absolute;clear: both;left: 20px;top: 35px;z-index: 1}
 
   .page_bdm .w600px{
     width: 600px;
@@ -570,7 +571,7 @@
       </el-popover> -->
       <div class="_process_box">
         <template v-for="(item,index) in GetDetail.AuditSteps">
-          <div class="_pb_son clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay==2">
+          <div class="_pb_son _pb_son2 clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay==2">
             <div class="_left_radius _left_radius_sus" v-if="item.NextStep==1">待审</div>
             <p class="_name">
               <span class="_n">{{item.AuditDescription}}</span><span class="_sm _huoqian">({{item.AuditWayName}})</span>
@@ -912,7 +913,7 @@
               </ul>
             </div>
           </div>
-          <div class="_pb_son clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay!=2 && MsgUrl" >
+          <div class="_pb_son _pb_son2 clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay!=2 && MsgUrl" >
             <div class="_left_radius _left_radius_sus" v-if="item.Status==1">待审</div>
             <p class="_name"> <span class="_n">{{item.AuditDescription}}</span><span class="_sm _huoqian" v-if="item.AuditWay==3">（{{item.AuditWayName}}）</span></p>
             <div class="_right_content _padd_left_10">
@@ -1212,7 +1213,7 @@
         </div>
       </div>
     </div>
-    <div class="_pb_son clearfix" v-if="item.Sort==0 || (item.Status==2 && item.Sort!=0) || (item.Status==4)" >
+    <div class="_pb_son _pb_son2 clearfix" v-if="item.Sort==0 || (item.Status==2 && item.Sort!=0) || (item.Status==4)" >
       <div class="_left_radius" v-if="item.Sort==0">发起</div>
       <div class="_left_radius" v-if="item.Sort!=0 && item.Status==2">通过</div>
       <div class="_left_radius _left_radius_err" v-if="item.Status==4">驳回</div>

src/pages/financial/financalDocument/CapitalAllocation.vue

@@ -51,8 +51,76 @@
 </style>
 <template>
   <div class="page_CapitalAllocation">
-    <div class="query-box">
+    <div class="query-box" style="margin-bottom:20px;">
       <ul>
+        <li>
+          <em>{{$t('fnc.djbianhao')}}</em>&nbsp;
+          <el-input v-model="msg.FrID"></el-input>
+        </li>
+        <li>
+          <em>{{$t('system.table_company')}}</em>&nbsp;
+          <el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" class="w220" @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'
+                        :value='item.SId'
+                        :key='item.SId'>
+            </el-option>
+          </el-select>
+        </li>
+        <li>
+          <em>{{$t('admin.admin_Department')}}</em>&nbsp;
+          <el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" class="w220" @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.DeptName'
+                         :value='item.DeptId'
+                         :key='item.DeptId'>
+              </el-option>
+          </el-select>
+        </li>
+        <li>
+          <em>{{$t('fnc.zhidanren')}}</em>&nbsp;
+          <el-select  filterable  v-model='msg.UpdateBy' class="w220">
+              <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+              <el-option v-for='item in EmployeeList'
+                         :label='item.EmployeeName'
+                         :value='item.Id'
+                         :key='item.Id'>
+              </el-option>
+            </el-select>
+        </li>
+        <li>
+          <em>{{$t('fnc.zdriqi')}}</em>&nbsp;
+          <el-date-picker
+              @change="timeAdd(1)"
+              v-model="productionDate"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至">
+            </el-date-picker>
+        </li>
+        <li>
+          <em>{{$t('fnc.jiaoyiriqi')}}</em>&nbsp;
+          <el-date-picker
+              @change="timeAdd(2)"
+              v-model="productionDate2"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              :range-separator="$t('restaurant.res_To')">
+            </el-date-picker>
+        </li>
+         <li>
+          <em>{{$t('admin.admin_status')}}</em>&nbsp;
+          <el-select  v-model="msg.Status" filterable class="w220">
+              <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+              <el-option v-for='item in StatusList'
+                         :label='item.Name'
+                         :value='item.ID'
+                         :key='item.ID'>
+              </el-option>
+            </el-select>
+        </li>
         <li>
           <input v-if="btnShow" type="button" class="normalBtn" :value="$t('op.fgszjdb')" @click="goAddurl('addCapitalAllocation')"/>
           <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
@@ -61,7 +129,7 @@
         </li>
       </ul>
     </div>
-    <el-form label-width="100px" class="form">
+    <!-- <el-form label-width="100px" class="form">
       <el-row :gutter="20">
         <el-col :span="4">
           <el-form-item :label="$t('fnc.djbianhao')">
@@ -70,7 +138,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 +150,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 +165,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>
@@ -141,7 +209,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-    </el-form>
+    </el-form> -->
     <div class="page_CapitalAllocation_list">
       <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
         <tr>
@@ -221,6 +289,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 +317,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 +343,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 +391,30 @@
 
         })
       },
-      getDepartment: function () {  //获取部门列表
-        this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
-          if(res.data.resultCode == 1) {
-            this.DepartmentList = res.data.data;
+      getDepartment: function (id) {  //获取部门列表
+        let msg={
+          pageIndex: 1,
+          pageSize: 999,
+          rowsPerPage: 12,
+          DeptName: "", //部门名称
+          DeptId: 0, //部门编号
+          Status: "-1",
+          School_Id: 0,
+          DeptTier: 0,
+          ParentId: 0,
         }
-        }, err => {})
+        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 +442,18 @@
           }
         }, 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
         }
-        }, err => {})
+        qMsg.Dept_Id=id;
+        queryEmployee(qMsg).then(res => {
+          if(res.Code==1){
+             this.EmployeeList = res.Data;
+          }
+        }).catch(() => {
+
+        })
       },
       goAddurl(url){
         // this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}})
@@ -411,9 +493,9 @@
     },
     mounted(){
       this.getCompanyList()
-      this.getDepartment()
+      this.getDepartment(0)
       this.GetStatusList()
-      this.getEmployee()
+      this.getEmployee(0)
     }
   }
 </script>

src/pages/financial/financalDocument/CapitalAllocationDetail.vue

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

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -386,7 +386,7 @@
                 </span>
         <span v-show="huijiShow" class="_Printing" @click="goPrintPageNew(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">凭证打印</span>
 <!--        <span v-show="GetDetail.AccountantMergeDetailList && GetDetail.AccountantMergeDetailList.length>0" class="_Printing" @click="goPrintPage2(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">会计合并打印</span>-->
-        <span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
+        <span class="_Printing" style="margin-left:10px;" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
 
       </div>
       <div class="_conten">
@@ -953,7 +953,7 @@
         danjuType: '',
         showModel: false,
         CostTypeState:false,
-        huijiShow:false,
+        huijiShow:true,
       }
     },
     components:{

src/pages/financial/financalDocument/WorkEntrustmentMy.vue

@@ -103,13 +103,13 @@
                     </el-col>
                     <el-col :span="12" :offset="1">
                         <el-form-item label="受委托人：">
-                            <el-select  v-model='addMsg.reciveEmpId' filterable remote reserve-keyword placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
+                            <el-select  v-model='addMsg.reciveEmpId' filterable remote reserve-keyword placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading" @change="choicereciveN(addMsg.reciveEmpId)">
                                 <el-option v-for='item in searchList'
-                                    :label='item.name'
-                                    :value='item.empId'
-                                    :key='item.empId'>
-                                    <span style="float: left">{{ item.name }}</span>
-                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.departmentName }}</span>
+                                    :label='item.EmployeeName'
+                                    :value='item.Id'
+                                    :key='item.Id'>
+                                    <span style="float: left">{{ item.EmployeeName }}</span>
+                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.DeptName }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -135,6 +135,9 @@
     </div>
 </template>
 <script>
+  import {
+    queryEmployee
+  } from '../../../api/users/user'
 export default {
     data(){
         return{
@@ -260,18 +263,34 @@ export default {
         remoteMethod(query) {  // 远程搜索
             if (query !== '') {
                 this.loading = true;
-                this.apipost("admin_Get_Chat_All_SelectEmpName",{ EmName: query },res => {
-                    if (res.data.resultCode == 1) {
-                        if (res.data.data.length > 1) {
+                var qMsg = {
+                  EmployeeName: 0
+                }
+                qMsg.EmployeeName=query;
+                queryEmployee(qMsg).then(res => {
+                  if(res.Code==1){
+                    if (res.Data.length > 1) {
                       this.searchList = [];
                     }
-                        this.searchList = res.data.data;
+                    this.searchList = res.Data;
                     this.searchList.forEach((x, index) => {
                       this.$set(this.searchList, index, x);
                     });
                     this.loading = false;
                   }
-                },err => {})
+                }).catch(() => {
+
+                })
+
+            }
+        },
+        choicereciveN(Id){
+          if(this.searchList.length>0){
+            this.searchList.forEach(x=>{
+              if(x.Id==Id){
+                this.addMsg.ReciveEmpIdName = x.EmployeeName
+              }
+            })
           }
         }
     },

src/pages/financial/financalDocument/addCapitalAllocation.vue

@@ -79,6 +79,7 @@
   }
   .page_addCapitalAllocation ._conten ul li._inList ._add_btn span,.page_addCapitalAllocation ._conten ul li._outList ._add_btn span{
     cursor: pointer;
+    margin-right: 5px;
   }
   .page_addCapitalAllocation ._conten ul li._inList textarea,.page_addCapitalAllocation ._conten ul li._outList textarea{
     border: none;
@@ -382,7 +383,8 @@
           Description: '',
           IsHave: 1,
           emList: [],
-          BankList: []
+          BankList: [],
+          RB_DepartName:'',
         },
         queryAccMsg: {
           pageIndex: 1,
@@ -449,8 +451,11 @@
             this.msg.TemplateId = data.TemplateId
             this.msg.Status = data.Status
             this.msg.IsPublic = 0
-            this.msg.RB_Depart_Id = this.getLocalStorage().RB_Department_Id
+            this.msg.RB_Depart_Id = this.getLocalStorage().DeptId
+            this.msg.RB_DepartName = data.DepartName;
+
             this.msg.RB_Branch_Id = data.RB_Branch_Id
+
             this.msg.Description = ''
             this.msg.IsHave = 1
             this.msg.emList = []

src/pages/financial/financalDocument/addReceivablesDocuments.vue

@@ -572,7 +572,7 @@
             </p>
           </template>
           <p>
-            集团名称：<span class="_r_name _jump_page">{{emplyeeName}}</span>
+            业务员：<span class="_r_name _jump_page">{{emplyeeName}}</span>
           </p>
         </div>
         <div class="_explain">
@@ -989,7 +989,6 @@
         let path = "/Upload/Temporary/"
         this.$message.info(this.$t('tips.shangchuanzhong'))
         UploadSelfFile('Temporary', file.file, x => {
-          console.log(x)
           let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
           this.saveMsg.push({
             Content: x.FileUrl,
@@ -1816,8 +1815,8 @@
     },
     mounted() {
       let userInfo = this.getLocalStorage();
-      this.department = userInfo.DepartName;
-      this.emplyeeName = userInfo.GroupName;
+      this.department = userInfo.DeptName;
+      this.emplyeeName = userInfo.AccountName;
       this.EmployeeId = userInfo.Id;
       this.DepartIDs = this.msg.RB_Depart_Id = userInfo.DeptId;
       this.RB_Branch_Id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.School_Id;
@@ -1834,8 +1833,6 @@
       this.msg.Cmd = this.$route.query.Cmd ? this.$route.query.Cmd : '';
       this.getCompany();
       if (this.$route.query.edit) {
-        console.log(this.$route.query.edit,'this.$route.query.edit')
-
         this.edit = this.$route.query.edit;
         this.msg.FrID = this.$route.query.FrID;
         this.Financial_post_Get(parseInt(this.$route.query.FrID), 0);

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: [],

src/pages/financial/paySetting.vue

@@ -644,7 +644,7 @@
               if (x.Type == 1) {
                 data.seleRelationList.push('-1')
               } else {
-                data.seleRelationList.push(x.Branch_Id.toString())
+                data.seleRelationList.push(x.Branch_Id);
               }
             });
             this.addMsg = data;