Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Cost.vue

@@ -1,6 +1,5 @@
 <template>
-    <div class="cost-all" v-loading="costloading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
-        element-loading-background="rgba(0, 0, 0, 0.8)">
+    <div class="cost-all" v-loading.fullscreen.lock="costloading" >
         <div class="cost-box">
             <div class="cost-haed">
                 <div class="ser-btn">
@@ -11,10 +10,10 @@
                                 <span v-else style="color:gray">{{ item.groupName }}</span>
                             </el-option>
                         </el-select>
-                        <div style="line-height: 40px;width: 90px;text-align: right;padding-right: 12px;">
+                        <div style="line-height: 28px;font-size: 14px;width: 90px;color: #555;text-align: right;padding-right: 12px;">
                             分段类型:
                         </div>
-                        <el-select size="small" v-model="costTypevalue" placeholder="请选择" @change="costTypeSelect">
+                        <el-select style="width:200px" size="small" v-model="costTypevalue" placeholder="请选择" @change="costTypeSelect">
                             <el-option v-for="item in costType" :key="item.value" :label="item.label"
                                 :value="item.value">
                             </el-option>
@@ -374,7 +373,7 @@
                     <el-table-column 
                     v-for="item in columnTotalData" :key="item.label"
                         :width="item.width != '100' ? columnWidth : item.width"
-                        :label="item.tips ? item.tips + '(' + getCurr + ')' : ''"
+                        :label="item.tips ? item.tips + getCurr : ''"
                         v-if="CheckBoxListSelect.filter(item => item.cbType == 'Top')[0].cbValues.includes(item.label)">
                         {{ item.totalPrice }}
                     </el-table-column>
@@ -387,9 +386,13 @@
                     <el-table-column 
                         v-for="item in columnTotalData" :key="item.label"
                         :width="item.width != '100' ? columnWidth : item.width"
-                        :label="item.singleTips ? item.singleTips + '(' + getCurr + ')' : ''"
+                        :label="item.singleTips ? item.singleTips + getCurr : ''"
                         v-if="CheckBoxListSelect.filter(item => item.cbType == 'Top')[0].cbValues.includes(item.label)">
                         {{ item.singlePrice }}
+                        <!-- <template slot="header">
+                            <div>{{item.singleTips ? item.singleTips:''}}</div>
+                            <div v-bind="getCurr">{{getCurr().toString}}</div>
+                        </template> -->
                     </el-table-column>
                     <el-table-column class="czbtn">
                     </el-table-column>
@@ -643,7 +646,7 @@
                             <div v-for="(      cabinitem, index      ) in       BcabinDatal      " :key="index">
                                 <div class="biaogeB"
                                     v-if="CheckBoxListSelect.filter(item => item.cbType == 'Right')[0].cbValues.includes(cabinitem.label)">
-                                    <div style="    color: rgb(96, 98, 102);font-size: 15px;font-weight: 600;">{{
+                                    <div style="color: rgb(96, 98, 102);font-size: 15px;font-weight: 600;">{{
         cabinitem.label }}
                                     </div>
                                     <el-table :data="cabinitem.sheetInfo" border style="width: 100%">
@@ -2337,10 +2340,10 @@ export default {
                 },
                 {
                     "label": "VF",
-                    "tips": "车费用",
+                    "tips": "车费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "车费用人均",
+                    "singleTips": "车费用人均\n",
                     "width": 60,
                 },
                 {
@@ -2361,10 +2364,10 @@ export default {
                 },
                 {
                     "label": "T/G S",
-                    "tips": "导游工资",
+                    "tips": "导游工资\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "导游工资人均",
+                    "singleTips": "导游工资人均\n",
                     "width": 60,
                 },
                 {
@@ -2385,114 +2388,114 @@ export default {
                 },
                 {
                     "label": "T/G OF",
-                    "tips": "导游超时费用",
+                    "tips": "导游超时费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "导游超时费用人均",
+                    "singleTips": "导游超时费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "T/G M",
-                    "tips": "导游餐补",
+                    "tips": "导游餐补\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "导游餐补人均",
+                    "singleTips": "导游餐补人均\n",
                     "width": 60,
                 },
                 {
                     "label": "T/G A",
-                    "tips": "导游房补",
+                    "tips": "导游房补\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "导游房补人均",
+                    "singleTips": "导游房补人均\n",
                     "width": 60,
                 },
                 {
                     "label": "T/G TF",
-                    "tips": "导游交通费",
+                    "tips": "导游交通费\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "导游交通费人均",
+                    "singleTips": "导游交通费人均\n",
                     "width": 60,
                 },
                 {
                     "label": "T/G EF",
-                    "tips": "导游景点费",
+                    "tips": "导游景点费\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "导游景点费人均",
+                    "singleTips": "导游景点费人均\n",
                     "width": 60,
                 },
                 {
                     "label": "C/F M",
-                    "tips": "司机餐补",
+                    "tips": "司机餐补\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "司机餐补人均",
+                    "singleTips": "司机餐补人均\n",
                     "width": 60,
                 },
                 {
                     "label": "C/F OF",
-                    "tips": "司机超时费用",
+                    "tips": "司机超时费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "司机超时费用人均",
+                    "singleTips": "司机超时费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "B",
-                    "tips": "早餐费用",
+                    "tips": "早餐费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "早餐费用人均",
+                    "singleTips": "早餐费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "L",
-                    "tips": "午餐费用",
+                    "tips": "午餐费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "午餐费用人均",
+                    "singleTips": "午餐费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "D",
-                    "tips": "晚餐费用",
+                    "tips": "晚餐费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "晚餐费用人均",
+                    "singleTips": "晚餐费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "TBR",
-                    "tips": "双人间费用",
+                    "tips": "双人间费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "双人间费用人均",
+                    "singleTips": "双人间费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "SGR",
-                    "tips": "单间费用",
+                    "tips": "单间费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "单间费用人均",
+                    "singleTips": "单间费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "JS/ES",
-                    "tips": "小套房/豪华套房费用",
+                    "tips": "小套房/豪华套房费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "小套房/豪华套房费用人均",
+                    "singleTips": "小套房/豪华套房费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "SUITE",
-                    "tips": "套房费用",
+                    "tips": "套房费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "套房费用人均",
+                    "singleTips": "套房费用人均\n",
                     "width": 60,
                 },
                 {
@@ -2505,90 +2508,90 @@ export default {
                 },
                 {
                     "label": "T/V",
-                    "tips": "公务活动费用",
+                    "tips": "公务活动费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "公务活动费用人均",
+                    "singleTips": "公务活动费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "1/L",
-                    "tips": "公务活动费用",
+                    "tips": "公务活动费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "公务活动费用人均",
+                    "singleTips": "公务活动费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "I/F",
-                    "tips": "公务翻译费用",
+                    "tips": "公务翻译费用\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "公务翻译费用人均",
+                    "singleTips": "公务翻译费用人均\n",
                     "width": 60,
                 },
                 {
                     "label": "EF",
-                    "tips": "景点门票",
+                    "tips": "景点门票\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "景点门票人均",
+                    "singleTips": "景点门票人均\n",
                     "width": 60,
                 },
                 {
                     "label": "B/R/F",
-                    "tips": "饮料零食水果",
+                    "tips": "饮料零食水果\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "饮料零食水果人均",
+                    "singleTips": "饮料零食水果人均\n",
                     "width": 60,
                 },
                 {
                     "label": "TE",
-                    "tips": "出行物资",
+                    "tips": "出行物资\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "出行物资人均",
+                    "singleTips": "出行物资人均\n",
                     "width": 60,
                 },
                 {
                     "label": "T/G T",
-                    "tips": "导游小费",
+                    "tips": "导游小费\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "导游小费人均",
+                    "singleTips": "导游小费人均\n",
                     "width": 60,
                 },
                 {
                     "label": "DRV T",
-                    "tips": "司机小费",
+                    "tips": "司机小费\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "司机小费人均",
+                    "singleTips": "司机小费人均\n",
                     "width": 60,
                 },
                 {
                     "label": "P/C",
-                    "tips": "零用金",
+                    "tips": "零用金\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "零用金人均",
+                    "singleTips": "零用金人均\n",
                     "width": 60,
                 },
                 {
                     "label": "T/L F",
-                    "tips": "领队费",
+                    "tips": "领队费\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "领队费人均",
+                    "singleTips": "领队费人均\n",
                     "width": 60,
                 },
                 {
                     "label": "E/C T",
-                    "tips": "会务费",
+                    "tips": "会务费\n",
                     "totalPrice": 0,
                     "singlePrice": 0,
-                    "singleTips": "会务费人均",
+                    "singleTips": "会务费人均\n",
                     "width": 60,
                 }
             ]
@@ -4198,7 +4201,7 @@ export default {
             })
         },
         topcheckboxChange(val, label) {
-            ////console.log(val, label, 'topcheckboxChangeval');
+            // console.log(val, label, 'topcheckboxChangeval');
             var that = this;
             if (!val) {
                 this.$confirm('此操作将清空整列数据, 是否继续?', '提示', {
@@ -4206,7 +4209,18 @@ export default {
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
-
+                    if(label=='SGR'){
+                        this.costTypeHotelNumbers.filter(item => item.type == 'Default')[0].sgr=0
+                    }
+                    if(label=='TBR'){
+                        this.costTypeHotelNumbers.filter(item => item.type == 'Default')[0].tbr=0
+                    }
+                    if(label=='JS/ES'){
+                        this.costTypeHotelNumbers.filter(item => item.type == 'Default')[0].jses=0
+                    }
+                    if(label=='SUITE'){
+                        this.costTypeHotelNumbers.filter(item => item.type == 'Default')[0].suite=0
+                    }
                     ////console.log('确定清空数据');
                     var fliterList = this.sumTopPrice.filter(x => x.label == label);
                     if (fliterList.length != 0) {
@@ -5219,6 +5233,12 @@ export default {
             }
         },
     },
+    updated(){
+        this.$emit('transfer',true)
+    },
+    destroyed(){
+        this.$emit('transfer',false) 
+    },
     mounted() {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
@@ -5233,6 +5253,7 @@ export default {
         }
 
         window.Vue = this;
+        
     },
     computed: {
         defaultCostTypeHotelNumber() {
@@ -5309,6 +5330,11 @@ export default {
     }
 }
 </script>
+<style lang="less" scoped>
+/deep/ .el-table th.el-table__cell > .cell {
+    white-space: pre-wrap; 
+}
+</style>
 <style>
 .cost-box {
     background-color: #fff;
@@ -5338,6 +5364,7 @@ export default {
 .ser-btn {
     display: flex;
     justify-content: space-between;
+    margin-bottom: 5px;
 }
 
 .cost-info {

src/components/Finance/FeesPage.vue

@@ -64,7 +64,7 @@
                 @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="40" v-if="formInline.Status == 0">
                 </el-table-column>
-                <el-table-column prop="priceNameContent" label="费用名称" width="200">
+                <el-table-column prop="priceNameContent" label="费用名称">
                     <template slot-scope="scope">
                         <el-button @click="open(scope.row.priceMsgContent,scope.row)" slot="reference" type="text">{{ scope.row.priceNameContent }}</el-button>
                         <!-- <span @click="open(scope.row.priceMsgContent)" slot="reference">{{ scope.row.priceNameContent }}</span> -->
@@ -78,17 +78,17 @@
                 </el-table-column>
                 <el-table-column v-if="activeName==79" prop="busName" label="Bus名称" show-overflow-tooltip>
                 </el-table-column>
-                <el-table-column prop="waitPay" label="应付款金额" show-overflow-tooltip>
+                <el-table-column prop="waitPay" label="应付款金额" show-overflow-tooltip width="150">
                 </el-table-column>
-                <el-table-column prop="currPay" label="此次付款金额" show-overflow-tooltip>
+                <el-table-column prop="currPay" label="此次付款金额" show-overflow-tooltip width="150">
                 </el-table-column>
-                <el-table-column prop="balance" label="剩余尾款" show-overflow-tooltip>
+                <el-table-column prop="balance" label="剩余尾款" show-overflow-tooltip width="150">
                 </el-table-column>
                 <el-table-column prop="operatorName" label="申请人" width="100">
                 </el-table-column>
                 <el-table-column prop="auditOperatorName" label="审核人" width="100" >
                 </el-table-column>
-                <el-table-column prop="overBudget" label="超预算比例" show-overflow-tooltip>
+                <el-table-column prop="overBudget" label="超预算比例" show-overflow-tooltip width="120">
                 </el-table-column>
                 <el-table-column label="审核操作">
                     <template slot-scope="scope">

src/components/home.vue

@@ -2,7 +2,6 @@
   <div class="all-box">
     <div class="home-dialog">
       <el-dialog
-      style=""
       top="0"
       title="系统通知"
       :visible.sync="dialogVisible"
@@ -47,7 +46,7 @@
               <div v-if="count>10&&msglist.length<count" class="loadmore">
                 <el-button @click="loadadd" size="mini">加载更多</el-button>
               </div>
-              <el-divider v-if="msglist.length>=count" style="">没有更多了！</el-divider>
+              <el-divider v-if="msglist.length>=count">没有更多了！</el-divider>
             </div>
           </div>
         </el-tabs>
@@ -109,9 +108,9 @@
         <el-header>
           <div class="btnradio">
             <el-radio-group v-model="isCollapse" @change="radioChange($event)">
-              <el-radio-button class="radiobox" :label="false"><span
+              <el-radio-button :class="classA" class="radiobox" :label="false"><span
                   class="iconfont icon-caidanzhankai icon"></span></el-radio-button>
-              <el-radio-button class="radiobox" :label="true"><span
+              <el-radio-button :class="classB" class="radiobox" :label="true"><span
                   class="iconfont icon-caidanshouqi icon"></span></el-radio-button>
             </el-radio-group>
             <div class="header-title">首页</div>
@@ -227,10 +226,10 @@
           </div>
         </el-header>
         <el-main>
-          <keep-alive>
-            <router-view v-if="$route.meta.keepAlive"/>
-          </keep-alive>
-          <router-view v-if="!$route.meta.keepAlive" /> 
+          <!-- <keep-alive>
+            <router-view/>
+          </keep-alive> -->
+          <router-view  @transfer="getUser"/> 
         </el-main>
       </el-container>
     </el-container>
@@ -282,13 +281,20 @@ export default {
       iconfont:'iconfont ',
       gaodu:'',
       gptdialog:false,
-      sex:0
+      sex:0,
+      classA:'',
+      classB:''
     };
   },
   // components: {
   //   child
   // },
   methods: {
+    //子传父
+    getUser(msg){
+      console.log(msg);
+      this.radioChange(msg);
+    },
     handleOpen(key, keyPath) {
       console.log(key, keyPath);
     },
@@ -329,14 +335,17 @@ export default {
     radioChange(val) {
       this.gaodu='height:'+ (window.innerHeight-(this.$refs.haeds.offsetHeight+this.$refs.avatarhaeds.offsetHeight))+'px'
       var radiobox = document.querySelectorAll(".radiobox");
+      console.log(radiobox)
       if (val == true) {
         this.panduan = false;
         document.querySelector(".user-text").style.display = "none";
         document.querySelector(".avatar-text").style.display = "none";
+        this.isCollapse=val
         radiobox[1].style.display = "none";
         radiobox[0].style.display = "inline-block";
       } else if (val == false) {
         this.panduan = true;
+        this.isCollapse=val
         radiobox[1].style.display = "inline-block";
         radiobox[0].style.display = "none";
       }