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_xjjeh93ylwf.css');
+@import url('//at.alicdn.com/t/font_2077629_vhc2pmigytp.css');
 
 html,
 body,

src/components/system/menu-form.vue

@@ -9,7 +9,7 @@
         <div class="row wrap">
           <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.MenuName" ref="MenuName"
             class="col-6 q-pr-lg q-pb-lg" label="菜单名称" :rules="[val => !!val || '请填写菜单名称']" />
-          <q-input filled stack-label maxlength="50" :dense="false" v-model="objOption.MenuUrl" ref="MenuUrl"
+          <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.MenuUrl" ref="MenuUrl"
             class="col-6 q-pr-lg q-pb-lg" label="菜单地址" />
           <q-select class="col-6 q-pb-lg" v-model="objOption.MenuType" :options="MenuTypeOpts" emit-value map-options
             label="菜单类型" @input="queryMenuList()" />

src/pages/financial/PlatformAccount.vue

@@ -31,7 +31,7 @@
       sort-always
       @sort-change="sortChange"
       @on-custom-comp='customCompFunc'
-      :row-click="rowClick" 
+      :row-click="rowClick"
     ></v-table>
     <div class="_vMG_edit _scrollbar" v-if="addShow" :class="addShow==true?'edHeight':''">
       <el-row>
@@ -948,7 +948,7 @@ export default {
         this.addCuren = true;
       }
       this.Charge = 3;
-      let userInfo = this.getLocalStorage(); 
+      let userInfo = this.getLocalStorage();
       var branchId = userInfo.RB_Branch_id;
       this.addMsg.BranchIdS = branchId;
     },
@@ -1098,7 +1098,7 @@ export default {
         RiskLowerLimitMoney: ""
       };
       this.addMsg = newMsg;
-      let userInfo = this.getLocalStorage(); 
+      let userInfo = this.getLocalStorage();
       var branchId = userInfo.RB_Branch_id;
       this.addMsg.BranchIdS = branchId;
     },
@@ -1201,7 +1201,7 @@ export default {
     //   this.getCompanyList(2,userInfo);
     //   this.msg.RB_Branch_Id = branchId;
     // }
-    
+
     this.getList();
     this.initColums();
     this.getAccountTypeList();

src/pages/financial/accDetail/CashReport.vue

@@ -55,13 +55,13 @@
           </el-col>
         </el-row>
       </el-form>
-      <ul class="clearfix">
-        <li class="hight_query">
+      <ul class="clearfix" style="position: absolute;right: 20px;top: 20px;">
+        <div>
                     <span>
                     </span>
           <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
           <button class="normalBtn" @click="method5()">导出</button>
-        </li>
+        </div>
       </ul>
     </div>
     <div class="_fnDm_content" v-loading='loading'>

src/pages/financial/accDetail/TransferReport.vue

@@ -46,13 +46,13 @@
           </el-col>
         </el-row>
       </el-form>
-      <ul class="clearfix">
-        <li class="hight_query">
+      <ul class="clearfix" style="position: absolute;right: 20px;top: 20px;">
+        <div class="hight_query">
           <span>
           </span>
           <button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
           <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
-        </li>
+        </div>
       </ul>
     </div>
     <div class="_fnDm_content" v-loading='loading'>

src/pages/financial/addFinancialProcess.vue

@@ -1182,6 +1182,7 @@
             DepartmentName: data.PostName,
             Id: data.PostId
           })
+          console.log(this.showRole,'showRolessssss');
         } else {
           if (this.roleSetCheckedKeys.length == 1) {
             this.roleSetCheckedKeys.push(data.PostId)
@@ -1218,6 +1219,7 @@
           AuditList.AuditWay = 1;
           AuditList.AuditUserList = [{
             EmployeeId: '',
+            EmployeeIdName:'',
             Sort: ''
           }];
           AuditList.Sort = this.myAuditList.length + 1;

src/pages/financial/components/FlowChartModule.vue

+<style scoped>
+    ._bg_blue{background-color: #297BEF}
+    ._bg_org{background-color: #F16C3C !important}
+    ._bg_gre{background-color: #32B37C}
+    ._bg_greS{background-color:#1C9A65}
+    ._bg_gray{background-color: #666666}
+    ._array{display: inline-block;background-color: #999999}
+    ._array_h{width: 35px;height: 3px;}
+    ._array_h_left{top: 14px;left: -40px;position: absolute;}
+    ._array_h_right{top: 14px;right: -40px;position: absolute;}
+    ._array_w{width: 3px;height: 35px;}
+    .tri_left{width: 0;height:0;border-top:6px solid transparent;border-bottom:6px solid transparent;border-left: 6px solid #999999;}
+    .tri_down{width: 0;height:0;border-left:6px solid transparent;border-right: 6px solid transparent;border-top: 6px solid #999999; }
+    .tri_right{width: 0;height:0;border-top:6px solid transparent;border-bottom: 6px solid transparent;border-right: 6px solid #999999;}
+    ._tag{display: inline-block;border-radius: 4px;padding: 2px 4px;margin-bottom: 4px;font-size: 12px}
+    ._inlineblock_cen{display: inline-block;text-align: center}
+    ._text_right{text-align: right;padding-right: 50px}
+    ._tp_b{padding: 0 20px}
+    .height40{height: 40px;}
+    ._feiyong{padding: 10px;flex-wrap: wrap;/*justify-content: space-between;*/display: flex;}
+    ._feiyong>span{display: inline-block;padding: 4px 20px;color: white;font-size: 14px;border-radius: 4px;margin:0 10px 10px 0;}
+    ._log_t_s{font-size: 12px;color: #666666}
+    .el-popover{text-align: inherit}
+    ._dtel{padding-top: 10px;}
+    ._no_liucheng{padding: 20px;text-align: center}
+    ._liu_block{display: inline-block;width:auto;margin-bottom: 20px;position: relative;}
+    .icon-xiaotuziCduan_,.icon-xiaotuziCduan_2{position: absolute;right: -10px;top: -10px;color: #999999;}
+    ._array_h_left .icon-xiaotuziCduan_2{position: absolute;left: -10px;top: -10px;right: initial;}
+    .text_l{text-align: left;margin-right: 50px}
+    .text_r{text-align: right;margin-left: 50px}
+    ._miaoshu{display: inline-block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding:6px 15px;border-radius:4px;background-color: #297BEF;color:white;font-size: 14px;min-width: 120px; text-align: center;max-width: 130px;}
+    ._last_ml0{margin-right: 0}
+    ._last_mr0{margin-left: 0}
+    ._array_h_dbox{position:absolute;top: 14px;right: -5px;}
+    ._array_h_dbox_l{right: inherit;left: -40px}
+    ._array_h_down{width: 35px;height: 3px;position: absolute;background-color: #999999}
+    ._array_h_down_{width: 3px;height: 20px;position: absolute;background-color: #999999}
+    ._array_h_down_l{left: 35px}
+    .icon-xiaotuziCduan_1{position: absolute;left: 29px;top: 10px;color: #999999;}
+    .xiaotuziCduan_1_l{left: inherit;right: -9px;}
+    
+</style>
+<template>
+    <div class="clearfix" v-if="dataList">  
+        <template v-for="(lc,li) in dataList.AuditList">
+            <div class="_liu_block clearfix" :class="[Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'fl text_l ':'fr text_r ']">
+                <span class="_array _array_h" :class="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2!=0?'_array_h_left ':''" v-if="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2!=0&&li!=dataList.AuditList.length-1"><span class="iconfont icon-xiaotuziCduan_2"></span></span>                                                                                                                      
+                    <el-tooltip class="dataList" effect="dark" :content="lc.contentTips"  placement="top">
+                        <span :class="lc.AuditType==3?'_bg_org':'_bg_blue'" class="_miaoshu ">{{lc.AuditDescription}} <span v-if="lc.AuditWay!=1">({{lc.AuditWay=="2"?$t('fnc.huiqian'):$t('fnc.huoqian')}})</span></span>
+                    </el-tooltip>
+                <span v-if="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2==0&&li!=dataList.AuditList.length-1"  :class="(li+1)%3!=0&&Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'_array_h_right ':''" class="_array _array_h"><span class="iconfont icon-xiaotuziCduan_"></span></span>
+                <div class="_array_h_dbox" v-if="li!=dataList.AuditList.length-1" :class="Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'':'_array_h_dbox_l'">
+                    <span v-if="(li+1)%3==0" class="_array_h_down"></span>
+                    <span v-if="(li+1)%3==0" class="_array_h_down_" :class="Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'_array_h_down_l':''"></span>
+                    <span v-if="(li+1)%3==0" class="iconfont icon-xiaotuziCduan_1" :class="Math.floor((li+1)%3==0?li:(li+1)/3)%2==0?'':'xiaotuziCduan_1_l'"></span>
+                </div>
+            </div>
+        </template>
+    </div>
+</template>
+<script>
+
+export default {
+    props:["data"],
+    data(){
+        return{
+            dataList:{},
+        }
+    },methods:{
+               
+    },mounted(){
+        
+    },watch: {
+        data: {
+            handler: function(val, oldVal) {
+                this.dataList =  val
+            },
+            deep: true
+        }
+    },created(){        
+        this.dataList =  this.data;
+    }
+}
+</script>

src/pages/financial/components/TicketingModule.vue

+<style>
+.m_TicketingModule{
+    border: 1px solid #DDDDDD;
+    border-bottom: none;
+}
+.m_TicketingModule ._tit{
+    padding-left: 10px;
+    font-size: 14px;
+    color: #000;
+    padding: 8px 15px;
+    background-color: white;
+    display: flex;
+    justify-content: space-between;
+}
+.m_TicketingModule ._text{
+    border-left: 3px solid #e95252;
+    padding-left: 10px;
+}
+.m_TicketingModule ._tit ._btn{
+    font-size: 12px;
+    color: #333333;
+    cursor: pointer;
+}
+.m_TicketingModule ._tit ._btn:hover{
+    color: #E95252;
+}
+.m_TicketingModule ._tit ._btn .iconfont{
+    font-size: 12px;
+    display: inline-block;
+    margin-left: 10px;
+}
+.m_TicketingModule ._rotate{
+    transform:rotate(180deg);
+}
+.m_TicketingModule .singeRowTable{
+    color:#333333
+}
+.m_TicketingModule ._padding_20_15{
+    padding: 20px 15px;
+    background-color: white;
+}
+</style>
+<template>
+    <div class="m_TicketingModule">
+        <div class="_tit">
+            <span class="_text">国内票务订单信息</span>
+            <div>
+                <span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
+                <span class="_btn" v-else @click="tableShow=true">展开 <i class="iconfont icon-gengduo"></i> </span>
+            </div>
+        </div>
+        <div v-show="tableShow" class="_padding_20_15">
+            <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
+                <tr>
+                    <th width='200px'>期数/订单号</th>
+                    <th>人数</th>
+                    <th>总价</th>
+                    <th>成本</th>
+                    <th>利润</th>
+                    <th>客户名称</th>
+                    <th width='200px'>行程时间</th>
+                    <!-- <th>航段</th> -->
+                </tr>
+                <tr v-for="(item,index) in dataList" :key="index">
+                    <td>{{item.Term}}-{{item.OrderID}}</td>
+                    <td>{{item.Number}}人</td>
+                    <td>¥{{item.TotalPrice}}</td>
+                    <td>¥{{item.TotalCost}}</td>
+                    <td>￥{{item.Profit}}</td>
+                    <td>{{item.ClientName}}</td>
+                    <td>{{item.TravelTime}}</td>
+                    <!-- <td>{{dataList.Leg}}</td> -->
+                </tr>
+            </table>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props:["FrID","id"],
+    data(){
+        return{
+            tableShow:false,
+            dataList:[],
+        }
+    },watch:{
+        
+    },created(){
+         
+    },mounted(){
+        // let FrID = this.$route.query.FrID;
+        this.getDate(this.FrID);
+    },methods:{
+        getDate(FrID){
+            let msg = {
+                FrID:FrID,
+            }
+            this.apipost('Domestic_Ticket_post_GetByBillAndIDList',msg,r=>{
+                if(r.data.resultCode==1){
+                    let data = r.data.data;
+                    this.dataList = data;
+                }
+            },null)
+        }
+    }
+}
+</script>

src/router/routes.js

@@ -97,6 +97,11 @@ const routes = [{
         component: () =>
         import("pages/financial/PlatformAccount.vue")
       },
+      {
+        path: "/financial/CompanyAccount", //银行账户
+        component: () =>
+        import("pages/financial/CompanyAccount.vue")
+      },
       {
         path: "/financial/TeamRevenueReport", //营收报表
         component: () =>
@@ -202,6 +207,51 @@ const routes = [{
         component: () =>
           import("pages/financial/accDetail/CashReport.vue")
       },
+      {
+        path: "/financial/financalDocument/ChoiceAddFinancialDocuments",
+        component: () =>
+          import("pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue")
+      },
+      {
+        path: "/financial/financalDocument/addReceivablesDocuments",
+        component: () =>
+        import("pages/financial/financalDocument/addReceivablesDocuments.vue")
+      },
+      {
+        path: "/financial/financalDocument/invoicesManager", //发票管理
+        component: () =>
+          import("pages/financial/financalDocument/invoicesManager.vue")
+      },
+      {
+        path: "/financial/financalDocument/refundQuery", //发票管理
+        component: () =>
+          import("pages/financial/financalDocument/refundQuery.vue")
+      },
+      {
+        path: "/financial/financalDocument/CapitalAllocation", //资金调拨
+        component: () =>
+          import("pages/financial/financalDocument/CapitalAllocation.vue")
+      },
+      {
+        path: "/financial/financalDocument/addCapitalAllocation", //资金调拨 新增
+        component: () =>
+          import("pages/financial/financalDocument/addCapitalAllocation.vue")
+      },
+      {
+        path: "/financial/financalDocument/RecPayQuery", //收支查询
+        component: () =>
+        import("pages/financial/financalDocument/RecPayQuery.vue")
+      },
+      {
+        path: "/financial/financalDocument/FinancialDocuments", //我的财务单据
+        component: () =>
+        import("pages/financial/financalDocument/FinancialDocuments.vue")
+      },
+      {
+        path: "/financial/financalDocument/WorkEntrustmentMy", //工作委托
+        component: () =>
+        import("pages/financial/financalDocument/WorkEntrustmentMy.vue")
+      },
       {
         path: "/test", //API测试
         component: () =>

src/utils/erpindex.js

 import md5 from 'js-md5'
 import co from 'co'
+import MsgBus from '../utils/msgBus'
 
 export default{
   data:{
@@ -7,6 +8,7 @@ export default{
     apiurl: ''
   },
   install(Vue, options){
+    Vue.prototype.MsgBus = MsgBus;
     //消息成功提示
     Vue.prototype.Success = function (msg) {
       this.$message({
@@ -129,6 +131,42 @@ export default{
       };
       return obj;
     },
+    //下载文件
+    Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
+      var apiurl = this.domainManager().LocalFileStreamDownLoadUrl;
+      var timestamp = (new Date()).valueOf();
+      var token = "";
+      var key = "";
+      var tokenData={};
+      var localStorage = window.localStorage["loginUserInfo"];
+      if (localStorage !== undefined && localStorage != 'undefined') {
+        tokenData = JSON.parse(localStorage);
+      }
+      token = tokenData.data.ErpToken;
+      var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+      var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+      var postData = {
+        "msg": msg,
+        "cmd": cmd,
+        "timestamp": timestamp,
+        "token": token,
+        "sign": md5Str
+      }
+      this.$http.post(apiurl, postData, {
+        responseType: 'arraybuffer'
+      }).then((res) => {
+        let blob = new Blob([res.data], {
+          type: "application/vnd.ms-excel"
+        })
+        let url = URL.createObjectURL(blob);
+        let link = document.createElement('a');
+        link.href = url;
+        link.setAttribute("download", fileName);
+        document.body.appendChild(link);
+        link.click();
+        successCall(res);
+      }).catch(function (res) {});
+    },
     //HTTP提交数据
     Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline) {
       if (msg == null || msg == "") {

src/utils/msgBus.js

+import Vue from 'vue'
+export default new Vue;
\ No newline at end of file