Pārlūkot izejas kodu

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

zhuxinbo 4 gadi atpakaļ
vecāks
revīzija
c7d3024f05

+ 2 - 2
src/views/modules/BatchCreate/TouTiaoBatch.vue

@@ -165,8 +165,8 @@
                        <editableCell :text="text" slotName='bid' @change="onCellChange(record.key, 'bid', $event)" />
                     </span>
                     <span slot="cpaBid" slot-scope="text,record">
-                       <!-- <editableCell :text="text" slotName='cpaBid' @change="onCellChange(record.key, 'cpaBid', $event)" /> -->
-                       {{text}}
+                       <editableCell :text="text" slotName='cpaBid' @change="onCellChange(record.key, 'cpaBid', $event)" />
+                       <!-- {{text}} -->
                     </span>
 
                     <span slot="campaignStatus" slot-scope="text,record">

+ 1 - 0
src/views/modules/BatchCreate/editableCell.vue

@@ -11,6 +11,7 @@
         <div v-else class="editable-cell-text-wrapper">
           <span v-if="slotName=='budget'">{{ value*1? `日预算:${value*1}` :value }}</span>
           <span v-if="slotName=='bid'">{{ value*1? `${value*1}` :value }}</span>
+          <span v-if="slotName=='cpaBid'">{{ value*1? `${value*1}` :value }}</span>
           <span v-if="slotName=='name'">{{value}}</span>
           <a-icon type="edit" class="editable-cell-icon" @click.stop="edit" />
         </div>

+ 59 - 8
src/views/modules/Statistics/dataDisplayStatistics.vue

@@ -11,6 +11,19 @@
   padding: 5px 10px;
   cursor: pointer;
 }
+.tableTop{
+  position: relative;
+  padding-bottom: 15px;
+  border-bottom: 1px solid #e0e0e0;
+  .selectTime{
+    margin-right: 20px;
+  }
+  .add{
+      position: absolute;
+      top: 0;
+      right: 0;
+  }
+}
 </style>
 <style>
 /* .data-display-statistics .ant-card-body {
@@ -165,7 +178,7 @@ th div {
     <a-row :gutter="10" style="margin-top:10px">
       <a-col :span="24">
         <a-card style="width:100%;">
-          <div
+          <div class="tableTop"
             style="display:flex;margin-bottom:15px"
             v-show="
               role.roleCode == 'operator' ||
@@ -174,7 +187,7 @@ th div {
                 role.roleCode == 'operationAssistant' ||
                 role.roleCode == 'touTiaoOperationManager'
             "
-          >
+            >
             <a-select
               style="width: 120px"
               v-model="statHour"
@@ -184,7 +197,8 @@ th div {
             >
               <a-select-option v-for="item of 24" :key="item - 1" :value="item - 1">{{ item - 1 }}</a-select-option>
             </a-select>
-            <a-button type="primary" @click="exportExcel" style="margin-left:15px">导出</a-button>
+            <a-button type="primary" @click="exportExcel" style="margin-left:15px">导出报表</a-button>
+            <!-- <a-button type='primary' class="add" @click="customColumns" >自定义列</a-button> -->
           </div>
           <a-table
             :columns="columns"
@@ -192,8 +206,9 @@ th div {
             bordered
             id="outTable"
             :pagination="false"
-            :scroll="{ x: 1900 }"
+            :scroll="{ x: scrollX }"
           ></a-table>
+          <!-- <customColumn :visible='visible'  :listNum='listNum' :fiexColumn='columnsFixd'  @closeCustomColumn='closeCustomColumn' @changeColumn='changeColumn' /> -->
         </a-card>
       </a-col>
     </a-row>
@@ -201,6 +216,7 @@ th div {
 </template>
 
 <script>
+
 import ARow from 'ant-design-vue/es/grid/Row'
 import ACol from 'ant-design-vue/es/grid/Col'
 import countTo from 'vue-count-to'
@@ -213,7 +229,7 @@ import Treeselect from './components/Treeselect.vue'
 
 import { getAction, postAction, postFile } from '@/api/manage'
 import { mapGetters } from 'vuex'
-
+import customColumn from './components/customColumn.vue'
 // 引入基本模板
 let echarts = require('echarts/lib/echarts')
 // 引入柱状图组件
@@ -591,7 +607,8 @@ export default {
     countTo,
     lifting,
     timeCheck,
-    Treeselect
+    Treeselect,
+    customColumn,
   },
 
   data: function() {
@@ -658,7 +675,10 @@ export default {
       ],
       noTitleKey: 'cost',
       role: { roleCode: '' },
-      statDate: ''
+      statDate: '',
+      visible:false,//自定义页面的打开
+       listNum:[],
+       scrollX:0,
     }
   },
   filters: {
@@ -679,8 +699,39 @@ export default {
     }
   },
   methods: {
+     ...mapGetters(['nickname', 'avatar', 'userInfo']),
     moment,
-    ...mapGetters(['nickname', 'avatar', 'userInfo']),
+     //弹出框打开,自定义列
+    customColumns() {
+        this.visible = true
+        this.listNum = [...this.columns]
+    },
+    closeCustomColumn(){
+      this.visible=false;
+    },
+    //自定义之后修改父元素表头
+    changeColumn(val){
+        this.columns=[...val];
+        if(this.columns.length> this.columnsFixd.length){
+              this.scrollX=200*(this.columns.length-this.columnsFixd.length)
+        }else{
+          this.scrollX=0
+        }
+    },
+    tableHandle() {
+        // this.listNum = [...this.columns]
+        //   console.log(this.listNum.length, this.columns)
+
+        if (this.listNum.length >= 9 || this.columns.length >= 9) {
+          this.tableWidth = 120
+          this.scrollX = this.columns.length * 120
+          // console.log(this.scrollX)
+        } else {
+          this.scrollX = 0
+        }
+    },
+
+   
     disabledDate(current) {
       return current && current > moment().endOf('day')
     },

+ 2 - 2
src/views/modules/Statistics/refuseDataCreat.vue

@@ -302,7 +302,7 @@
         title: [],
         dataOne: [],
         value: '',
-        updateDescription:undefined,//重提的广告语
+        updateDescription:'',//重提的广告语
       }
     },
     filters: {
@@ -524,7 +524,7 @@
         //    this.selectedRowKeysValue.length > 0 ? this.selectedRowKeysValue :
       },
       handleOkAgain(e) {
-        if(this.updateDescription.length>30){
+        if(this.updateDescription.length>30&&this.getData('type')==1){
           this.$message.error('广告语最多30个字,请修正后再次提交!')
         }else{
           this.againLoading = true

+ 2 - 2
src/views/modules/Statistics/refuseDataCreatNew.vue

@@ -303,7 +303,7 @@
         dataOne: [],
         value: '',
 
-        updateDescription:undefined,//广告语的字符
+        updateDescription:'',//广告语的字符
       }
     },
     filters: {
@@ -522,7 +522,7 @@
         //    this.selectedRowKeysValue.length > 0 ? this.selectedRowKeysValue :
       },
       handleOkAgain(e) {
-        if(this.updateDescription.length>30){
+        if(this.updateDescription.length>30&&this.getData('type')==1){
           this.$message.error('广告语最多30个字,请修正后再次提交!')
         }else{
           this.againLoading = true