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 >
-  <div class="page_fnDm page_CashReport"  @keyup.enter="getList()">
+<template>
+  <div class="page_fnDm page_CashReport" @keyup.enter="getList()">
     <div class="query-box">
-      <el-form class="_info_box clearfix"  label-width="110px">
+      <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>
@@ -57,8 +58,8 @@
       </el-form>
       <ul class="clearfix" style="position: absolute;right: 20px;top: 20px;">
         <div>
-                    <span>
-                    </span>
+          <span>
+          </span>
           <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
           <button class="normalBtn" @click="method5()">导出</button>
         </div>
@@ -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/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>