11211021

src/components/ConferenceModule/Supplierinfo.vue

@@ -59,17 +59,17 @@
         </el-dialog>
         <div class="supplierinfo-screen">
             <div class="supplierinfo-screen-ul">
-                <!-- <div class="supplierinfo-screen-li">
+                <div class="supplierinfo-screen-li">
                     <div class="supplierinfoscreen-li-title">供应商类型:&nbsp;</div>
-                    <el-select size="small" v-model="value" filterable placeholder="请选择">
+                    <el-select @change="valuechange" multiple collapse-tags size="small" v-model="value" filterable placeholder="请选择">
                         <el-option
-                          v-for="item in options"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value">
+                          v-for="item in mediaSupplierInitarr"
+                          :key="item.id"
+                          :label="item.text"
+                          :value="item.id">
                         </el-option>
                       </el-select>
-                </div> -->
+                </div>
                 <div class="supplierinfo-screen-li">
                     <div class="supplierinfoscreen-li-title">供应商名称:&nbsp;</div>
                     <el-input clearable size="small" v-model="search" placeholder="请输入内容"></el-input>
@@ -141,6 +141,7 @@ export default {
             label: '北京烤鸭'
             }],
             value: '',
+            values: '',
             tableData: [],
             currentPage: 1,
             pagesize:12,
@@ -244,6 +245,7 @@ export default {
                     pageIndex: that.currentPage,
                     pageSize:that.pagesize,
                     search:that.search,
+                    typeLabel:that.values
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
@@ -334,6 +336,14 @@ export default {
                 that.$message.error('报错请联系信息部！');
             });
         },
+        //供应商查询
+        valuechange(val){
+            this.values=''
+            for (let i = 0; i < val.length; i++) {
+                this.values+=val[i]+','
+            }
+            this.values=this.values.substring(0,this.values.length-1);
+        },
         //获取详情
         MediaSupplierInfo(val) {
             this.infoinitialize();
@@ -509,10 +519,10 @@ export default {
     color: #555;
 }
 .supplierinfo-screen-li .el-input{
-    width: 184px;
+    width: 195px;
 }
 .supplierinfo-screen-li .el-select{
-    width: 184px;
+    width: 195px;
 }
 .supplierinfo-table{
     margin-top: 15px;

src/components/statistics/Statistically.vue

@@ -19,6 +19,118 @@
                         <div id="grossmargin" style="width: 100%;height:400px;"></div>
                     </div>
                 </el-tab-pane>
+                <el-tab-pane label="团组预算/实际成本" name="fourth">
+                    <div class="fourth-table">
+                        <el-table
+                            :data="fourthData"
+                            border
+                            style="width: 100%">
+                            <el-table-column
+                            prop="rowNumber"
+                            label="序号"
+                            width="50">
+                            </el-table-column>
+                            <el-table-column
+                            prop="groupName"
+                            label="团组名">
+                            </el-table-column>
+                            <el-table-column
+                            prop="clientUnit"
+                            label="客户单位">
+                            </el-table-column>
+                            <el-table-column
+                            prop="visitDate"
+                            label="出访日期"
+                            width="110">
+                                <template slot-scope="scope">
+                                    {{ cltade(scope.row.visitDate) }} 
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="visitDays"
+                            label="天数"
+                            width="50">
+                            </el-table-column>
+                            <el-table-column
+                            prop="visitPNumber"
+                            label="人数"
+                            width="50">
+                            </el-table-column>
+                            <el-table-column
+                            prop="budgetAmount"
+                            label="团组预算"
+                            width="120">
+                                <template slot-scope="scope">
+                                    {{ townum(scope.row.budgetAmount) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="realityAmount"
+                            label="团组实际成本"
+                            width="120">
+                                <template slot-scope="scope">
+                                    {{ townum(scope.row.realityAmount) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="excessAmount"
+                            label="实际比预算超出金额"
+                            width="160">
+                                <template slot-scope="scope">
+                                    {{ townum(scope.row.excessAmount) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                            prop="excessPercentage"
+                            label="实际比预算超出百分比"
+                            width="180">
+                            </el-table-column>
+                            <el-table-column
+                            label="详细"
+                            width="100">
+                                <template slot-scope="scope">
+                                    <el-popover
+                                    placement="left"
+                                    width="1000"
+                                    trigger="hover">
+                                        <el-table
+                                        height="600"
+                                        :data="scope.row.details"
+                                        border
+                                        style="width: 100%;font-size:12px">
+                                            <el-table-column
+                                            prop="module"
+                                            label="模块"
+                                            width="100">
+                                            </el-table-column>
+                                            <el-table-column
+                                            prop="budgetAmountDesc"
+                                            label="该模块预算"
+                                            width="350">
+                                            </el-table-column>
+                                            <el-table-column
+                                            prop="realityAmountDesc"
+                                            label="实际费用的金额 ">
+                                            </el-table-column>
+                                        </el-table>
+                                        <span style="cursor: pointer;color: #48a2ff;" slot="reference" type="text">移上查看</span>
+                                    </el-popover>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <div class="block">
+                            <el-pagination
+                              @size-change="handleSizeChange"
+                              @current-change="handleCurrentChange"
+                              :current-page="fourthcurrentPage"
+                              :page-sizes="[5, 10, 20, 30]"
+                              :page-size="fourthPagesize"
+                              layout="total, sizes, prev, pager, next, jumper"
+                              :total="fourthtotal">
+                            </el-pagination>
+                          </div>
+                    </div>
+                </el-tab-pane>
                 <el-tab-pane label="国交数据统计" name="second">
                     <el-select style="width:200px; margin-bottom: 10px;" @change="countrieschange" v-model="value" filterable placeholder="请选择">
                         <el-option
@@ -40,7 +152,7 @@
                         <div v-else-if="value==1" style="width: 100%;">
                             <div id="grossmarginss" style="width: 100%;height:400px;"></div>
                             <div id="Airticketcitybox" style="width: 100%;height:400px;"></div>
-                            <div id="AirPredeterminedPlatform" style="width: 100%;height:400px;"></div>
+                            <div id="AirPredeterminedPlatform" style="width: 100%;height:700px;"></div>
                         </div>
                         <div v-else-if="value==2" style="width: 100%;">
                             <div id="hoteltopten" style="width: 100%;height:400px;"></div>
@@ -228,119 +340,8 @@
                         </div>
                     </div>
                 </el-tab-pane>
-                <el-tab-pane label="会务数据统计" name="third">会务数据统计</el-tab-pane>
-                <el-tab-pane label="团组预算/实际成本" name="fourth">
-                    <div class="fourth-table">
-                        <el-table
-                            :data="fourthData"
-                            border
-                            style="width: 100%">
-                            <el-table-column
-                            prop="rowNumber"
-                            label="序号"
-                            width="50">
-                            </el-table-column>
-                            <el-table-column
-                            prop="groupName"
-                            label="团组名">
-                            </el-table-column>
-                            <el-table-column
-                            prop="clientUnit"
-                            label="客户单位">
-                            </el-table-column>
-                            <el-table-column
-                            prop="visitDate"
-                            label="出访日期"
-                            width="110">
-                                <template slot-scope="scope">
-                                    {{ cltade(scope.row.visitDate) }} 
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                            prop="visitDays"
-                            label="天数"
-                            width="50">
-                            </el-table-column>
-                            <el-table-column
-                            prop="visitPNumber"
-                            label="人数"
-                            width="50">
-                            </el-table-column>
-                            <el-table-column
-                            prop="budgetAmount"
-                            label="团组预算"
-                            width="120">
-                                <template slot-scope="scope">
-                                    {{ townum(scope.row.budgetAmount) }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                            prop="realityAmount"
-                            label="团组实际成本"
-                            width="120">
-                                <template slot-scope="scope">
-                                    {{ townum(scope.row.realityAmount) }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                            prop="excessAmount"
-                            label="实际比预算超出金额"
-                            width="160">
-                                <template slot-scope="scope">
-                                    {{ townum(scope.row.excessAmount) }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                            prop="excessPercentage"
-                            label="实际比预算超出百分比"
-                            width="180">
-                            </el-table-column>
-                            <el-table-column
-                            label="详细"
-                            width="100">
-                                <template slot-scope="scope">
-                                    <el-popover
-                                    placement="left"
-                                    width="1000"
-                                    trigger="hover">
-                                        <el-table
-                                        height="600"
-                                        :data="scope.row.details"
-                                        border
-                                        style="width: 100%;font-size:12px">
-                                            <el-table-column
-                                            prop="module"
-                                            label="模块"
-                                            width="100">
-                                            </el-table-column>
-                                            <el-table-column
-                                            prop="budgetAmountDesc"
-                                            label="该模块预算"
-                                            width="350">
-                                            </el-table-column>
-                                            <el-table-column
-                                            prop="realityAmountDesc"
-                                            label="实际费用的金额 ">
-                                            </el-table-column>
-                                        </el-table>
-                                        <span style="cursor: pointer;color: #48a2ff;" slot="reference" type="text">移上查看</span>
-                                    </el-popover>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                        <div class="block">
-                            <el-pagination
-                              @size-change="handleSizeChange"
-                              @current-change="handleCurrentChange"
-                              :current-page="fourthcurrentPage"
-                              :page-sizes="[5, 10, 20, 30]"
-                              :page-size="fourthPagesize"
-                              layout="total, sizes, prev, pager, next, jumper"
-                              :total="fourthtotal">
-                            </el-pagination>
-                          </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>
@@ -553,7 +554,22 @@ export default {
                 dataset: {
                     source: this.AirticketPredetermined
                 },
-                xAxis: { type: 'category' },
+                xAxis: { 
+                    type: 'category',
+                    axisLabel:  {
+                        formatter:function(value){
+                            return value.split("").join("\n");
+                        } ,
+                    },
+
+                 },
+                 grid:{
+                        left: '1%',
+                        right: '1%',
+                        bottom: '7%',
+                        top: '10%',
+                        containLabel: true
+                    },
                 yAxis: {
                     name: '该平台预订次数',
                 },
@@ -582,7 +598,12 @@ export default {
                 dataset: {
                     source: this.Hoteltop
                 },
-                xAxis: { type: 'category' },
+                xAxis: { 
+                    type: 'category' ,
+                    axisLabel:{
+                        rotate:30
+                    },
+                },
                 yAxis: {
                     name: '预订次数',
                 },