0801xxq

src/components/Finance/Overspendedit.vue

@@ -76,7 +76,7 @@
                             <el-option v-for="(item,index) in priceDetailTypes" :key="index" :label="item.name" :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item prop="coefficient" label="费用系数">
+                    <el-form-item v-show="userId==22" prop="coefficient" label="费用系数">
                         <el-input-number style="width:100%" :precision="2" placeholder="费用系数" v-model="form.coefficient" :controls='false'>
                         </el-input-number>
                     </el-form-item>

src/components/OP/CarTouristGuideGrounContent.vue

@@ -5,7 +5,7 @@
                 <div>OP费用填写明细</div>
             </div>
         </div>
-        <el-popover class="oprompts" placement="right" trigger="hover">
+        <el-popover width="1600" class="oprompts" placement="right" trigger="hover">
             <el-table height="700" :data="budgeting" border>
                 <el-table-column width="100" property="date" label="日期"></el-table-column>
                 <el-table-column width="70" label="车费用">
@@ -123,6 +123,11 @@
                         </span>
                     </template>
                 </el-table-column>
+                <el-table-column width="70" label="门票描述">
+                    <template slot-scope="scope">
+                        {{scope.row.ticketRemark}}
+                    </template>
+                </el-table-column>
                 <el-table-column width="70" label="零用金">
                     <template slot-scope="scope">
                         <span style="white-space: pre-wrap;text-align: center;">
@@ -204,7 +209,7 @@
             </div>
             <div style="display: flex;justify-content: space-between;margin: 10px 0;" class="checkbox-style">
                 <el-checkbox-group v-model="checkList" @change="checkBoxChange">
-                    <el-checkbox v-for="(item, index) in checkItems" :key="index" :label=item></el-checkbox>
+                    <el-checkbox :class="item.includes('超')?'myRedCheckBox':''" :style="item.includes('超')?'color:red;':''" v-for="(item, index) in checkItems" :key="index" :label=item></el-checkbox>
                 </el-checkbox-group>
             </div>
             <div style="margin:10px 0;color:#706266;font-size:15px;">
@@ -823,4 +828,29 @@ export default {
     background-color: #007dff;
     border-color: #007dff;
 }
+/* 设置带边框的checkbox，选中后边框的颜色 */
+.myRedCheckBox.is-bordered.is-checked {
+    border-color: #FF0000;
+  }
+  
+  /* 设置选中后的文字颜色 */
+  .myRedCheckBox .el-checkbox__input.is-checked+.el-checkbox__label {
+    color: #FF0000;
+  }
+  
+  /* 设置选中后对勾框的边框和背景颜色 */
+  .myRedCheckBox .el-checkbox__input.is-checked .el-checkbox__inner, .myRedCheckBox .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+    border-color: #FF0000;
+    background-color:#FF0000;
+  }
+  
+  /* 设置checkbox获得焦点后，对勾框的边框颜色 */
+  .myRedCheckBox .el-checkbox__input.is-focus .el-checkbox__inner{
+    border-color: #FF0000;
+  }
+  
+  /* 设置鼠标经过对勾框，对勾框边框的颜色 */
+  .myRedCheckBox .el-checkbox__inner:hover{
+    border-color: #FF0000;
+  }
 </style>

src/components/statistics/Statistically.vue

@@ -10,12 +10,24 @@
                     placeholder="选择年">
                 </el-date-picker>
             </div>
-            <div class="canvas-box">
-                <div id="statisticallyone" style="width: 100%;height:400px;"></div>
-                <div id="grossmargins" style="width: 100%;height:400px;"></div>
-                <div id="grossmargin" style="width: 100%;height:400px;"></div>
-                <!-- <div id="grossmarginss" style="width: 50%;height:400px;"></div> -->
-            </div>
+            <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+                <el-tab-pane label="营业额、成本支出、毛利润" name="first">
+                    <div class="canvas-box">
+                        <div id="statisticallyone" style="width: 100%;height:400px;"></div>
+                        <div id="grossmargins" style="width: 100%;height:400px;"></div>
+                        <div id="grossmargin" style="width: 100%;height:400px;"></div>
+                    </div>
+                </el-tab-pane>
+                <el-tab-pane label="国交数据统计" name="second">
+                    <div class="canvas-box">
+                        <div id="grossmarginss" style="width: 50%;height:400px;"></div>
+                    </div>
+                </el-tab-pane>
+                <el-tab-pane label="会务数据统计" name="third">会务数据统计</el-tab-pane>
+                <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>
+            </el-tabs>
+            
+            
         </div>
     </div>
 </template>
@@ -28,6 +40,7 @@ export default {
             businessincome:[],
             Grossprofit:[],
             costing:[],
+            Airticketnum:[],
             aaa:[
                 ['product', '去年销售额', '今年销售额'],
                 ['1月', 43.3, 85.8],
@@ -58,9 +71,14 @@ export default {
                 ['11月', 72.4,],
                 ['12月', 72.4,],
             ],
+            activeName: 'second',
         }
     }, 
     methods: {
+        handleClick(tab, event) {
+            console.log(this.activeName);
+            // console.log(tab, event);
+        },
         //处理时间
         getdate(val){
             var date=new Date(val);
@@ -108,10 +126,11 @@ export default {
                 },
                 legend: {},
                 tooltip: {
-                    // formatter:function(params){
-                    //     var html = params.data[0]+'毛利率'+"<br/>"+ params.data[1]+"%";
-                    //     return html 
-                    // }
+                    formatter:function(params){
+                        console.log(params);
+                        // var html = params.data[0]+'毛利率'+"<br/>"+ params.data[1]+"%";
+                        // return html 
+                    }
 
                 },
                 dataset: {
@@ -134,7 +153,7 @@ export default {
             this.costing=[];
             this.StatisticsYOY()
         },
-        //获取数据
+        //获取营业额、成本支出、毛利润数据
         StatisticsYOY(){
             var url = "/api/Statistics/StatisticsYOY"
             var that = this
@@ -173,9 +192,40 @@ export default {
                 }
             })
         },
+        //获取国交数据统计数据
+        StatisticsAirTicket(){
+            var url = "/api/Statistics/StatisticsAirTicket"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '
+                },
+                data:{
+                    year:that.getdate(that.year),
+                }
+            }).then(function (res) {
+                if(res.data.code==200){
+                    var datainfo=res.data.data;
+                    //机票数
+                    that.Airticketnum.push(['product','本年机票数量']);
+                    for(let i=0;i<datainfo.airTicketNumData.length;i++){
+                        that.Airticketnum.push([datainfo.airTicketNumData[i].month+'月',datainfo.airTicketNumData[i].quantity]);
+                    }
+                    console.log(that.Airticketnum);
+                }else{
+                    that.$message({
+                        message: res.data.msg,
+                        type: 'warning'
+                    });
+                }
+            })
+        },
     },
     mounted(){
         this.StatisticsYOY();
+        this.StatisticsAirTicket();
     }
 }
 </script>